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

(Portage version: 2.1.5.4)

3 files changed, 69 insertions, 2 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/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
+}