Fix autotools handling (pretty broken before). Patch mostly by Jakub Moc in bug ...

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index 5c6e746fbbec300edcb334f2de9cf55ec4f746e6..9508ee97857d2325704ad53820d00fd433673082 100644 (file)
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libsigc++
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.98 2006/11/10 15:17:29 nixnut Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.99 2007/01/04 13:02:32 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> libsigc++-1.2.5.ebuild:
+  Fix autotools handling (pretty broken before). Patch mostly by Jakub Moc in
+  bug #150777.
 
   10 Nov 2006; nixnut <nixnut@gentoo.org> libsigc++-1.0.4-r3.ebuild:
   Stable on ppc wrt bug 138112

diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index c7fc26d2fa395ddadcd6e8747f6a302064f541c7..c9de96915fbdc8b98520dc032050a50216aa7bb3 100644 (file)
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -25,10 +25,10 @@ EBUILD libsigc++-1.0.4-r3.ebuild 1068 RMD160 5544a884952224650f629d5b31141aa5fae
 MD5 24fdfb67bcb9ab2f3d850a54865f4212 libsigc++-1.0.4-r3.ebuild 1068
 RMD160 5544a884952224650f629d5b31141aa5fae43de1 libsigc++-1.0.4-r3.ebuild 1068
 SHA256 2d53856b3ea919567168450f1155d5fbbfaf2ab6a4970013809467b68c4a98c3 libsigc++-1.0.4-r3.ebuild 1068
-EBUILD libsigc++-1.2.5.ebuild 1429 RMD160 5b253aa21ad49ac93b7b973065daead567832275 SHA1 0c10b49664f415cb281bb46f33fc98b74b4d337c SHA256 0464e864a0d41e5338b00302efd8d7c50218ac3cd869db73d8342f415d37c59d
-MD5 aa05d95e7eb6e335444b7fd828538bb9 libsigc++-1.2.5.ebuild 1429
-RMD160 5b253aa21ad49ac93b7b973065daead567832275 libsigc++-1.2.5.ebuild 1429
-SHA256 0464e864a0d41e5338b00302efd8d7c50218ac3cd869db73d8342f415d37c59d libsigc++-1.2.5.ebuild 1429
+EBUILD libsigc++-1.2.5.ebuild 1238 RMD160 24b084b70357bfb06277e0d0b8a2563bcdfaf18a SHA1 4c1e18d03fe8920c7b4b5e9f90974c04d1e0a1d3 SHA256 8e389d74c3c31f193c105a2d597181c93eee2c33dd8dc96d4df14d7186a29c60
+MD5 5bfb5b611248611b352892ad5024c939 libsigc++-1.2.5.ebuild 1238
+RMD160 24b084b70357bfb06277e0d0b8a2563bcdfaf18a libsigc++-1.2.5.ebuild 1238
+SHA256 8e389d74c3c31f193c105a2d597181c93eee2c33dd8dc96d4df14d7186a29c60 libsigc++-1.2.5.ebuild 1238
 EBUILD libsigc++-2.0.11.ebuild 1175 RMD160 c484547721880a37475b0d8401e2d16152bde4b2 SHA1 3bd1aa9f5a0e29239d8568d011c9a6dcd968eba1 SHA256 b41368d175908c4ae75b670963cf03fbc3a004131601b965dd8bacea5e704016
 MD5 f3e705db42e8ef44f3bb073393d76a11 libsigc++-2.0.11.ebuild 1175
 RMD160 c484547721880a37475b0d8401e2d16152bde4b2 libsigc++-2.0.11.ebuild 1175
@@ -53,10 +53,10 @@ EBUILD libsigc++-2.0.5.ebuild 1446 RMD160 ce07311eb9a27780f19299db9a135d35b79782
 MD5 6b17a879fe86bc2b447e8d3c6489f0c6 libsigc++-2.0.5.ebuild 1446
 RMD160 ce07311eb9a27780f19299db9a135d35b7978271 libsigc++-2.0.5.ebuild 1446
 SHA256 82c3265a2897d0170808a030db9a12aa5bca53428123df104c50741897fada12 libsigc++-2.0.5.ebuild 1446
