Resolve bug #198352 where the binaries were built before the new lib sometimes, leading to bad linking.

Package-Manager: portage-2.1.5.4

4 files changed, 72 insertions, 3 deletions

diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 3f9abb1ee1f2..888ec1378c2b 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/keyutils
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.8 2007/12/10 17:09:14 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.9 2008/06/07 02:48:07 robbat2 Exp $
+
+*keyutils-1.2-r1 (07 Jun 2008)
+
+  07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/keyutils-1.2-makefile-fixup.patch, +keyutils-1.2-r1.ebuild:
+  Resolve bug #198352 where the binaries were built before the new lib
+  sometimes, leading to bad linking.
 
   10 Dec 2007; Raúl Porcel <armin76@gentoo.org> keyutils-1.2.ebuild:
   Add ~alpha/~ia64/~sparc wrt #201744
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 31282e81b853..837570eec467 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,8 +1,10 @@
+AUX keyutils-1.2-makefile-fixup.patch 1080 RMD160 b2583a2b89e57977de3b7c0d449b01b82032bb96 SHA1 23cc8ca884f81b2712e7af84ed42c70f3195ff67 SHA256 ff500f9eafe6006a49755fc1dbcad99d468b401dbbd465c52bd934cb84e9076c
 DIST keyutils-1.0.tar.bz2 32410 RMD160 44bda073e6d0cbc363c8dabd622f5b39a644cf6a SHA1 753316779bf8bd6661213250ac841fcb19dcf7b9 SHA256 dc9182bb1d0f7874c153ae4eafbb301730fa1635384b93f3a1cd723f8d73fe8f
 DIST keyutils-1.1.tar.bz2 39206 RMD160 7fad7364ef59b4933ce108317abd606fb727c592 SHA1 e3e523e42d7cedb39d57e5f9a7315b30cf7d9d96 SHA256 a67456986bbdce8872d75f3d537ea2a398ddae412a2a0bf8b9fa62bdd2ade002
 DIST keyutils-1.2.tar.bz2 37935 RMD160 ae624bf2d34bc965546ed1828e2e4fe5095c12fb SHA1 3d92a95fb2015835b883a5477e00ab87d339c92d SHA256 306d9b2f8f3ca68805e695b90ae7e316da59cbe1410a605f6686ab95d9219b3d
 EBUILD keyutils-1.0.ebuild 590 RMD160 640e66940784feca8dd7322da105c81c655c1e5f SHA1 17531d7c63db938f94b9dc290a5074499ed10874 SHA256 ed08914143dc19e4781b4f584d2e6ed5eadb35ac293bc208f2db101deefe617d
 EBUILD keyutils-1.1.ebuild 696 RMD160 96aeee0de7c14624b4202633d2420f5af38c8d49 SHA1 f575ed27fa2afa92d3b9c7ee957f48a908bb648f SHA256 dd12f6ddb917aabdffed634caf7cf213742c22d6bf3d653320b85a80089b6832
+EBUILD keyutils-1.2-r1.ebuild 837 RMD160 f7b4cca65644729218ea5e904c0b1ddbeb163705 SHA1 e3481ed296d3dec4a2d6d5affa75ba0362705225 SHA256 1915ef0d91a5358e722e545441b9d391201d7356cc03c31c2ef7facd09198bdd
 EBUILD keyutils-1.2.ebuild 774 RMD160 a55660d2c999c78336cf466e5a2dd879e7ae6caf SHA1 e7a072e20cf51830bb918807d4c23e6942d2713f SHA256 8c1311e587f9b32576fda8665572118289e3e0fd56190f915752318e7f740c41
-MISC ChangeLog 1247 RMD160 b4a8c7033743659f29275146b12a0de5056de78f SHA1 e08bda13d59892cdcd8a374650d876c29ef960c6 SHA256 add600aa52d568aafca6212c4136a7b9568ca5150b06e98932525071255dae4f
+MISC ChangeLog 1510 RMD160 b2b299d53250699f6e0d41a3fa246f3fe9a77552 SHA1 7f5f34cbf590a5902706f70f8c8adeffc4ab2e51 SHA256 081c7187b09502daa0074a4efecdd3bbbe937080facea5ebb7bc25d4e78730fd
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
diff --git a/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch
new file mode 100644
index 000000000000..73b7bf2258fe
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.2-makefile-fixup.patch
@@ -0,0 +1,26 @@
+diff -Nuar keyutils-1.2.orig/Makefile keyutils-1.2/Makefile
+--- keyutils-1.2.orig/Makefile	2008-06-06 19:35:39.750214054 -0700
++++ keyutils-1.2/Makefile	2008-06-06 19:45:38.504078903 -0700
+@@ -72,10 +72,10 @@
+ 	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
+ 
+ 
+-keyctl: keyctl.c keyutils.h Makefile
++keyctl: keyctl.c keyutils.h Makefile $(DEVELLIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
+ 
+-request-key: request-key.c keyutils.h Makefile
++request-key: request-key.c keyutils.h Makefile $(DEVELLIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lkeyutils -Wl,-rpath,$(LIB)
+ 
+ 
+@@ -89,9 +89,7 @@
+ 	$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
+ endif
+ 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+-	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ 	mkdir -p $(DESTDIR)$(USRLIBDIR)
+-	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+ 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/sys-apps/keyutils/keyutils-1.2-r1.ebuild b/sys-apps/keyutils/keyutils-1.2-r1.ebuild
new file mode 100644
index 000000000000..536a751bee46
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.2-r1.ebuild,v 1.1 2008/06/07 02:48:07 robbat2 Exp $
+
+inherit multilib eutils
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="http://www.kernel.org/"
+SRC_URI="http://people.redhat.com/~dhowells/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-kernel/linux-headers-2.6.11"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-1.2-makefile-fixup.patch
+	cd "${S}"
+	sed -i \
+		-e '/CFLAGS/s|:= -g -O2|+=|' \
+		Makefile || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)" \
+		install || die
+	dodoc README
+}