version bump, see bug 212259 reported by Ferry <freaky@bananateam.nl>; revamped the ebuild a bit; clean up

Package-Manager: portage-2.1.4.4

5 files changed, 67 insertions, 27 deletions

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index fe49b044b87a..46da8af6fe19 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conserver-prestrip.patch 882 RMD160 0ebc17ce4133f8a54cb0ce0a439d1f990e58a58d SHA1 5c166ca1302daa2f9961327cf3b54a3b4b614747 SHA256 3e333d4e3bce4faa67255fc8065c22590b24e812956f8d7b9645ae2788dd4839
 AUX conserver.confd 288 RMD160 88e2e2f067f26ed5cc9394145a6feeddeb31cd58 SHA1 6f4f1720093e3fba537bdca6a683777e56a2a3e9 SHA256 1b3986fba9787bfd39c6c6921f4fbe644b048592cd7c2d8a69e73be15cf588c3
 AUX conserver.initd 1172 RMD160 1af7d950f3f0fcde02fac7a60e1a6615047ed5cf SHA1 df196fa42a1a7963c96d483801826adae760c449 SHA256 87d44499372ae77065d7b04640bfb1a3ee138866abf0848f3bcac053f54b866e
 AUX conserver.pam-include.1 210 RMD160 8933bcb2018ff43b9b5ee2124fc1a87fbfafc8bb SHA1 525a78c675402c3ddc4ab49da9ffe3fbe2c475d2 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50
 AUX conserver.pam-pambase 194 RMD160 ae3f752424b71af34841e2b0ff5aec8dca0e9e2d SHA1 02885b0461f7916270b0219db893439ee9bb933f SHA256 7b1f7770c8781453907b2785c54b1043c8e66202437479c4d9664b71a0bac816
 DIST conserver-8.1.16.tar.gz 311373 RMD160 918832d21d46f7f20cf9c1088c058190093343a0 SHA1 6e2a985927812cc8c253463d53911dc37fb37111 SHA256 43dc9d81bc23d76a0ec01acd1f54f5c276b715feeb8f52bb33b5c81f325a46d8
-EBUILD conserver-8.1.16-r1.ebuild 2194 RMD160 d5288df3a4891c8abcea8cd3a44e044497630a3a SHA1 b9526eb2557ca00a5af6493683722653846930a1 SHA256 f3a6c6be3e7cb9689363d08a17329e66e6a31118f16342f100f7f1dc5aa03708
+EBUILD conserver-8.1.16-r1.ebuild 2192 RMD160 3d3187a514db3dd42a733995f6e09dddff22ac74 SHA1 436c477d10717e13b188402b31934a5f836581a3 SHA256 4915275ea9fc8ef7842b4a9f6bba4e2a0f2f926bf181529d88c53d201f93fbbd
 EBUILD conserver-8.1.16.ebuild 2158 RMD160 ac5f2e3ec2d80e08883fea92d83c25bc41374142 SHA1 e2bd7f10dd3dda2ed1439ed820b9b0070e7f2526 SHA256 4522e779427552168c80371e72f0f7fd15560cde11035f0affeba3cf3d01fb56
-MISC ChangeLog 10244 RMD160 5c49d590644702fb7d0a50339415d3970ec35591 SHA1 e568e9a75a8ca3b60bdcd05fa52245744275881c SHA256 2f9638e946f2de91ab317e01902509a644d44b053b96328b43cdc952eeb0a0e7
+MISC ChangeLog 10389 RMD160 5d9db75203c94d3c0c28d411f37f05cea2188214 SHA1 3fde7aefa563754ef35127ab0d09570e270828ae SHA256 31980516c8bf94f0a1f7901805b282b8ca75910189757f41925cdd3b8524c19a
 MISC metadata.xml 1048 RMD160 cb99813534d36460e77e5d04548c2f8424bcd00e SHA1 89da5ce707b8c263694760f8b55ce39fb778ae57 SHA256 1571318e000418eb2cd09696ffaad21692c6bcab763ef0cb2ec72cd4a4cc941c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHu3VcAiZjviIA2XgRAs95AKCb5X5Qw6t9Qvxm4OqtKdL1N0LheACfcF74
-cHBiNyNpBoxMgvxtea42AnY=
-=H7va
------END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 2ddb86ee7df9..e0b90eadb287 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,15 @@
 # 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.18 2008/01/14 19:03:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.19 2008/03/04 10:29:23 opfer Exp $
