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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 17 insertions, 67 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/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"
 }