Remove mixing of default phase functions with autotool-utils ones, #392177

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

diff --git a/dev-libs/libexplain/ChangeLog b/dev-libs/libexplain/ChangeLog
index 97bc4d250568dceec4ca1467ffa85351360718e7..582d3cae2015b450d539d69513bb0243b640fbaa 100644 (file)
--- a/dev-libs/libexplain/ChangeLog
+++ b/dev-libs/libexplain/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libexplain
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/ChangeLog,v 1.10 2011/11/27 03:52:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/ChangeLog,v 1.11 2011/11/27 17:01:06 jlec Exp $
+
+  27 Nov 2011; Justin Lecher <jlec@gentoo.org> libexplain-0.45.ebuild,
+  files/libexplain-0.45-configure.patch, libexplain-0.46.ebuild,
+  libexplain-0.47.ebuild, libexplain-0.49.ebuild:
+  Remove mixing of default phase functions with autotool-utils ones, #392177
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> libexplain-0.49.ebuild:
   Build in the source tree.

diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest
index b515f8139fbc22d82d2a3b2e287422f7d143e9cd..b618d228efabee2b610c6aebd5bc3af91269f194 100644 (file)
--- a/dev-libs/libexplain/Manifest
+++ b/dev-libs/libexplain/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX libexplain-0.45-configure.patch 436 RMD160 f85f98f170828edcf996e28077f001102a9309a3 SHA1 d871ca20ba8186481d845cc98432c83f1df75e96 SHA256 bc96d00713b2788af8006f90e95e1e34022f8afdaffdbd425473f500bad39792
+AUX libexplain-0.45-configure.patch 428 RMD160 606f3d9acf55780eff6930ae2b83e7cb002e475a SHA1 2ce87eb76b6453cdea16c584c92a13d5173c8690 SHA256 61002c5c34941b29f4e4201e51c42e707c6e490dc6acb689abe13958448bccbb
 DIST libexplain-0.40.D001.tar.gz 4275947 RMD160 67d73a151b5ace539fe7d57a67056d7a2e09d6c4 SHA1 f206457459233fc42e93f6fd2b73cc87220f54bf SHA256 fe028ccb0ae77d89175c2e53b97b27bec5d2ae65463afc09084337f8d6a4d7d5
 DIST libexplain-0.42.D001.tar.gz 4299924 RMD160 22cce35bf94f627176be7dd52097a400077ed490 SHA1 de558f0c8cd2054fe130d79696a7493bd4dca76f SHA256 608e06093920c1669a641fe629546050559f7ac80a89f268b9bad1e37b5b597a
 DIST libexplain-0.45.D001.tar.gz 4410036 RMD160 f01df997b47f9fa0d534b3b65b44d66402255aae SHA1 76940c3c3160065cac6c182d32a1a7df9f9e2f22 SHA256 e1e456a98361815d4fc55e086eb0e234b57d68418b659fdcf40a6e77900b5ecd
@@ -11,20 +11,16 @@ DIST libexplain-0.47.D001.tar.gz 4451254 RMD160 d0725757e008846fc9e705b70f262035
 DIST libexplain-0.49.D001.tar.gz 4477127 RMD160 e71bf8854bbcd7ba3e94de8434557e5192060fe8 SHA1 93aba2641ad61810b62eccd2d58f762d880edde7 SHA256 c6792f1ddf304cf1af2f7aaf03340ec4aee6d73a97b52a066e153bd967fbbedb
 EBUILD libexplain-0.40.ebuild 892 RMD160 7fe29a2858cf7eb0216a55e62843203c214b6983 SHA1 55c5d196afe009f1aaf0430eaebb60f604f34c34 SHA256 c8b68b714550f6dc84f8c4661c8f2be08195edab4526f849eed4a6ce98ffc6b7
 EBUILD libexplain-0.42.ebuild 892 RMD160 63ae89ef052e410a877d9541f1d48a795a5d5fa4 SHA1 feac02fb380d62b2ac0b6e7813bf51596bfa8538 SHA256 8cd8584738959e07252f50228cb1d33d38529fbc3f057b351859ce845f6300e3