+
+*keepassx-0.3.0-r20 (04 Mar 2008)
+*keepassx-0.3.0 (04 Mar 2008)
+
+  04 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
+  -keepassx-0.2.2-r2.ebuild, +keepassx-0.3.0.ebuild,
+  +keepassx-0.3.0-r20.ebuild:
+  version bump, see bug 212259 reported by Ferry <freaky@bananateam.nl>;
+  revamped the ebuild a bit; clean up
 
   14 Jan 2008; Christoph Mende <angelos@gentoo.org>
   keepassx-0.2.2-r1.ebuild:
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 490976a2cbbc..831d90ca9973 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX keepassx.desktop 281 RMD160 46d613482dc2aeb07e82f7d62b11e368457f1dec SHA1 7c37944fc0ea013579e266e70d3e78532a5a1a88 SHA256 1e550108aef3cdb614a391518f2b4e9de50f4611587ed103fe67ba5baf86b247
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
+DIST KeePassX-0.3.0.tar.gz 503468 RMD160 b1134f0200cf359e6fa3e501b984dcf597856fc1 SHA1 6c866f41ede0c7b989ec9b63ec701ff20c118c83 SHA256 01ce25edb40bb689bef7e71f8d79df984aa3d6f6166e5b6cdba5f42e9035d803
 EBUILD keepassx-0.2.2-r1.ebuild 1050 RMD160 2b7dd9f3a3a788cc99cb69a618174e4eb969ef11 SHA1 cedaff20fe256336f44cd6e92d83b43ca6669d01 SHA256 c463403d4d5d47ac0a84d31695a9ff60086f7e1bc84384f57791e9bc776f5e83
-EBUILD keepassx-0.2.2-r2.ebuild 850 RMD160 f61cfc2b17965871c5b304a9d63c99b101ae05cb SHA1 9d4c2466d8570fd83e44166ae18ed0e0f9262564 SHA256 47b1e1ef3ea0a2936f053ec57666fff8248d0582968d0ec0315dbbdc07340e47
-MISC ChangeLog 3284 RMD160 7f5fdf15c2992e868e0886edb338b6c0ad53d137 SHA1 1f2742c9ae90b822edd0c52743e252b3d84e270b SHA256 d4cea7552c07f863858813ceed8a9c4e8c96c83ca52372b8ef05a58b04548a03
+EBUILD keepassx-0.3.0-r20.ebuild 745 RMD160 0af14b30f22f2396b330bd1275214b4a1d2345fc SHA1 35cd732f1bbc84e4b497e520dd5c2306103ed4fe SHA256 f4718a018e0e5824266312ed7dbeac360a658cfe3b07ab2baa36c5cfe80cdecd
+EBUILD keepassx-0.3.0.ebuild 1006 RMD160 f51a0bba6a85fb9d7bd15935f42ec2fb3fa39f67 SHA1 ebd8aac196eabe7049f5bf6ceac23cf523bb5664 SHA256 071c0ce13440630fb23faeab594173715dad1d25124e556b6897c98317f75e99
+MISC ChangeLog 3597 RMD160 dd4fd1a3252af1b1e198e8fc7d541c8c13d674ed SHA1 308a01183d356dc33e5964e9fb7d8e92eeb00f68 SHA256 2f66e052c259d725086b3ec7f9a116997538d6aed7b99978f40e229a1a41ef08
 MISC metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd SHA1 bb91e173269a532d2f85a2c7772cf221a6306dc3 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzSULNQqtfCuFneMRAhlPAJsGk1X4aQZqRgPlreQuxq0O/iTEgQCfbVh/
+vBz4hFdEG0BOw1GcUFEb7K4=
+=JNOI
+-----END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/keepassx-0.2.2-r2.ebuild b/app-admin/keepassx/keepassx-0.3.0-r20.ebuild
index 4e8b1504180c..094c145d4839 100644
--- a/app-admin/keepassx/keepassx-0.2.2-r2.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.0-r20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2.2-r2.ebuild,v 1.1 2007/12/21 08:27:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.0-r20.ebuild,v 1.1 2008/03/04 10:29:23 opfer Exp $
 
 inherit eutils
 
@@ -15,20 +15,13 @@ IUSE=""
 DEPEND="( >=x11-libs/qt-4.4.0_rc1
 	x11-libs/qt-qt3support )"
 RDEPEND="${DEPEND}"
+S="${WORKDIR}/KeePassX-${PV}"
 
 src_compile() {
 	/usr/bin/qmake || die "qmake failed"
 	emake || die "emake failed"
 }
 
-src_install() {
-	dobin bin/keepass
-
-	insinto /usr/share/
-	doins -r share/*
-
-	dosym /usr/share/keepass/icons/${PN}.png \
-		/usr/share/pixmaps/${PN}.png
-
-	domenu "${FILESDIR}/${PN}.desktop"
+src_install(){
+	emake DESTDIR="${D}" install || die
 }
diff --git a/app-admin/keepassx/keepassx-0.3.0.ebuild b/app-admin/keepassx/keepassx-0.3.0.ebuild
new file mode 100644
index 000000000000..f294dbd6d6f5
--- /dev/null
+++ b/app-admin/keepassx/keepassx-0.3.0.ebuild
@@ -0,0 +1,36 @@
+# 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.0.ebuild,v 1.1 2008/03/04 10:29:23 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://keepassx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/keepassx/KeePassX-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+DEPEND=">=x11-libs/qt-4.1"
+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
+		die "please rebuild x11-libs/qt with USE=qt3support"
+	fi
+}
+
+src_compile() {
+	use debug || myconf="DEBUG=1"
+	/usr/bin/qmake PREFIX="${D}/usr" ${myconf} || die "qmake failed" 
+	emake || die "emake failed"
+}
+
+src_install(){
+	emake DESTDIR="${D}" install || die
+}