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

(Portage version: 2.1.4.4)

3 files changed, 51 insertions, 13 deletions

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/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
+}