-MISC ChangeLog 11708 RMD160 3d6a5cd65e11ebeaf1251644c20d10e11d36c17a SHA1 baeaa8c2a852aaadcfc8f706dfe5c9b413f2b9d5 SHA256 e9ce575a7180ce6871e9de153762b5025a5a71f199622a490af7e550bcf15e41
-MD5 d1846167f7bee287a0d9d5ad01105dd8 ChangeLog 11708
-RMD160 3d6a5cd65e11ebeaf1251644c20d10e11d36c17a ChangeLog 11708
-SHA256 e9ce575a7180ce6871e9de153762b5025a5a71f199622a490af7e550bcf15e41 ChangeLog 11708
+MISC ChangeLog 11882 RMD160 19fcfbbc8a39989809956176f51537e9cc193854 SHA1 8669b5ff5d2489bc015d1c7bd775af7524bb4528 SHA256 8720daad6cdda32dfc139a70e11379e7b36c19f0eabd5561e06347335f622404
+MD5 4f44356bf1570a9303ce99d204bccaf9 ChangeLog 11882
+RMD160 19fcfbbc8a39989809956176f51537e9cc193854 ChangeLog 11882
+SHA256 8720daad6cdda32dfc139a70e11379e7b36c19f0eabd5561e06347335f622404 ChangeLog 11882
 MISC metadata.xml 255 RMD160 c1e23d640a73041f03935350f8f37801b501fcf5 SHA1 4f2140c34df8e2600388538d969ce3cab1da1924 SHA256 1e5199bee2c4d0abb806c1cd58b1706d527f570dcec26aec624a5c5777763811
 MD5 57fc113c79155fc9e1e055642befa01e metadata.xml 255
 RMD160 c1e23d640a73041f03935350f8f37801b501fcf5 metadata.xml 255
@@ -89,9 +89,9 @@ MD5 894f54c2644b653fff070c8fd3cde982 files/digest-libsigc++-2.0.5 250
 RMD160 c5de6139436352cfc91296d84bd30f6d4303a37a files/digest-libsigc++-2.0.5 250
 SHA256 cbf64222d43f85a775620e9feb91875536a67078c5c50aaa5c300d18b2c407ab files/digest-libsigc++-2.0.5 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFVqJOamhnQswr0vIRAk8fAKCiDh60m8KF3BtrqQF9K0De4nhAVACcD3Dn
-47oEjz1S2anKtKiCpjRSrG8=
-=39lK
+iD8DBQFFnPrvAiZjviIA2XgRAjfuAKCyLpQKpdSb4Gmlzqt+dVVvI86qEgCfYwwS
+PmARP12xgn33y04sAiyKyqM=
+=3Skp
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libsigc++/libsigc++-1.2.5.ebuild b/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
index f2a31c48e4120a75fcee3a5a1f5424e45c321e4c..300a09c9c263acc37a15678feb28689bbfaa05d9 100644 (file)
--- a/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.5.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.5.ebuild,v 1.22 2006/07/06 01:01:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.5.ebuild,v 1.23 2007/01/04 13:02:32 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit autotools
 
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
@@ -12,17 +17,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc-macos ppc64 sh sparc x86"
 IUSE="debug"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-       amd64? ( >=sys-devel/automake-1.7 )"
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       libtoolize -c -f --automake
-       WANT_AUTOMAKE=1.7 aclocal -I scripts ${ACLOCAL_FLAGS} || die "aclocal failed.  Are your \$ACLOCAL_FLAGS sane?"
-       WANT_AUTOMAKE=1.7 automake --add-missing --copy || die
-       WANT_AUTOCONF=2.5 autoconf || die
+       AT_M4DIR="scripts" eautoreconf
 }
 
 src_compile() {