Cleanup autotools.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-libs/check/ChangeLog b/dev-libs/check/ChangeLog
index 433819f8a1b52b9ae0a5f6f32320d05e2f723298..cd242fcfcbc91766fe2ab585836677810f1b6911 100644 (file)
--- a/dev-libs/check/ChangeLog
+++ b/dev-libs/check/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/check
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.32 2006/12/14 16:24:47 twp Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.33 2006/12/28 19:52:08 vapier Exp $
+
+  28 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/check-0.9.5-autotools.patch, check-0.9.5.ebuild:
+  Cleanup autotools.
 
   14 Dec 2006; <twp@gentoo.org> check-0.9.5.ebuild:
   Install docs in correct dir.

diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index e10a6d3403e0c3c09e5c6c26817cdb543a1abc3d..eb005347edf162f0ced131526c708f2084840ef9 100644 (file)
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,8 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check-0.9.3-libtool.patch 1107 RMD160 7b8886328986ae9d975bc3d7f4df4ef219336aca SHA1 17413080575388c0bbbf4670d0551c1e3434115e SHA256 d0a6c4445ca778163581234bf152a5d74e1921b5ef6d92e36e6c29d209dbbf7b
 MD5 e6386fd1f640a2c8643db27d878823d6 files/check-0.9.3-libtool.patch 1107
 RMD160 7b8886328986ae9d975bc3d7f4df4ef219336aca files/check-0.9.3-libtool.patch 1107
 SHA256 d0a6c4445ca778163581234bf152a5d74e1921b5ef6d92e36e6c29d209dbbf7b files/check-0.9.3-libtool.patch 1107
-DIST check-0.8.4.tar.gz 134449 RMD160 7dfc5b931f5a70f1405d32bc34aec804acbfa802 SHA256 49d928dbf0e5786e7b571232a6918fbcedeefe7bf7c5fe4b9db73177730241d2
+AUX check-0.9.5-autotools.patch 309 RMD160 97628fe2a081107443bcf8c98fdf6d5497316f18 SHA1 9ee9ae805f2908a030756033068511b92efbc4c8 SHA256 e1cd957871be3bc9ac24aa918cfabf5a927852a7edb2442306c32c69756b417b
+MD5 59f4da00780eac444339dce198de827c files/check-0.9.5-autotools.patch 309
+RMD160 97628fe2a081107443bcf8c98fdf6d5497316f18 files/check-0.9.5-autotools.patch 309
+SHA256 e1cd957871be3bc9ac24aa918cfabf5a927852a7edb2442306c32c69756b417b files/check-0.9.5-autotools.patch 309
+DIST check-0.8.4.tar.gz 134449 RMD160 7dfc5b931f5a70f1405d32bc34aec804acbfa802 SHA1 4d5ced349ca76e2e945ab8b722d5007bc1b44860 SHA256 49d928dbf0e5786e7b571232a6918fbcedeefe7bf7c5fe4b9db73177730241d2
 DIST check-0.9.2.tar.gz 161604 RMD160 5ba5c43a532c74b5d6f4891ccd381515799aa60e SHA256 fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
 DIST check-0.9.3.tar.gz 163726 RMD160 86f3c90ea02a02c49fdae6d477f6709f1b7f5993 SHA1 608bb3bd31f85dcb7e5b7b04eeb4254ef6df0fae SHA256 c3fb9582e7df33a4e854cd22f2a7e3ef417877cb85b651d766c01c730115e083
 DIST check-0.9.5.tar.gz 520625 RMD160 1975578245444ffdc8cec43e53dedc3aac8553ea SHA1 84b9d1ace6d0bf0fc73c9de2e684a62f73d312f8 SHA256 961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6
@@ -18,14 +25,14 @@ EBUILD check-0.9.3-r1.ebuild 773 RMD160 e700eb63e7ac0e9a8400237cc6a4b513ae701958
 MD5 796e93c9e91606bcf23f209070ab44d2 check-0.9.3-r1.ebuild 773
 RMD160 e700eb63e7ac0e9a8400237cc6a4b513ae701958 check-0.9.3-r1.ebuild 773
 SHA256 5083f941ebd3d0464ce41e4099b96d6968864856b6f25870be435410029c2176 check-0.9.3-r1.ebuild 773