-EBUILD libexplain-0.45.ebuild 1070 RMD160 a80f432622ae6b85f9e2758d1fee0135ab581a83 SHA1 73933c999e6412b83af35bccd603e94b6ceb4a02 SHA256 6824bfe1faeef237c0a56bc2cb9e558f69680d330397e3e61be2e5d9a0211e09
-EBUILD libexplain-0.46.ebuild 1076 RMD160 bd6e5145406d44d0fbf4318cae5f45e70bfe7243 SHA1 c5113a8b2ee2e45fa65c33707ddd414e01d4d9e7 SHA256 1e8ea3d4b9c90c0241d5237700d05d68cb798e96bd447fa06744082c6cbe9dfb
-EBUILD libexplain-0.47.ebuild 1172 RMD160 6b3cd3cca61a904bf1ec3486c2ae1c7a862a05ab SHA1 a0b04a239516a15988b6f5ada77b94a0075f4c79 SHA256 05d9ae942709c5711cfdfe13fce811cbd0adb37cae686f52853d0b8fad1d19b7
-EBUILD libexplain-0.49.ebuild 1036 RMD160 b266197b1d1f1190c3521c7b4038cd07a56a1210 SHA1 07a86a4682d9f430758bbbd0dbde919274168832 SHA256 faefe197e6b557b3b1a65a80fd4b1a84528ec0f50550b3190598c9befd2ca057
-MISC ChangeLog 1613 RMD160 2378b993c227f0c09d3fcd8cb33ff063d5af4324 SHA1 a72373079b66be471fd4130636889ceff7bf9dfb SHA256 07acd20638a5dca9cbed8d8ad002a1ab18ca615f16282282dd8588e154cf11df
+EBUILD libexplain-0.45.ebuild 1065 RMD160 0a2710fe8c092880dfe78dc2f04bf693a7d1c871 SHA1 1458ce8b501ba0d54726160f66aecd4038ecd5ca SHA256 36922357681e6d556591ee02eb24a8a4fa13335a07a155265c76fc8c06f55f3f
+EBUILD libexplain-0.46.ebuild 1071 RMD160 a304a46150bfb43fb65cb0e29b81dc8f1877e555 SHA1 2d79d5a898d58c7c1c4121b05c29db7e3fd9ebe9 SHA256 d8caefaef2c949f46da07de8f8f3002517662e91cc5ebcc4001d2f6766061a28
+EBUILD libexplain-0.47.ebuild 1167 RMD160 d54af0abc3cc51e28590c9cb5a11aa792ec6fa32 SHA1 0f19992bd3633b35d178f8fc9df8c27193579bee SHA256 e94e381fb766d6a89a196746eb74c8c477fbecebb96089b73750497410bc968b
+EBUILD libexplain-0.49.ebuild 1102 RMD160 04b970b69bf473ce4edd917ea807c4dcbce7d031 SHA1 8acc71593892aa4808094b8a54ffb93f7d67ac49 SHA256 20f6111cea57476063946cbfc4c01f63f430730e4e38ba74adc9455e4a739950
+MISC ChangeLog 1872 RMD160 83422d3642ed084a45d5bfa497aeb148b3d9c461 SHA1 111a50eab2f56ba6b65e585e96f9bf0938afb683 SHA256 4bf155e1b1e086e54d169c3dc348faaf00cbb2f9671de1958a0f0c3e898d2564
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0bP/AAoJEEqz6FtPBkyjAAoH+gJoKqP3MfzpFaFeFKCPveWZ
-LPYThVaJMq3exx8yFE7O0w69kWxL4R/Dx3Zx+MAasYguoPPmYpHSoYPGfRvXJ3Yh
-+JAZ7xhp9jxkQ9DokW5dzzU6cMgnikeONI/39WFaEhkzF6NzP3je+ZngkrXHXLvM
-S2/N93k94yj09py0JJX9Gu4Bs3SNRRDbYome4EluG49gd0xaKoHtP6knqsjDmUp8
-9SYGDMh7ai7a+pGloeMoEK0DfLdMxXBS8n6KLBYICjfMO1nBLcJIyZFR7WMVb191
-ObbWM1bNtfdRjC+JG5+Mew3Unz8PaHaqPh9Xj6JhamyhRErd1L3HOAi3zEuZKIw=
-=FBwj
+iEYEAREKAAYFAk7SbN4ACgkQgAnW8HDreRaovwCeJPyF48HHG66Fx2yVG1vnNe8N
+hmMAoIPamYo86iIa2d15GNtHZV/Zs9P/
+=T9ew
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libexplain/files/libexplain-0.45-configure.patch b/dev-libs/libexplain/files/libexplain-0.45-configure.patch
index e3b9a7c16c9b1d87459d1f60fb2a807ea0ea7158..e82d05da534f004fd6338ad0dadb64308748d7ea 100644 (file)
--- a/dev-libs/libexplain/files/libexplain-0.45-configure.patch
+++ b/dev-libs/libexplain/files/libexplain-0.45-configure.patch
@@ -1,5 +1,5 @@
---- libexplain-0.45.D001.orig/etc/configure.ac
-+++ libexplain-0.45.D001/etc/configure.ac
+--- libexplain-0.45.D001.orig/configure.ac
++++ libexplain-0.45.D001/configure.ac
 @@ -26,6 +26,10 @@
  AC_PROG_RANLIB
  AC_PROG_YACC

