Dont ignore errors in the shlib subdir #216952 by Markus Ullmann.

Package-Manager: portage-2.2_pre5

4 files changed, 45 insertions, 5 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index d62b929b3c3a..baae1b817aa2 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.115 2008/02/26 23:06:13 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.116 2008/04/08 21:43:06 vapier Exp $
+
+  08 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.2-no-ignore-shlib-errors.patch,
+  readline-5.2_p12-r1.ebuild:
+  Dont ignore errors in the shlib subdir #216952 by Markus Ullmann.
 
   26 Feb 2008; Santiago M. Mola <coldwind@gentoo.org>
   readline-5.2_p12-r1.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index e2585af0f52d..85b962c5af44 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
 AUX readline-5.0-darwin.patch 461 RMD160 43c4f4af91ab61d05dfb1561f3bbf68f2eb2c88a SHA1 9c971543144248c883db953c6547f520f61cfb83 SHA256 449a7cc02ca053511dff11d29481ff40e76eb9a3ac0b3f0e119fe4501d06587e
 AUX readline-5.0-del-backspace-policy.patch 1074 RMD160 785fc7768f3a017a56e9119f25fece1f58490275 SHA1 376d47bfefb1a9da8c908e2e5e07b2fa273bb142 SHA256 d607c4b902a838662df132badc7ea8a38cc041c0c9b224b34ffd28cf6a43fe7b
@@ -10,6 +13,7 @@ AUX readline-5.1-fbsd-pic.patch 287 RMD160 3950019e591400f83323a610ed7ab024f3dd5
 AUX readline-5.1-rlfe-build.patch 252 RMD160 7e9085f685b7732d0ef0ecdcc5538b7d84bb7d1f SHA1 2686f8f0a501f2c840e698ef768d7052e265c5b4 SHA256 45f3ac7973b5d5af4a79575fe0b6c364bb444dbbe42f43b600b1dd1d99dcac55
 AUX readline-5.1-rlfe-libutil.patch 530 RMD160 4f0d86709159d8299d51da21de99abd4ffa2ad1f SHA1 0667f4022fe0db3c90e167b66ab89f920f53e940 SHA256 b99dee7796e16598e4bed51a84b4daaff7b7f43532f8738e5581bdfe1068c69e
 AUX readline-5.1-rlfe-uclibc.patch 1694 RMD160 715127465c03df7329f23b1a12aece8001aca96c SHA1 c43ace7708b19e55ce59127b7c4ff8bd7683e670 SHA256 8045b4a37c1a3b19171fe4192161af46188223bdd61ab5e32561593f9c89270e
+AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
 AUX readline-5.2-rlfe-build.patch 350 RMD160 b6563fbd50795759543f3294c1bf93a9e485cf7b SHA1 de2c1a03e054bdc94c641ff943d2677fb0542d58 SHA256 2a6e8890363b367e4df890c4d4c1afa30437712fbdae98d8f04b7baed3b4c58c
 DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.0.tar.gz 1808946 RMD160 17b38d5cafab6dbc663aba4fbba5a2e282bb4876 SHA1 9b9959c3f62e3e82d3edd604c0bf6124d5256c9e SHA256 d19e4f820da653b94262b0e5cdeda45f474c2d7b378a85a4b9aeaae76269a611
@@ -44,7 +48,13 @@ DIST readline52-012 3870 RMD160 cf6ca8ced10d2e1a6cddefeb7871820f01c1f552 SHA1 33
 EBUILD readline-4.3-r5.ebuild 2425 RMD160 649a6c1e778d46395747bca2f2cf8e6a52e56db9 SHA1 ea411c19af7083351934c79e0fd09b0e1641d6ed SHA256 cbaa0be05784e163e907fd093e65057422d7b25c5234035b007407935e93269f
 EBUILD readline-5.0-r2.ebuild 2424 RMD160 5f596d5fb86fff53e1cb21fde5243681c4d09cab SHA1 521169f34d1f21831e4136dee3c6b31fbdb6d133 SHA256 81c09d3039ba27df3cee62cd254772c5914704ea484eaa6d10de39b279729d4c
 EBUILD readline-5.1_p4.ebuild 2801 RMD160 aeaf87696c8e457ab870062dd51289d016884f8a SHA1 93c474aa9cb108cb9e6ce8a76b182f313192b7fa SHA256 d77ccfa3fcb3ecf746ddbb4220f89f4c82b1c63c8a2a4643f3b2ebfc50572b4c
