summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2004-07-31 22:44:51 +0000
committerTavis Ormandy <taviso@gentoo.org>2004-07-31 22:44:51 +0000
commit6687fff58e5905917fe9ff4397fb8d32c3763431 (patch)
treec101cd494eaec402f34a34dfce3451ff9793bf81 /app-crypt/gnupg
parentBump x11-plugins/wmdrawer to version 0.10.5. Version 0.10.4.1 stable for x86.... (diff)
downloadgentoo-2-6687fff58e5905917fe9ff4397fb8d32c3763431.tar.gz
gentoo-2-6687fff58e5905917fe9ff4397fb8d32c3763431.tar.bz2
gentoo-2-6687fff58e5905917fe9ff4397fb8d32c3763431.zip
fixing #59012
Diffstat (limited to 'app-crypt/gnupg')
-rw-r--r--app-crypt/gnupg/ChangeLog6
-rw-r--r--app-crypt/gnupg/gnupg-1.2.5.ebuild12
2 files changed, 14 insertions, 4 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 211a75e7c1fb..a5732475c0ef 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/gnupg
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.69 2004/07/31 17:00:22 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.70 2004/07/31 22:44:51 taviso Exp $
+
+ 31 Jul 2004; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.5.ebuild:
+ installation fails with nls enabled, using sed to make the
+ access to `mkinstalldirs` consistent. #59012
*gnupg-1.2.5 (31 Jul 2004)
diff --git a/app-crypt/gnupg/gnupg-1.2.5.ebuild b/app-crypt/gnupg/gnupg-1.2.5.ebuild
index f54cffaf25d1..3e95b30796c2 100644
--- a/app-crypt/gnupg/gnupg-1.2.5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.5.ebuild,v 1.1 2004/07/31 17:00:22 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.5.ebuild,v 1.2 2004/07/31 22:44:51 taviso Exp $
inherit eutils flag-o-matic
@@ -46,6 +46,12 @@ src_unpack() {
fi
use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.patch
+
+ # trying to fix the install logic that breaks when nls
+ # is enabled. #59012
+ sed -i \
+ 's#\(\(mkinstalldirs\) = \).*#\1\$(SHELL) \$(top_srcdir)/scripts/\2#g' \
+ ${S}/po/Makefile.in.in ${S}/intl/Makefile.in
}
src_compile() {
@@ -94,7 +100,7 @@ src_compile() {
}
src_install() {
- einstall libexecdir="${D}/usr/lib/gnupg"
+ einstall libexecdir="${D}/usr/lib/gnupg" || die
# keep the documentation in /usr/share/doc/...
rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
@@ -118,7 +124,7 @@ pkg_postinst() {
einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
echo
if use idea; then
- einfo "you have compiled ${PN} with support for the IDEA algorithm, this code"
+ einfo "you've compiled ${PN} with support for the IDEA algorithm, this code"
einfo "is distributed under the GPL in countries where it is permitted to do so"
einfo "by law."
einfo