fix installation paths on helpers

Package-Manager: portage-2.0.51.22-r2

4 files changed, 24 insertions, 10 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e98415732e1b..e833958675b7 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.123 2005/08/03 11:49:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.124 2005/08/06 00:03:19 dragonheart Exp $
+
+*gnupg-1.4.2-r1 (05 Aug 2005)
+
+  05 Aug 2005; Daniel Black <dragonheart@gentoo.org> -gnupg-1.4.2.ebuild,
+  +gnupg-1.4.2-r1.ebuild:
+  helpers directory fix bug #101346. Thanks to Stephan Wienczny
 
   03 Aug 2005; Seemant Kulleen <seemant@gentoo.org>
   -files/gnupg-1.2.4-hppa_unaligned_constant.patch,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 82226d2d1ceb..805b3ef64d8e 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,15 +1,25 @@
-MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6077cd65580b4fe18e938407ab0c706 ChangeLog 20333
+MD5 b47d1016e516b746f7bc12f92ef133e8 gnupg-1.4.2-r1.ebuild 6262
 MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800
+MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 MD5 cfe5a67b1204af18a6b03edbdbaa5363 gnupg-1.4.1.ebuild 6292
-MD5 25cc01bef564eb349af85dbb81aa06dc gnupg-1.4.1-r1.ebuild 6365
-MD5 d6aec47f51e77081e719189d9e51766d gnupg-1.4.2.ebuild 6362
 MD5 65762289b0895c03fa47da7283a216a6 gnupg-1.9.15-r1.ebuild 3050
-MD5 52c9a98591ebf3ab57b8bab9993efd6c ChangeLog 20133
+MD5 25cc01bef564eb349af85dbb81aa06dc gnupg-1.4.1-r1.ebuild 6365
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
-MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2 190
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC8/5WmdTrptrqvGERAlBLAJ9rTjeCQ63tGYcCCXFymKIZt4+3VgCcD4AZ
+4P2GO+nRudNEja1ZFQSpTFY=
+=38CP
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
index e9f46e0a9867..e9f46e0a9867 100644
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
diff --git a/app-crypt/gnupg/gnupg-1.4.2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
index da8f4466b5d9..e9d76f4597f7 100644
--- a/app-crypt/gnupg/gnupg-1.4.2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2.ebuild,v 1.2 2005/08/03 11:48:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild,v 1.1 2005/08/06 00:03:19 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -119,13 +119,11 @@ src_compile() {
 	# this is because it will run some tests directly
 	gnupg_fixcheckperms
 	emake || die
-
-	# NOTE libexecdir dir is deliberately different from that in the install
 }
 
 src_install() {
 	gnupg_fixcheckperms
-	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
+	emake DESTDIR=${D} install || die
 
 	# caps support makes life easier
 	use caps || fperms u+s,go-r /usr/bin/gpg