-EBUILD readline-5.2_p12-r1.ebuild 2666 RMD160 1f7ae5b8a826d0aa4f2cffce1105d4b13652a43a SHA1 c5ecf52216eb7bff8a97e0121dfd07779fd558ec SHA256 39b846c72ca4140e6c310f732208b32732df4e7660bf46bb573d42052dd1abf7
-EBUILD readline-5.2_p7.ebuild 2705 RMD160 37af817f0932797414234b444d0ccd4d0cbad3cc SHA1 3289b07baaab8bb5a1878aa21264d14b31714e89 SHA256 b90c536700eb4c620ab282891ae30404f6441e94fcb011204ef28de787bf6a7e
-MISC ChangeLog 14700 RMD160 9a68d84b1c0ed9f116d5051036893513cd20f039 SHA1 ea2451039fff51ba64b6afa46e52a4939c29a7ae SHA256 7b688f7ba10d851d9488fb6d411c5a65b9d0613cc0fbad4527c4304811b4e80b
+EBUILD readline-5.2_p12-r1.ebuild 2733 RMD160 a098d35f886c199054105d4aa69d36fc200e6c1f SHA1 260317ba644fbe8be946c91daf0ea45afb5639c2 SHA256 138b0966ee76de881779a65b4d6acb1b228d2e8c6f12a92ef914b5f0c490f3df
+MISC ChangeLog 14899 RMD160 ca76d68c67d45c82829e7d2dbe3555107c5485dd SHA1 d15e9eb6db3ce43e28d59d6747f026881d04d97f SHA256 86f5e5f4dab512588dbb949c5ce3f98bf0258810b599ced6a8247ee39f170efa
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH++bwj9hvisErhMIRAiR/AJ9Cb//QsQqgTj+gqQg7IeZ0YUridQCgrVjE
+t1T0tDfYD0Mzx+N46UL6rzk=
+=TYXq
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
new file mode 100644
index 000000000000..fc6349113167
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
@@ -0,0 +1,24 @@
+dont ignore errors in the shlib subdir
+
+http://bugs.gentoo.org/216952
+
+--- Makefile.in
++++ Makefile.in
+@@ -194,7 +194,7 @@
+ 
+ shared:	force
+ 	-test -d shlib || mkdir shlib
+-	-( cd shlib ; ${MAKE} ${MFLAGS} all )
++	( cd shlib ; ${MAKE} ${MFLAGS} all )
+ 
+ documentation: force
+ 	-test -d doc || mkdir doc
+@@ -238,7 +238,7 @@
+ 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
+ 
+ install-shared: installdirs install-headers shared install-doc
+-	-( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
++	( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
+ 	
+ uninstall-shared: maybe-uninstall-headers
+ 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
diff --git a/sys-libs/readline/readline-5.2_p12-r1.ebuild b/sys-libs/readline/readline-5.2_p12-r1.ebuild
index 9439e5e7b488..4bf6f35fa494 100644
--- a/sys-libs/readline/readline-5.2_p12-r1.ebuild
+++ b/sys-libs/readline/readline-5.2_p12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p12-r1.ebuild,v 1.7 2008/02/26 23:06:13 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p12-r1.ebuild,v 1.8 2008/04/08 21:43:06 vapier Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -45,6 +45,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
 	epatch "${FILESDIR}"/${PN}-5.2-rlfe-build.patch #151174
 	epatch "${FILESDIR}"/${PN}-5.1-rlfe-uclibc.patch
+	epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
 
 	ln -s ../.. examples/rlfe/readline