Version bump #381467 by teidakankan. Fixes rpath issues #328467 by William Throwe and multilib issues #339173 by Matt McAdoo.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 104 insertions, 2 deletions

diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 6c8d98941425..ef019ea73d34 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/keyutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.25 2011/07/08 19:41:49 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.26 2011/09/02 17:41:30 vapier Exp $
+
+*keyutils-1.5.3 (02 Sep 2011)
+
+  02 Sep 2011; Mike Frysinger <vapier@gentoo.org> +keyutils-1.5.3.ebuild,
+  +files/keyutils-1.5.3-makefile-fixup.patch:
+  Version bump #381467 by teidakankan. Fixes rpath issues #328467 by William
+  Throwe and multilib issues #339173 by Matt McAdoo.
 
   08 Jul 2011; Matt Turner <mattst88@gentoo.org> keyutils-1.4-r1.ebuild:
   Added ~mips, bug 201744
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 0ec36abf12d7..6ca5b0afb2c6 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,8 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX keyutils-1.2-makefile-fixup.patch 1059 RMD160 9216207704fbe7cb91bbb1e2e64628be6bef70b7 SHA1 3256837557e6f4ba806e6705562c8ab5ffab72c2 SHA256 77e27c53659c6f26e681cf471a662275ef6b97ed02950ffc6365b3955e2b0beb
+AUX keyutils-1.5.3-makefile-fixup.patch 1512 RMD160 7ef9b27fcee69fd29c9f788a2ab551fadd29fdd2 SHA1 ed0c56e9a1dce1445430ef2637f40e216f07b226 SHA256 add2a6d8bcdbe562bb977e97c37759a4af7e19a3b8c2562b18937ab7deee6286
 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
 DIST keyutils-1.4.tar.bz2 39016 RMD160 40fdaa2ea95fa97e477ddbebe8597857b380e3fd SHA1 4468485f00238232f53229d66b13bdd63cb3eb0f SHA256 c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6
+DIST keyutils-1.5.3.tar.bz2 48763 RMD160 07886846c9b3b0cb1d3a0dd89ecaea478b0aaa48 SHA1 622f1f6405a8aa99aa2a3ce7e87045794eeaa11e SHA256 f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55
 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 846 RMD160 19e3f9a880062b8ffa28955f02364c31d7662331 SHA1 68d64c6cf6ba68ea703c85da1f56ed297b56f2de SHA256 bf7a9b2dfd37133baf84499eeb422be78a5b9f64367a7c88a02f057353e982b4
@@ -10,5 +15,13 @@ EBUILD keyutils-1.2-r2.ebuild 1010 RMD160 029c14b34f1f189243cf0d7e50578ba6630cb4
 EBUILD keyutils-1.2.ebuild 774 RMD160 a55660d2c999c78336cf466e5a2dd879e7ae6caf SHA1 e7a072e20cf51830bb918807d4c23e6942d2713f SHA256 8c1311e587f9b32576fda8665572118289e3e0fd56190f915752318e7f740c41
 EBUILD keyutils-1.4-r1.ebuild 1106 RMD160 7de77375becc4454efedc872fccb67a05e7ba82d SHA1 dd254dd30332272dd5f78a7b51c6b499033d4502 SHA256 452acb493387e2372c5d1cc838923800620a7bad802e437b55fc2629173c46e3
 EBUILD keyutils-1.4.ebuild 1026 RMD160 8f7b66a04ff5cf8d2faaee91782bea55948244e6 SHA1 65e9e8c6a3caa0b15037e6dd1547ec5f9142c820 SHA256 9b26b4848484f8c5d16241e5d2f822356c6b0765ce0da4e3677b651b71eedd95
-MISC ChangeLog 3384 RMD160 7112324627aaafb0fda99f731fd0572da3a21336 SHA1 3f5c731686331631c141e3d077c40e6d716b8824 SHA256 17bcb404c373e0fac3226e323970b39f6f8253f30eb32c9099a2e3ca7ab403d7
+EBUILD keyutils-1.5.3.ebuild 1090 RMD160 58de3a6d742904ce5a6ce468120cb7234293dc3e SHA1 23c89c7eabb2d342becb312bda22cdb3af1e06f7 SHA256 a8b4715ed752d0fe311820454f28f5d16d3a82667cc0906a0e859c1a4ee0a57d
+MISC ChangeLog 3664 RMD160 d152e8548681eb81ca14203aaec2597167a5b6c7 SHA1 d6fbaf3b02190608e7cddce8f9f3405094cf4301 SHA256 9f02d523eb77729fabcf7689f18a4a026d130ea3995d3ad777dcba6b0721ef1d
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5hFVAACgkQaC/OocHi7JY3rgD/XBjrPYpOYVAp+AczGL70umm6
+hJd7kBbfO3VLhbE6aDIA/1XFbhStNklgDxfjBiIs+FM/iWp2g2Yc/5VxzeN7BfIB
+=NzQ3
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch
new file mode 100644
index 000000000000..b0e8add18488
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.3-makefile-fixup.patch
@@ -0,0 +1,42 @@
+From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 2 Sep 2011 13:30:30 -0400
+Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
+
+---
+ Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9e3fa9b..46695d1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makefile
+ %.o: %.c keyutils.h Makefile
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ 
+-keyctl: keyctl.o -lkeyutils
++keyctl: keyctl.o $(DEVELLIB)
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-request-key: request-key.o -lkeyutils
++request-key: request-key.o $(DEVELLIB)
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-key.dns_resolver: key.dns_resolver.o -lkeyutils
++key.dns_resolver: key.dns_resolver.o $(DEVELLIB)
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
+ 
+ ###############################################################################
+@@ -91,7 +91,7 @@
+ 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ 	mkdir -p $(DESTDIR)$(USRLIBDIR)
+-	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++	$(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(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
+-- 
+1.7.6
+
diff --git a/sys-apps/keyutils/keyutils-1.5.3.ebuild b/sys-apps/keyutils/keyutils-1.5.3.ebuild
new file mode 100644
index 000000000000..98fa18ad5022
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.3.ebuild,v 1.1 2011/09/02 17:41:30 vapier Exp $
+
+EAPI="3"
+
+inherit multilib eutils toolchain-funcs
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
+SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.3-makefile-fixup.patch
+	sed -i \
+		-e '1iRPATH=' \
+		-e '/^C.*FLAGS/s|:=|+=|' \
+		-e 's:-Werror::' \
+		-e '/^BUILDFOR/s:=.*:=:' \
+		-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
+		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README
+	gen_usr_ldscript -a keyutils
+}