-EBUILD check-0.9.5.ebuild 752 RMD160 0a83529803441123f6a85f4dd9427f6591340d04 SHA1 2eb320dd1b2a8375df86f17f22bf416715358642 SHA256 c2904eb77c03d5a0c77f2ed7adcbb694115cea6999405e95f7ded7af18732f33
-MD5 d4025a731851661d3b5fff96878d5be3 check-0.9.5.ebuild 752
-RMD160 0a83529803441123f6a85f4dd9427f6591340d04 check-0.9.5.ebuild 752
-SHA256 c2904eb77c03d5a0c77f2ed7adcbb694115cea6999405e95f7ded7af18732f33 check-0.9.5.ebuild 752
-MISC ChangeLog 3135 RMD160 7a8b161846ad38a1f2635fb24573a9df499f66fa SHA1 2b5efa0b04bf1d0216dd147df7e5f300132db839 SHA256 0a2fb1282745af7f661bf7d6cc577c909f036ff55a8c6de8743514b7d4b945c8
-MD5 bf13c6eceba5680f2b2ecf1edc2ed518 ChangeLog 3135
-RMD160 7a8b161846ad38a1f2635fb24573a9df499f66fa ChangeLog 3135
-SHA256 0a2fb1282745af7f661bf7d6cc577c909f036ff55a8c6de8743514b7d4b945c8 ChangeLog 3135
+EBUILD check-0.9.5.ebuild 767 RMD160 6ec72ccc79f4a8cade1c4f649655121521f8131a SHA1 a8a7b753bed60282309b0c857392cbc974c30832 SHA256 4f9d815110d342a30cefd16df20511db124aec8e8cbe838ac6e8071eaf5eff59
+MD5 54cba8d28d85b9e68e37047714011e1b check-0.9.5.ebuild 767
+RMD160 6ec72ccc79f4a8cade1c4f649655121521f8131a check-0.9.5.ebuild 767
+SHA256 4f9d815110d342a30cefd16df20511db124aec8e8cbe838ac6e8071eaf5eff59 check-0.9.5.ebuild 767
+MISC ChangeLog 3268 RMD160 df8edfcc6516706dfb027e9cc6ffa4f4d5b30788 SHA1 88b734562ef773310c997ee55d946a2182264bcd SHA256 1be056536209b94cbad571cde25d5332680472db0336512a9504f6aedc637cd4
+MD5 93aeda7223cf393a7602dce6f30ea1ed ChangeLog 3268
+RMD160 df8edfcc6516706dfb027e9cc6ffa4f4d5b30788 ChangeLog 3268
+SHA256 1be056536209b94cbad571cde25d5332680472db0336512a9504f6aedc637cd4 ChangeLog 3268
 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
@@ -42,3 +49,10 @@ SHA256 5e05fb5ca65968df09e19797bf59aa19e9b495a69a3ee1a4ee0a06171dcac0e0 files/di
 MD5 0fe1ef537e3d11d0c5c0b4eb071490f3 files/digest-check-0.9.5 235
 RMD160 9ca8936fa95b0eaacf73a41c99d501b0f8217b8d files/digest-check-0.9.5 235
 SHA256 7661aba451c8b330f78eaafe82350bd0b4ff8db25e4d3cf9788e26ec93822fbe files/digest-check-0.9.5 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlCCi8bi6rjpTunYRApOVAJ9d0OdShvefIeWDCCKxWEOGPbLwXQCfeDQs
+89aFs0p+bDHQjxfG0yGflyY=
+=XkR2
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/check/check-0.9.5.ebuild b/dev-libs/check/check-0.9.5.ebuild
index 5bd91f9db0e3b90d0a790139b2ec1aa83c6869ef..33622ac313ef3e1549db1dfd7e61464c7ddeea40 100644 (file)
--- a/dev-libs/check/check-0.9.5.ebuild
+++ b/dev-libs/check/check-0.9.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.5.ebuild,v 1.2 2006/12/14 16:24:47 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.5.ebuild,v 1.3 2006/12/28 19:52:08 vapier Exp $
 
-inherit autotools eutils libtool
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils autotools
 
 DESCRIPTION="A unit test framework for C"
 HOMEPAGE="http://sourceforge.net/projects/check/"
@@ -17,16 +19,12 @@ DEPEND=""
 
 src_unpack() {
        unpack ${A}
-       elibtoolize || die
-}
-
-src_compile() {
-       eautoreconf || die
-       econf || die
-       emake || die
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-autotools.patch
+       eautoreconf
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die
-       mv ${D}/usr/share/doc/${PN} ${D}/usr/share/doc/${P}
+       emake DESTDIR="${D}" install || die
+       mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }

diff --git a/dev-libs/check/files/check-0.9.5-autotools.patch b/dev-libs/check/files/check-0.9.5-autotools.patch
new file mode 100644 (file)
index 0000000..f146c03
--- /dev/null
+++ b/dev-libs/check/files/check-0.9.5-autotools.patch
@@ -0,0 +1,14 @@
+Needed with newer autotools:
+
+tests/Makefile.am:22: compiling `check_list.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+--- configure.ac
++++ configure.ac
+@@ -68,6 +68,7 @@
+ # Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL