revamp ebuild, proposed by jokey in bug 212984

Package-Manager: portage-2.1.4.4

4 files changed, 30 insertions, 21 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index eb93bfa4b62f..f3a1babc1ee7 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.21 2008/03/04 18:41:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.22 2008/03/11 12:53:52 opfer Exp $
+
+  11 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
+  keepassx-0.3.0a.ebuild, keepassx-0.3.0a-r20.ebuild:
+  revamp ebuild, proposed by jokey in bug 212984
 
 *keepassx-0.3.0a-r20 (04 Mar 2008)
 *keepassx-0.3.0a (04 Mar 2008)
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 4fc1fce96bac..08d95dabbdaf 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -5,14 +5,14 @@ AUX keepassx.desktop 281 RMD160 46d613482dc2aeb07e82f7d62b11e368457f1dec SHA1 7c
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
 DIST KeePassX-0.3.0a.tar.gz 502881 RMD160 69d874eaf378b66e4f8814cefd3ee43409dfa179 SHA1 531059c663b8c62887476cb71fc4f858b9e3429d SHA256 ac1a8b68bcfdc7da42a26ce9e6f0161720d043ca3f31c676c8c3b8154e61ac23
 EBUILD keepassx-0.2.2-r1.ebuild 1050 RMD160 2b7dd9f3a3a788cc99cb69a618174e4eb969ef11 SHA1 cedaff20fe256336f44cd6e92d83b43ca6669d01 SHA256 c463403d4d5d47ac0a84d31695a9ff60086f7e1bc84384f57791e9bc776f5e83
-EBUILD keepassx-0.3.0a-r20.ebuild 875 RMD160 f9f54c07c13205ac0edc1ab2d07c573470cc63f9 SHA1 4f7dfde52497727d9968c3d16d3030ad367c35a8 SHA256 3704c0713beab7c417bf0ee25682a165c7e3e3b41199177e9221d7b54f5731e4
-EBUILD keepassx-0.3.0a.ebuild 1120 RMD160 a672af623345dfbdff961be435d1bfe85a4df55d SHA1 b8cd28547438f014b33f11120560ffd0369b3aee SHA256 c857155c62661f3a0be5087026414294310d54a48ef0b93655715cc0f1f2bd0b
-MISC ChangeLog 4042 RMD160 21c3ea917e6472875dd766f79ce31a82a8343ec1 SHA1 5e85a5557af1f990c22f70d11857133c713f7669 SHA256 06dcabe868c9cc7b11f74b53b4a98a001adbc057b16b2d4781290a3cfa817fb6
+EBUILD keepassx-0.3.0a-r20.ebuild 873 RMD160 04cbede7800a2d032a8277aad06d336131ddc541 SHA1 5ae822542f277fc3d49c7c022523558d7850a313 SHA256 2fc1a5e9a9165995228b80e5e239a32c10dafce301f27a91a6ed91678adc6221
+EBUILD keepassx-0.3.0a.ebuild 1106 RMD160 d26a2f33c0d4f990c751e01bd97a8ca167a46892 SHA1 e615fb2b9f17bf90e9a5127bb0bc4d8b5251db06 SHA256 9847e8c1ccc8a7372d3216a8724165cff3e10e61b32010fbfc050f9b43c3019e
+MISC ChangeLog 4201 RMD160 00284f6b7aee8a9307a18423cc4d52e6a4e1a328 SHA1 8035d3112513ba13d34d05793acbb654f4b8b9dd SHA256 63eb2c25166f0ce1f048dbf1b15b0e67e96d9defda0d3831265134c55b47267f
 MISC metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd SHA1 bb91e173269a532d2f85a2c7772cf221a6306dc3 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHzZheNQqtfCuFneMRAv74AJwOpzm24qsxzk7JqxDHpyvGdOFhlgCghdbi
-DWV28vPT3qLfmEnPrbQa/4U=
-=0eqA
+iD8DBQFH1oDuNQqtfCuFneMRAvNxAJ9I9t/OGrZZNtMd3lGvbS45hhm7ywCePiNc
+Fi4wpftAalhUWFqJpKYK7PA=
+=ydxQ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild b/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild
index 0300e591f20d..5f2967dabfc3 100644
--- a/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild,v 1.1 2008/03/04 18:41:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.0a-r20.ebuild,v 1.2 2008/03/11 12:53:52 opfer Exp $
 
-inherit eutils
+EAPI=1
+
+inherit eutils qt4
 
 DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
 HOMEPAGE="http://keepassx.sourceforge.net/"
@@ -12,18 +14,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND="( >=x11-libs/qt-4.4.0_rc1
+DEPEND="( >=x11-libs/qt-4.4.0_rc1:4
 	x11-libs/qt-qt3support )"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/KeePassX-${PV}"
 
 src_compile() {
 	cd "${S}/src"
-	lrelease src.pro || die "lrelease failed"
+	lrelease src.pro || die
 	mv "${S}"/src/translations/*.qm "${S}"/share/keepassx/i18n
 	cd "${S}"
-	/usr/bin/qmake || die "qmake failed"
-	emake || die "emake failed"
+	eqmake keepass.pro PREFIX="${D}/usr" ${myconf} || die
+	emake || die
 }
 
 src_install(){
diff --git a/app-admin/keepassx/keepassx-0.3.0a.ebuild b/app-admin/keepassx/keepassx-0.3.0a.ebuild
index 0cc9c5149416..ad43923291dc 100644
--- a/app-admin/keepassx/keepassx-0.3.0a.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.0a.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.0a.ebuild,v 1.1 2008/03/04 18:41:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.0a.ebuild,v 1.2 2008/03/11 12:53:51 opfer Exp $
 
-inherit eutils
+EAPI=1
+
+inherit eutils qt4
 
 DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
 HOMEPAGE="http://keepassx.sourceforge.net/"
@@ -12,27 +14,28 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
-DEPEND=">=x11-libs/qt-4.1"
+DEPEND=">=x11-libs/qt-4.1:4"
 RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/KeePassX-${PV}"
 
 pkg_setup() {
 	if ! built_with_use --missing true x11-libs/qt qt3support png; then
 		eerror
-		eerror "You need to rebuild x11-libs/qt with USE=qt3support enabled"
+		eerror "You need to rebuild x11-libs/qt with USE=qt3support and png enabled"
 		eerror
-		die "please rebuild x11-libs/qt with USE=qt3support"
+		die "please rebuild x11-libs/qt with USE=\"qt3support png\""
 	fi
 }
 
 src_compile() {
 	cd "${S}/src"
-	lrelease src.pro || die "lrelease failed"
+	lrelease src.pro || die
 	mv "${S}"/src/translations/*.qm "${S}"/share/keepassx/i18n
 	cd "${S}"
 	use debug || myconf="DEBUG=1"
-	/usr/bin/qmake PREFIX="${D}/usr" ${myconf} || die "qmake failed"
-	emake || die "emake failed"
+	eqmake keepass.pro PREFIX="${D}/usr" ${myconf}|| die
+	emake || die
 }
 
 src_install(){