don't install license file; fix desktop file so it passes KDE validation; all fixes provided by Timo Gurr <timo.gurr@gmail.com> in bug 189569

(Portage version: 2.1.2.11)

5 files changed, 74 insertions, 11 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 3f74948d62db..1955b4a24868 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.9 2007/03/22 08:08:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.10 2007/08/21 06:24:11 opfer Exp $
+
+*keepassx-0.2.2-r1 (21 Aug 2007)
+
+  21 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  files/keepassx.desktop, keepassx-0.2.2.ebuild, +keepassx-0.2.2-r1.ebuild:
+  don't install license file; fix desktop file so it passes KDE validation;
+  all fixes provided by Timo Gurr <timo.gurr@gmail.com> in bug 189569
 
   22 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   keepassx-0.2.2.ebuild:
diff --git a/app-admin/keepassx/files/digest-keepassx-0.2.2-r1 b/app-admin/keepassx/files/digest-keepassx-0.2.2-r1
new file mode 100644
index 000000000000..8f573904e927
--- /dev/null
+++ b/app-admin/keepassx/files/digest-keepassx-0.2.2-r1
@@ -0,0 +1,3 @@
+MD5 5ee945ab12c2667ef5c4013a0636c26f KeePassX-0.2.2.tar.gz 302656
+RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec KeePassX-0.2.2.tar.gz 302656
+SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd KeePassX-0.2.2.tar.gz 302656
diff --git a/app-admin/keepassx/files/keepassx.desktop b/app-admin/keepassx/files/keepassx.desktop
index 8001882bfe64..5d421a0322eb 100644
--- a/app-admin/keepassx/files/keepassx.desktop
+++ b/app-admin/keepassx/files/keepassx.desktop
@@ -1,9 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=KeePass
-Exec=keepass
-Icon=/usr/share/keepass/icons/keepassx.png
+Version=1.0
 Type=Application
-DocPath=keepass/index.html
+Name=KeePassX
 GenericName=Password Manager
-Categories=Qt;KDE;
+GenericName[de]=Passwortverwaltung
+Comment=Cross Platform Password Manager
+Comment[de]=Plattformübergreifende Passwortverwaltung
+Exec=keepass
+Icon=keepassx.png
+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
new file mode 100644
index 000000000000..69dbb43d2e42
--- /dev/null
+++ b/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 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.1 2007/08/21 06:24:11 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=""
+DEPEND=">=x11-libs/qt-4.1"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if has_version ">=x11-libs/qt-4.2.2" && ! built_with_use x11-libs/qt qt3support; 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() {
+	/usr/bin/qmake || die "qmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin bin/keepass
+
+	insinto /usr/share/keepass/
+	doins -r share/keepass/i18n
+	insinto /usr/share/keepass/
+	doins -r share/keepass/icons
+
+	dosym /usr/share/keepass/icons/${PN}.png \
+		/usr/share/pixmaps/${PN}.png
+
+	domenu "${FILESDIR}/${PN}.desktop"
+}
diff --git a/app-admin/keepassx/keepassx-0.2.2.ebuild b/app-admin/keepassx/keepassx-0.2.2.ebuild
index a078dcdac5d0..c08c027bbfbb 100644
--- a/app-admin/keepassx/keepassx-0.2.2.ebuild
+++ b/app-admin/keepassx/keepassx-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.8 2007/03/22 08:08:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2.ebuild,v 1.9 2007/08/21 06:24:11 opfer Exp $
 
 inherit eutils
 
@@ -31,7 +31,14 @@ src_compile() {
 
 src_install() {
 	dobin bin/keepass
-	insinto /usr/share/
-	doins -r share/*
-	domenu "${FILESDIR}/keepassx.desktop"
+
+	insinto /usr/share/keepass/
+	doins -r share/keepass/i18n
+	insinto /usr/share/keepass/
+	doins -r share/keepass/icons
+
+	dosym /usr/share/keepass/icons/${PN}.png \
+		/usr/share/pixmaps/${PN}.png
+
+	domenu "${FILESDIR}/${PN}.desktop"
 }