determine kernel version from running version rather than /usr/src/linux - bug #113474

(Portage version: 2.0.53_rc7)

3 files changed, 25 insertions, 12 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 7b5c9c74ba91..61c35862be07 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.139 2005/11/24 09:19:47 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.140 2005/11/25 08:18:12 dragonheart Exp $
+
+  25 Nov 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.4.2-r2.ebuild:
+  determine kernel version from running version rather than /usr/src/linux -
+  bug #113474 thanks to Georgi Georgiev
 
   24 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org> gnupg-1.4.2-r2.ebuild:
   Stable on hppa.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 65e714a8a6f1..cee3e7667134 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,22 +1,22 @@
 MD5 d29c7ba5ccccd826bbe73ed195ae0d74 ChangeLog 22894
-MD5 3dedd2cc4e62aef96d919c74970e758b gnupg-1.2.6.ebuild 3795
-MD5 c77b579997468bf58a6fc5a5e1a2fb00 gnupg-1.4.1-r1.ebuild 6272
-MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
-MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
-MD5 f887c428a2951cbd4e8b30ec56caec15 gnupg-1.4.2-r2.ebuild 6622
-MD5 3fd02f30190d0919bf9a5972d40182c2 gnupg-1.9.18.ebuild 3205
-MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
-MD5 81178f9c770262366fc26114d53efc13 gnupg-1.9.19.ebuild 3205
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r2 190
 MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gnupg-1.9.18 66
+MD5 28ad3af724b879fe86743d59ae4447dd files/digest-gnupg-1.9.19 66
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
+MD5 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
 MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
 MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
-MD5 28ad3af724b879fe86743d59ae4447dd files/digest-gnupg-1.9.19 66
-MD5 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
+MD5 3dedd2cc4e62aef96d919c74970e758b gnupg-1.2.6.ebuild 3795
+MD5 c77b579997468bf58a6fc5a5e1a2fb00 gnupg-1.4.1-r1.ebuild 6272
+MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
+MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
+MD5 460d7581be907c31874927f074b210e3 gnupg-1.4.2-r2.ebuild 6792
+MD5 3fd02f30190d0919bf9a5972d40182c2 gnupg-1.9.18.ebuild 3205
+MD5 81178f9c770262366fc26114d53efc13 gnupg-1.9.19.ebuild 3205
+MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
index 2ba748cf6554..f28abf1718ed 100644
--- a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r2.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-r2.ebuild,v 1.10 2005/11/24 09:19:47 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.11 2005/11/25 08:18:12 dragonheart Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -39,6 +39,12 @@ RDEPEND="!static? (
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl"
 
+pkg_setup() {
+	# fix bug #113474 - no compiled kernel needed now
+	get_running_version
+
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -185,9 +191,12 @@ src_test() {
 pkg_postinst() {
 	if ! use caps && kernel_is lt 2 6 9
 	then
+		chmod u+s,go-r ${ROOT}/usr/bin/gpg
 		einfo "gpg is installed suid root to make use of protected memory space"
 		einfo "This is needed in order to have a secure place to store your"
 		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
+	else
+		chmod u-s,go-r ${ROOT}/usr/bin/gpg
 	fi
 	echo
 	if use idea; then