From e86c6456d9950f0a8af5e073b613540c4508accc Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 28 Nov 2011 00:22:12 +0000 Subject: [PATCH] Do not inherit autotools-utils.eclass (bug #392089). Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64 --- dev-libs/libconfig/ChangeLog | 6 +++++- dev-libs/libconfig/Manifest | 12 ++++++------ dev-libs/libconfig/libconfig-1.4.7.ebuild | 8 ++++---- dev-libs/libconfig/libconfig-1.4.8.ebuild | 8 ++++---- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dev-libs/libconfig/ChangeLog b/dev-libs/libconfig/ChangeLog index 4a9f4a278671..15f45269eab7 100644 --- a/dev-libs/libconfig/ChangeLog +++ b/dev-libs/libconfig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libconfig # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.35 2011/11/07 03:25:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.36 2011/11/28 00:22:12 jer Exp $ + + 28 Nov 2011; Jeroen Roovers libconfig-1.4.7.ebuild, + libconfig-1.4.8.ebuild: + Do not inherit autotools-utils.eclass (bug #392089). 07 Nov 2011; Jeroen Roovers -libconfig-1.3.2.ebuild: ^ diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest index 1b97c47470c8..84f813a61278 100644 --- a/dev-libs/libconfig/Manifest +++ b/dev-libs/libconfig/Manifest @@ -3,14 +3,14 @@ Hash: SHA1 DIST libconfig-1.4.7.tar.gz 644993 RMD160 2f6eab75aaf92df2553506e61501d745742746b5 SHA1 59381339351e2901520cf2f170c8b4703e58833d SHA256 fdeaaf18674a308336629b0db58854221a866329f7c2766ff56771de50bc49b9 DIST libconfig-1.4.8.tar.gz 645823 RMD160 15b51fa89692199f89cd4f3436519525ac93bb19 SHA1 c16b9caa207afdf36fc664ad0b2807ecc7a562fa SHA256 18b1509fbf438a8c7f9b0af32284e458189b5f6dfd044f898926109f3c3c01ed -EBUILD libconfig-1.4.7.ebuild 1184 RMD160 907c42443a997144e9b06c8aa70e65c5a8defb3b SHA1 301f10a6a1074dda5bee77b74cbfaf022531575a SHA256 9d3810823e412c2f0c59efe3fd8f1faef83794bea1ec2311e9361253510f280e -EBUILD libconfig-1.4.8.ebuild 1019 RMD160 336938dce2e1efcac7d295c21e05d6f77f2637f9 SHA1 c7577b9289a9227cdc787328e58dac42a80a73bc SHA256 fd52cd12a13aaa74a2f3472bceeb49e6b78a9ed2e65ab6b7c8ff8d607bfc7da4 -MISC ChangeLog 4514 RMD160 c49e34d3bafa16cc70a78c14266c8d32eff9bee5 SHA1 131deb5c6148f38368d50a2da0b41a409111c646 SHA256 751e11ec87b390da54d887d72c074c43fa047421c6cbb0ffdb73156abfadac68 +EBUILD libconfig-1.4.7.ebuild 1178 RMD160 40255eaba99c081d1f47c74b8441f2b67d441b34 SHA1 4f563d189219af9d717b684b05223f4ec44e505d SHA256 193e848ac8b6ad03e1be6176e4be8f4fb2682555486c672f98bdb8b37020cdc9 +EBUILD libconfig-1.4.8.ebuild 1017 RMD160 d042d0b696c4528c54811787cbad32f5dc779cf3 SHA1 2e0ddb8277b177f6e604ecad577221597e9e8b47 SHA256 a1c94275beea80c26a8a96e21369d081c82cab816e36e8d2a1426eb9da3b1c18 +MISC ChangeLog 4667 RMD160 7b26e91c1c68c7e42b7e203e49630c51361e5c02 SHA1 bbabed1e9bb4f9e7d0db7a1cee9826e2c2318c34 SHA256 5b1c811c2be684aaa002086bff90c0adcf1d605b8abc1075c00488bff4d20e00 MISC metadata.xml 351 RMD160 9b97987b3215490411b1c00976e3dc0ab148a712 SHA1 a5e3eab6d83ba6ad7588567ae84e98b232477684 SHA256 29e283220d3de2cd2249bc7793574e2a05c644227ee108f3f87840e53475a53d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk63T7wACgkQVWmRsqeSphN0qQCeL4S0zpnvE/wqUj462DnvoPVn -/JgAnRBaPpeBc6CIjZwng1Q/SviZwY1y -=8umw +iEYEARECAAYFAk7S1EEACgkQVWmRsqeSphOxegCfSYfz54wvBP2W7kZL7P/FllQn +sTgAnjwls8Ie2kjWIVjjC3jsil2YRN/Z +=jgWP -----END PGP SIGNATURE----- diff --git a/dev-libs/libconfig/libconfig-1.4.7.ebuild b/dev-libs/libconfig/libconfig-1.4.7.ebuild index cf7ce532aabd..3dd50b6c8a19 100644 --- a/dev-libs/libconfig/libconfig-1.4.7.ebuild +++ b/dev-libs/libconfig/libconfig-1.4.7.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.7.ebuild,v 1.8 2011/11/06 17:26:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.7.ebuild,v 1.9 2011/11/28 00:22:12 jer Exp $ EAPI="2" -inherit autotools-utils - DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html" SRC_URI="http://www.hyperrealm.com/libconfig/${P}.tar.gz" @@ -33,7 +31,9 @@ src_test() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" - use static-libs || remove_libtool_files + if ! use static-libs; then + rm -f "${D}"/usr/lib*/lib*.la + fi if use examples; then local dir for dir in examples/c examples/c++; do diff --git a/dev-libs/libconfig/libconfig-1.4.8.ebuild b/dev-libs/libconfig/libconfig-1.4.8.ebuild index 999e69b3ac21..3a27be028bf3 100644 --- a/dev-libs/libconfig/libconfig-1.4.8.ebuild +++ b/dev-libs/libconfig/libconfig-1.4.8.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.8.ebuild,v 1.1 2011/08/16 20:48:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.8.ebuild,v 1.2 2011/11/28 00:22:12 jer Exp $ EAPI="4" -inherit autotools-utils - DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files" HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html" SRC_URI="http://www.hyperrealm.com/libconfig/${P}.tar.gz" @@ -31,7 +29,9 @@ src_test() { src_install() { default - use static-libs || remove_libtool_files + if ! use static-libs; then + rm -f "${D}"/usr/lib*/lib*.la + fi if use examples; then local dir for dir in examples/c examples/c++; do -- 2.26.2