Version bump, fixing bug #261480 and bug #264062.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 20 insertions, 73 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 847507c62846..806d7ab1765f 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.37 2009/02/28 19:44:44 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.38 2009/03/31 02:17:44 tgurr Exp $
+
+*keepassx-0.4.0 (31 Mar 2009)
+
+  31 Mar 2009; Timo Gurr <tgurr@gentoo.org> -files/keepassx.desktop,
+  -keepassx-0.2.2-r1.ebuild, -keepassx-0.4.0_beta1.ebuild,
+  +keepassx-0.4.0.ebuild:
+  Version bump, fixing bug #261480 and bug #264062.
 
 *keepassx-0.4.0_beta1 (28 Feb 2009)
 
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index a7f5329d06cb..b70610cc4ab1 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,9 +1,6 @@
-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.4.tar.gz 535822 RMD160 3f7f364d62e3cc54f54e12f74d7d88cfcf23f231 SHA1 d9204396a0878c3acbce875b42df2899561c5206 SHA256 41dc39f675f812d81e413f7d9684a458fbd4ac9819c91ccc31b504cef8de71ee
-DIST KeePassX-0.4.0beta1.tar.gz 704449 RMD160 cbd9160b4cfc45e4e59a5810f0621efdaad836eb SHA1 eaaa3451c52082804727882697ec4fcbfe20fd4d SHA256 6014ce34c337eb8d4643f396cb1ed5af4ad535904a11238a7679541113e99617
-EBUILD keepassx-0.2.2-r1.ebuild 1064 RMD160 80fd56121ade856a5aa1aeeebc94923bcd5e6b2b SHA1 8e3aa9a081b2ff6420971aa5d4a063368555d5fe SHA256 42433aadbc141f4ddcaba440d6df40e80fb20dd5d6b6e32113a01c0428ec1104
+DIST keepassx-0.4.0.tar.bz2 660481 RMD160 5e99d2ac489a149d0824183f588c1766405a06cb SHA1 2be11f1f2019731c132229dfedb0f9071a637571 SHA256 f1109e4a620ab0531c41106dfff17b527e4d346a143bb8d68408b6743abc5958
 EBUILD keepassx-0.3.4.ebuild 1369 RMD160 fda567f5dc9d03fa6135456c9c4c8289b932deb5 SHA1 988e42f68cb078a7c006b5c74dfde13ba3467440 SHA256 5218dae22ddb253d9887e47df5a6102219e533f22d3989753ccc297ec5bd1321
-EBUILD keepassx-0.4.0_beta1.ebuild 1356 RMD160 05a8a315cd31017799371c83677e609cfce12fa1 SHA1 7f2ff2b66eebac08858858e4e10104f914f31947 SHA256 718b43378e071a73239298b365492d7681e705833409285b1080da65657e93d9
-MISC ChangeLog 6664 RMD160 66c039c7b87086b5074cbaa7f1dbf9c93c527b91 SHA1 f35080ad57efea87a545ff3a03012337b096d6f5 SHA256 8bf77a3cb5726559e79dcbfc516887572c4a87632c9d2fa9358ee9ef5d765609
+EBUILD keepassx-0.4.0.ebuild 1193 RMD160 9b9ab62721778b7ac13d8d634c6f25979e886855 SHA1 3e7af675922c21e52eb61d076d2b097cdb8e7150 SHA256 d55bfd816d0959070af7d0a9577496e374d7b2f20e54282d36dd5dfe215e21f0
+MISC ChangeLog 6902 RMD160 4fd224599a2262aef5eeaa348a9342e6dc1f15b0 SHA1 f3900f34cd386ed0dca683641422d89faca70249 SHA256 2449a7755dbc6f9fda9ffabc4761213fa18a24c1e973150b52fc3ddff5ec5e16
 MISC metadata.xml 495 RMD160 90266b304a5c8425582869e66f36475590a9aeea SHA1 4711ce96501403b2061f630bda3c86d42a09794e SHA256 3280fffee9ad925df39ffbf8a0a90f9eb469669d45934d2921bcbc0b1ed9b8ef
diff --git a/app-admin/keepassx/files/keepassx.desktop b/app-admin/keepassx/files/keepassx.desktop
deleted file mode 100644
index c0e7b39eb50d..000000000000
--- a/app-admin/keepassx/files/keepassx.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=KeePassX
-GenericName=Password Manager
-GenericName[de]=Passwortverwaltung
-Comment=Cross Platform Password Manager
-Comment[de]=Plattformübergreifende Passwortverwaltung
-Exec=keepass
-Icon=keepassx
-Categories=Qt;KDE;Utility;Security;
diff --git a/app-admin/keepassx/keepassx-0.2.2-r1.ebuild b/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
deleted file mode 100644
index 07b200781816..000000000000
--- a/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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-r1.ebuild,v 1.7 2008/11/07 18:55:42 tgurr 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=""
-DEPEND=">=x11-libs/qt-4.1"
-RDEPEND="${DEPEND}"
-
-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 png\" enabled"
-		eerror
-		die "please rebuild x11-libs/qt with USE=\"qt3support png\""
-	fi
-}
-
-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"
-}
diff --git a/app-admin/keepassx/keepassx-0.4.0_beta1.ebuild b/app-admin/keepassx/keepassx-0.4.0.ebuild
index e6dfd45f57a8..afe6d41ba63c 100644
--- a/app-admin/keepassx/keepassx-0.4.0_beta1.ebuild
+++ b/app-admin/keepassx/keepassx-0.4.0.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.0_beta1.ebuild,v 1.1 2009/02/28 19:44:44 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.0.ebuild,v 1.1 2009/03/31 02:17:44 tgurr Exp $
 
 EAPI="2"
 
-inherit eutils qt4 versionator
-
-MY_PV=$(delete_version_separator 3)
+inherit eutils qt4
 
 DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions."
 HOMEPAGE="http://keepassx.sourceforge.net/"
-SRC_URI="http://www.keepassx.org/download/KeePassX-${MY_PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug pch"
-DEPEND="|| ( ( x11-libs/qt-core:4[qt3support]
-			x11-libs/qt-gui:4[qt3support]
-			x11-libs/qt-xmlpatterns:4 )
-		( =x11-libs/qt-4.3*:4[png,qt3support,zlib] ) )"
-RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+DEPEND="x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support]
+	x11-libs/qt-xmlpatterns:4"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local conf_add
@@ -35,13 +31,13 @@ src_configure() {
 		|| die "eqmake4 failed."
 }
 
-src_compile(){
+src_compile() {
 	# workaround compile failure due to distcc, bug #214327
 	PATH=${PATH/\/usr\/lib\/distcc\/bin:}
 	emake || die "emake failed"
 }
 
-src_install(){
+src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc changelog || die "dodoc failed"
 }