diff --git a/dev-libs/libexplain/libexplain-0.45.ebuild b/dev-libs/libexplain/libexplain-0.45.ebuild
index da3361adfa25b212ba8feccf1bbec827022a4d97..f498fc7c2001a69d01ab8731b1b45f4681888fd4 100644 (file)
--- a/dev-libs/libexplain/libexplain-0.45.ebuild
+++ b/dev-libs/libexplain/libexplain-0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.45.ebuild,v 1.1 2011/08/24 04:36:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.45.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -31,8 +31,8 @@ src_prepare() {
                -e '/t0363a/d' \
                -i Makefile.in || die
 
-       epatch "${FILESDIR}"/${P}-configure.patch
        cp "${S}"/etc/configure.ac "${S}"
+       epatch "${FILESDIR}"/${P}-configure.patch
        eautoreconf
 }
 

diff --git a/dev-libs/libexplain/libexplain-0.46.ebuild b/dev-libs/libexplain/libexplain-0.46.ebuild
index 62797d2a303c208572e0eda1927bb601b76809e7..9642d4128f37e003dec5dc2c74f72498ca5d1416 100644 (file)
--- a/dev-libs/libexplain/libexplain-0.46.ebuild
+++ b/dev-libs/libexplain/libexplain-0.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.46.ebuild,v 1.1 2011/08/31 02:39:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.46.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -31,8 +31,8 @@ src_prepare() {
                -e '/t0363a/d' \
                -i Makefile.in || die
 
-       epatch "${FILESDIR}"/${PN}-0.45-configure.patch
        cp "${S}"/etc/configure.ac "${S}"
+       epatch "${FILESDIR}"/${PN}-0.45-configure.patch
        eautoreconf
 }
 

diff --git a/dev-libs/libexplain/libexplain-0.47.ebuild b/dev-libs/libexplain/libexplain-0.47.ebuild
index 11e908409fd778a5acfd5bd2fa7432be1ff54a94..babb549060547c2397940a4527483b1b1594ec86 100644 (file)
--- a/dev-libs/libexplain/libexplain-0.47.ebuild
+++ b/dev-libs/libexplain/libexplain-0.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.47.ebuild,v 1.1 2011/09/28 23:14:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.47.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -32,10 +32,10 @@ src_prepare() {
                -e '/t0363a/d' \
                -i Makefile.in || die
 
+       cp "${S}"/etc/configure.ac "${S}"
        epatch "${FILESDIR}"/${PN}-0.45-configure.patch \
                "${WORKDIR}"/${P}-parallel-make.patch
 
-       cp "${S}"/etc/configure.ac "${S}"
        eautoreconf
 }
 

diff --git a/dev-libs/libexplain/libexplain-0.49.ebuild b/dev-libs/libexplain/libexplain-0.49.ebuild
index 0298b587ecd83aa2c0498b0da08e6e3db940c535..3e6a64a94d9a1170e06077caf1c9c9830dcce55e 100644 (file)
--- a/dev-libs/libexplain/libexplain-0.49.ebuild
+++ b/dev-libs/libexplain/libexplain-0.49.ebuild
@@ -1,9 +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/libexplain/libexplain-0.49.ebuild,v 1.2 2011/11/27 03:52:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.49.ebuild,v 1.3 2011/11/27 17:01:06 jlec Exp $
 
 EAPI=4
-inherit autotools-utils eutils
+inherit autotools-utils eutils multilib
 
 MY_P="${P}.D001"
 
@@ -28,6 +28,10 @@ DOCS=( README )
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.45-configure.patch
+       )
+
 src_prepare() {
        # Portage incompatible test
        sed \
@@ -35,13 +39,12 @@ src_prepare() {
                -e '/t0363a/d' \
                -i Makefile.in || die
 
-       epatch "${FILESDIR}"/${PN}-0.45-configure.patch
-
        cp "${S}"/etc/configure.ac "${S}"
-       eautoreconf
+
+       autotools-utils_src_prepare
 }
 
-src_configure() {
-       econf \
-               $(use_enable static-libs static)
+src_install() {
+       autotools-utils_src_install
+       use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }