install license file again as it is needed by the about dialog; clean up

(Portage version: 2.1.2.12)

4 files changed, 8 insertions, 53 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 1955b4a24868..943911e22ccf 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2007/08/21 06:24:11 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.11 2007/08/21 11:20:15 opfer Exp $
+
+  21 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  -keepassx-0.2.2.ebuild, keepassx-0.2.2-r1.ebuild:
+  install license file again as it is needed by the about dialog; clean up
 
 *keepassx-0.2.2-r1 (21 Aug 2007)
 
diff --git a/app-admin/keepassx/files/digest-keepassx-0.2.2 b/app-admin/keepassx/files/digest-keepassx-0.2.2
deleted file mode 100644
index 8f573904e927..000000000000
--- a/app-admin/keepassx/files/digest-keepassx-0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/keepassx-0.2.2-r1.ebuild b/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
index 69dbb43d2e42..044a47ae1ccf 100644
--- a/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
+++ b/app-admin/keepassx/keepassx-0.2.2-r1.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-r1.ebuild,v 1.1 2007/08/21 06:24:11 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2-r1.ebuild,v 1.2 2007/08/21 11:20:15 opfer Exp $
 
 inherit eutils
 
@@ -32,10 +32,8 @@ src_compile() {
 src_install() {
 	dobin bin/keepass
 
-	insinto /usr/share/keepass/
-	doins -r share/keepass/i18n
-	insinto /usr/share/keepass/
-	doins -r share/keepass/icons
+	insinto /usr/share/
+	doins -r share/*
 
 	dosym /usr/share/keepass/icons/${PN}.png \
 		/usr/share/pixmaps/${PN}.png
diff --git a/app-admin/keepassx/keepassx-0.2.2.ebuild b/app-admin/keepassx/keepassx-0.2.2.ebuild
deleted file mode 100644
index c08c027bbfbb..000000000000
--- a/app-admin/keepassx/keepassx-0.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.9 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"
-}