summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2003-04-18 17:37:05 +0000
committerAron Griffis <agriffis@gentoo.org>2003-04-18 17:37:05 +0000
commite4ec681e62e2cdc116c8cf3f746ec2bbef9e5479 (patch)
tree22f2e7b5fb382fe095049f0dcb882f3b827eacf6 /dev-lang
parentBump (diff)
downloadgentoo-2-e4ec681e62e2cdc116c8cf3f746ec2bbef9e5479.tar.gz
gentoo-2-e4ec681e62e2cdc116c8cf3f746ec2bbef9e5479.tar.bz2
gentoo-2-e4ec681e62e2cdc116c8cf3f746ec2bbef9e5479.zip
fix gpg problems
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ccc/ChangeLog6
-rw-r--r--dev-lang/ccc/ccc-6.5.9.001.ebuild26
2 files changed, 23 insertions, 9 deletions
diff --git a/dev-lang/ccc/ChangeLog b/dev-lang/ccc/ChangeLog
index ce1328eba71a..613633abf995 100644
--- a/dev-lang/ccc/ChangeLog
+++ b/dev-lang/ccc/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for dev-lang/ccc
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ChangeLog,v 1.2 2003/04/15 01:09:37 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ChangeLog,v 1.3 2003/04/18 17:37:05 agriffis Exp $
*ccc-6.5.9.001 (15 Apr 2003)
+ 18 Apr 2003; Aron Griffis <agriffis@gentoo.org> ccc-6.5.9.001.ebuild:
+ Fix some dependency issues and fix problem with gpg not decrypting due to
+ missing /root/.gnupg
+
15 Apr 2003; Tavis Ormandy <taviso@gentoo.org> ccc-6.5.9.001.ebuild:
Updated ebuild to latest release of ccc.
Changed rdepend of libcpml to >=libcpml-5.2.01-r2, this should fix the probe problem.
diff --git a/dev-lang/ccc/ccc-6.5.9.001.ebuild b/dev-lang/ccc/ccc-6.5.9.001.ebuild
index 6410fadf547f..2e7e146ca7af 100644
--- a/dev-lang/ccc/ccc-6.5.9.001.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001.ebuild,v 1.1 2003/04/15 01:09:37 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001.ebuild,v 1.2 2003/04/18 17:37:05 agriffis Exp $
#
# Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
# and edited by Aron Griffis <agriffis@gentoo.org>
@@ -20,17 +20,19 @@ SLOT="0"
# NOTE: ALPHA Only!
KEYWORDS="-* ~alpha"
-DEPEND="sys-devel/gcc-config
+RDEPEND="virtual/glibc
+ dev-libs/libots
+ >=dev-libs/libcpml-5.2.01-r2"
+
+DEPEND="${RDEPEND}
+ sys-devel/gcc-config
app-arch/rpm2targz
>=sys-apps/sed-4
app-crypt/gnupg
>=app-shells/bash-2.05b
+ >=dev-libs/libcpml-5.2.01-r2
"
-RDEPEND="virtual/glibc
- dev-libs/libots
- >=dev-libs/libcpml-5.2.01-r2"
-
# These variables are not used by Portage, but is used by the functions
# below.
ccc_release="${PV}-6"
@@ -55,10 +57,18 @@ src_unpack() {
# :-NULL safeguards against bash bug.
einfo "Decrypting ccc distribution..."
- gpg --quiet --passphrase-fd 0 --output ${ccc_rpm} \
+ gpg --quiet \
+ --homedir=${T} --no-permission-warning \
+ --no-mdc-warning \
+ --passphrase-fd 0 \
+ --output ${ccc_rpm} \
--decrypt ${DISTDIR}/${ccc_rpm}.crypt \
- <<< ${CCC_LICENSE_KEY:-NULL} >/dev/null 2>&1 || \
+ <<< ${CCC_LICENSE_KEY:-NULL}
+
+ # Test PIPESTATUS for gpg result since last thing in pipeline is grep
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then
die "Sorry, your license key doesnt seem to unlock the distribution"
+ fi
ebegin "Unpacking ccc distribution..."
# This is the same as using rpm2targz then extracting 'cept that