Properly address the libtool / eautoreconf problem

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 60 insertions, 23 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 042fce99bb74..b3f60f1b7461 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.18 2011/04/24 15:15:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.19 2011/04/24 16:01:24 dilfridge Exp $
+
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.3.ebuild, +files/collectd-4.10.3-lt.patch,
+  collectd-5.0.0.ebuild:
+  Properly address the libtool / eautoreconf problem
 
 *collectd-5.0.0 (24 Apr 2011)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 8d69ceef3d8a..0019c1a7e079 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -7,6 +7,7 @@ AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843a
 AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc5ffc61206ad97b2ba37 SHA1 fae5913db9fe0c9243bad1aa9610f0759c1e0abb SHA256 b7a4baca65b4c68ca46ac95a269071c356ca4674ebfda50e872f665cf2422fe8
 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b
 AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799
+AUX collectd-4.10.3-lt.patch 1006 RMD160 b7eee4c9261af6ac3d330494746b922792241bac SHA1 ce2f25fbb84912bce137866faecf147d4da4ee57 SHA256 b5640f7a029366d33d6821f8efe203097d56c0193ec39e1e52d93bc7723179c7
 AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430
 AUX collectd.initd 1475 RMD160 27a19af6419a7bd450e7877bd8b95075e6653c70 SHA1 b8315ce1db2f755d4bc77047d66d0dad12e45668 SHA256 b09dea6513ed0d9932c84f46755c89afc4d04777a96230ead019f68d0b74a583
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
@@ -14,24 +15,24 @@ DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4
 DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
-EBUILD collectd-4.10.3.ebuild 11380 RMD160 9544cf59e2aa4153208043e8bed3565d767736bb SHA1 89a3175d7b6408cc4ae6e03aaa677d60d68a0f65 SHA256 0b516e1d2ca39b2f74a2094e1505c4898c4e2bd3b79ed474ef07f83e7dfdd02f
-EBUILD collectd-5.0.0.ebuild 11674 RMD160 aceb515fc67d5c6ce8f71ed6a7fd161a0ca05884 SHA1 ad34a09d145bd9f87ec993b45ec607f618588fe2 SHA256 144042290827176d9aa963d291e9150614cf19c073b8dc6bc41d6f7cfa5ac47d
-MISC ChangeLog 4074 RMD160 32d14a6916acee4c457cb8b2606b0273a379cda3 SHA1 71ec2104bb9246778a27aa0cd9b5f3fca75e1b73 SHA256 9edb05a9bd2093c745590342088b246719945449842ce06676ee8cf17ff5727b
+EBUILD collectd-4.10.3.ebuild 11320 RMD160 5e53cc47a1b0e50cdf3a7fd8481718ad4bf9da08 SHA1 37c2e84132af5a1bc10d167c6a3147fad20b520e SHA256 9706e8fa90fdaaee548b0be14214d72d77b543a0a21ffa9356625f3c72fc681b
+EBUILD collectd-5.0.0.ebuild 11604 RMD160 457782c017efa9ff4c7be3bdd4510946bf51cfee SHA1 dcf14a9376c5206983872159ae58f043ec550b3e SHA256 f96a0bb7b3c107058c8902459a3e83142cf8d0faa2ba4fa2b4c19cba4f02d364
+MISC ChangeLog 4269 RMD160 3b8db9ff65f304d0f79ac3d3ca6daf86189aff7b SHA1 d25784c276ca4b66cfe2cb0b69a308660e1647e3 SHA256 40a0007e7da0a212c8b98734d4c66556a159a04dcde2d6b996c0de39c3da5330
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtD8rAAoJENwGBM22xffeo7oP/jeU+Jra0zc9LyByfoFt1AsZ
-7hvqN6mBQ5SeobVnqxftg8OAk+iMbmyHQwte9xOWtAVHW/NasZpXWTt8ms/FexqX
-R+gA3PI9o3dmgRh54g2vw4Gz3lcherCUlV+ru0kd55d+GUb13oaXXxyC12s5NktL
-/P7C8/6ykc8WuRKv5l6IGztwSY/z51wLuiu/QetDUsYcEORu+UTb7RXT35B586wy
-mE7V5EgRwC6DJvB/IwDZUxxcw89mSRKrcB+pYc3sudW8tJqbN3IditwbF1fAADSt
-yZHcqGNtDbhJTiEEv01sT/oQOyzjst92JSVy3Fbg2Djat8zRfROzF5W8f+ilJqzH
-iKmK3p0o9T7RmN3Dy38Cgife6cZ9CKRADQByILdF+LVu90f4lWjUxxF1Cb9Y1cLp
-aAJBTdwYo6lPJAH4rXvLLka17xZ62jm1QA9JG85qXu4kshy/EJ4EDPWj+jYG7nA1
-PtSF7Sp8HYEnb5Uwlxj4oApcewnPDsVXVTbOqsUJm55IlNG/2lGbYDB9pDd95u/S
-ETD2/PQERJ+RG3w6sEQ7olnKzP2OQYOnwPNSDmEPc17Z7a9KQ4nTckFbuEnHUyJr
-h1Gs4aE7peZx9Q2CbhD5k3V6hsB7l1ueiZkMznH6TjASEt4c6voIGTDnw/jzfOdq
-x3j6NHMHhPxPjbw/Vehy
-=0mjE
+iQIcBAEBCgAGBQJNtEn0AAoJENwGBM22xffeD28P/1d8rbq7fY5l0cLEJI6cK0Wy
+MefGAnkfvoBAr1D70ucIJhtA05Fw63fFJrWxjYQBvBxQ5xqVFHIMRrsJqK5XXqo1
+RWdsFk7rtFFkh65fnGLgdSLmD2S7kWYxu6bcYy8s5+igZd0RxytD+dr92Tg4g7h+
+H6ME06hkqP8zAIrnXt4x5/Bssu4DF6/bGgO20tGtW1HTQoaYrL1SWEJNMAzmxi00
+59RIXQ9kqY8bFMS6CDuD9TUbD6OmoSDiDOFVmwU6X9cSyDVv6lG34c1gzVmoGaUi
+/azVspMak2rJMp/l+EtNqgkvRLG28PHRCpnDTscH8n8XbPgI2+Crj8ltOFr3sBy3
+USDaVNJjRG3Wdc+pdpLtEbo5GyHfkKSrOEoFFB+gDxtpbMUIv0w8bW/+1vRiroba
+hFs+mxM1g8z2Q0bbx33l21n49Gf41iyCCxRGOBpSJ9S1oKtpIXc9V6B9SeV2JvQo
+5/h9puJ3AiigKz5Fgii/jhY6OdKXk71hlJYyuhN7Kw9lENOpftp6uUEionRnjkdS
+5ksF2xI3pb8EXXVaSLZoSeOZoZ0kD3kMBDc2TxJ+C24Jib8GMZ69maRGnDESJBIc
+yyb3I2XTdiXlVpnNgUJKL91BnOqNyB+D/347d4JaKjcJCNrPC9nhmZsS79QB5aiB
+d5RE4PU+TAPQLtL+7Gh8
+=fOcE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild
index 77d9b1a86a3a..28f76037532f 100644
--- a/app-admin/collectd/collectd-4.10.3.ebuild
+++ b/app-admin/collectd/collectd-4.10.3.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/app-admin/collectd/collectd-4.10.3.ebuild,v 1.2 2011/03/30 20:30:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3.ebuild,v 1.3 2011/04/24 16:01:24 dilfridge Exp $
 
 EAPI=3
 
