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

Package-Manager: portage-2.1.2.12

5 files changed, 19 insertions, 71 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/Manifest b/app-admin/keepassx/Manifest
index 48d9f9ae8aff..d2e4b53c07c3 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -6,32 +6,25 @@ MD5 f6288de9b763168982643860241ba337 files/keepassx.desktop 285
 RMD160 cb4c6ab705457139b9e203b669b31615073baf4f files/keepassx.desktop 285
 SHA256 0c3ef9d5c7f18dbdfa0dacc4939d4d36bab90e8a8242f801aa6c360b597793cd files/keepassx.desktop 285
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
-EBUILD keepassx-0.2.2-r1.ebuild 1146 RMD160 24333005b651d8369f38e3c85bed8061e9e7cae6 SHA1 ea35907aecc2ae8f2030efaf337c99f5db04cc3a SHA256 e33c0f9757d57422d7e63cda90c0a30d9ee8d1fdc7325625bd442376395488f2
-MD5 7e0f259f1d2647c20b97faff3f7b9470 keepassx-0.2.2-r1.ebuild 1146
-RMD160 24333005b651d8369f38e3c85bed8061e9e7cae6 keepassx-0.2.2-r1.ebuild 1146
-SHA256 e33c0f9757d57422d7e63cda90c0a30d9ee8d1fdc7325625bd442376395488f2 keepassx-0.2.2-r1.ebuild 1146
-EBUILD keepassx-0.2.2.ebuild 1143 RMD160 98146eb9d5579a2c57a9336ec9856e774422369b SHA1 0a6418a2600ac0e8fa47692ac24234207021b00f SHA256 172be7f22dd990aef93aa7784aca93c0be89d97ace155f359e7b98251b50c7f9
-MD5 90e581ee830feed6feff54ddc1d07431 keepassx-0.2.2.ebuild 1143
-RMD160 98146eb9d5579a2c57a9336ec9856e774422369b keepassx-0.2.2.ebuild 1143
-SHA256 172be7f22dd990aef93aa7784aca93c0be89d97ace155f359e7b98251b50c7f9 keepassx-0.2.2.ebuild 1143
-MISC ChangeLog 2130 RMD160 4bb152a4b7fd39b6e38f1ab3b7bc991cab1ba9fd SHA1 4d39614bf2551ae6e50a72fd9591735eced09055 SHA256 4226788af4eca092d21aef07984732cde000c6d6d6338804e279235fe6e98e45
-MD5 5d86a72839244acf39d11cafbaa00f4f ChangeLog 2130
-RMD160 4bb152a4b7fd39b6e38f1ab3b7bc991cab1ba9fd ChangeLog 2130
-SHA256 4226788af4eca092d21aef07984732cde000c6d6d6338804e279235fe6e98e45 ChangeLog 2130
+EBUILD keepassx-0.2.2-r1.ebuild 1068 RMD160 88eb997ebc3bb1e78d91e151c60859f4e6cea4da SHA1 01d05ce5894c7b599e46a5b81d2c1e2f3f155a4b SHA256 dec69041f1d0a70bf7e1b9fd57a6403a0d4dc98f6a0ebedded20c752319ba9c3
+MD5 4a390d2985a6544ea64403f0d7cbcc0c keepassx-0.2.2-r1.ebuild 1068
+RMD160 88eb997ebc3bb1e78d91e151c60859f4e6cea4da keepassx-0.2.2-r1.ebuild 1068
+SHA256 dec69041f1d0a70bf7e1b9fd57a6403a0d4dc98f6a0ebedded20c752319ba9c3 keepassx-0.2.2-r1.ebuild 1068
+MISC ChangeLog 2313 RMD160 d8041b635b5e168d924a66bc03b68640e4cca843 SHA1 9444eecd90cc5893c575a0ae2189dda500d583a2 SHA256 e1c0eaeb50a9dac2be8caf34ae30fdcc13ab0b43cae72032e6f2a706890f77bc
+MD5 42ed8fb08349f94a6c5a814ea1f324ae ChangeLog 2313
+RMD160 d8041b635b5e168d924a66bc03b68640e4cca843 ChangeLog 2313
+SHA256 e1c0eaeb50a9dac2be8caf34ae30fdcc13ab0b43cae72032e6f2a706890f77bc ChangeLog 2313
 MISC metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd SHA1 bb91e173269a532d2f85a2c7772cf221a6306dc3 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed
 MD5 5e132b8e1a0ed8e43e12174365b32363 metadata.xml 505
 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd metadata.xml 505
 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed metadata.xml 505
-MD5 c533243c30cc5d5dc663d928b1fc6800 files/digest-keepassx-0.2.2 244
-RMD160 de8c91ac690bd72f6e2878b0255abce458fb9ab9 files/digest-keepassx-0.2.2 244
-SHA256 d44e82387d8509e8bdc3771b946df5414b2bfeea46c87182fb6b0685fa16d518 files/digest-keepassx-0.2.2 244
 MD5 c533243c30cc5d5dc663d928b1fc6800 files/digest-keepassx-0.2.2-r1 244
 RMD160 de8c91ac690bd72f6e2878b0255abce458fb9ab9 files/digest-keepassx-0.2.2-r1 244
 SHA256 d44e82387d8509e8bdc3771b946df5414b2bfeea46c87182fb6b0685fa16d518 files/digest-keepassx-0.2.2-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGyoUSNQqtfCuFneMRAgc1AJwIFgW1Zb20U2CV1BBKAMivfsXsYQCgmea5
-rLnPIpxD9Ve/bFln0cZD1AU=
-=Q3UK
+iD8DBQFGysp1NQqtfCuFneMRAjM5AJwNjx9j6DroJ8wJd+wZjn+Q8iA1QACeLZb4
+2+iwdaSUvJBD4X+0TdB7+FU=
+=8v52
 -----END PGP SIGNATURE-----
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"
-}