@@ -102,6 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
 	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch
+	"${FILESDIR}/${PN}-4.10.3"-lt.patch
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
@@ -193,8 +194,7 @@ src_prepare() {
 	# paths like "/usr/var/..."
 	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
 
-	# the tarball of 4.10.3 was generated with a different set of autotools, leading to odd problems
-	_elibtoolize --ltdl
+	rm -r libltdl || die
 
 	eautoreconf
 }
diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collectd/collectd-5.0.0.ebuild
index ea869a363e35..bd5f421eaa2d 100644
--- a/app-admin/collectd/collectd-5.0.0.ebuild
+++ b/app-admin/collectd/collectd-5.0.0.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/app-admin/collectd/collectd-5.0.0.ebuild,v 1.1 2011/04/24 15:15:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0.ebuild,v 1.2 2011/04/24 16:01:24 dilfridge Exp $
 
 EAPI=4
 
@@ -102,6 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
 	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch
+	"${FILESDIR}/${PN}-4.10.3"-lt.patch
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
@@ -193,8 +194,7 @@ src_prepare() {
 	# paths like "/usr/var/..."
 	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
 
-	# the tarball of 4.10.3 and 5.0.0 was generated with a different set of autotools, leading to odd problems
-	_elibtoolize --ltdl
+	rm -r libltdl || die
 
 	eautoreconf
 }
diff --git a/app-admin/collectd/files/collectd-4.10.3-lt.patch b/app-admin/collectd/files/collectd-4.10.3-lt.patch
new file mode 100644
index 000000000000..68cba1589381
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.3-lt.patch
@@ -0,0 +1,31 @@
+diff -ruN collectd-4.10.3.orig/Makefile.am collectd-4.10.3/Makefile.am
+--- collectd-4.10.3.orig/Makefile.am	2011-03-26 17:04:26.000000000 +0100
++++ collectd-4.10.3/Makefile.am	2011-04-24 17:48:18.013229944 +0200
+@@ -1,6 +1,6 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
++# ACLOCAL_AMFLAGS = -I libltdl/m4
+ 
+-SUBDIRS = libltdl src bindings
++SUBDIRS = src bindings
+ 
+ INCLUDES = $(LTDLINCL)
+ 
+diff -ruN collectd-4.10.3.orig/configure.in collectd-4.10.3/configure.in
+--- collectd-4.10.3.orig/configure.in	2011-03-26 17:08:53.000000000 +0100
++++ collectd-4.10.3/configure.in	2011-04-24 17:50:06.001229943 +0200
+@@ -6,7 +6,6 @@
+ m4_ifdef([LT_PACKAGE_VERSION],
+ 	# libtool >= 2.2
+ 	[
+-	 LT_CONFIG_LTDL_DIR([libltdl])
+ 	 LT_INIT([dlopen])
+ 	 LTDL_INIT([convenience])
+ 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -18,7 +17,6 @@
+ 	 AC_SUBST(LTDLINCL)
+ 	 AC_SUBST(LIBLTDL)
+ 	 AC_LIBTOOL_DLOPEN
+-	 AC_CONFIG_SUBDIRS(libltdl)
+ 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ 	]
+ )