Fix tunepimp-0.5.3-r1.ebuild, libtool2 compatibility bug #220565. Huge thanks to Mike Weissman for providing the necessary patches.

Package-Manager: portage-2.1.5.4

6 files changed, 106 insertions, 30 deletions

diff --git a/media-libs/tunepimp/ChangeLog b/media-libs/tunepimp/ChangeLog
index 9102d075b612..2bcfffdb64d9 100644
--- a/media-libs/tunepimp/ChangeLog
+++ b/media-libs/tunepimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tunepimp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.60 2008/04/07 05:49:25 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.61 2008/06/14 12:40:44 tgurr Exp $
+
+  14 Jun 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/tunepimp-0.5.3-build-fix.patch,
+  +files/tunepimp-0.5.3-libtool.patch, tunepimp-0.5.3.ebuild,
+  tunepimp-0.5.3-r1.ebuild:
+  Fix tunepimp-0.5.3-r1.ebuild, libtool2 compatibility bug #220565. Huge
+  thanks to Mike Weissman for providing the necessary patches.
 
   06 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
   +files/tunepimp-0.5.3-gcc43.patch, tunepimp-0.5.3-r1.ebuild:
diff --git a/media-libs/tunepimp/Manifest b/media-libs/tunepimp/Manifest
index c99bffb2dad0..9607f5fcf905 100644
--- a/media-libs/tunepimp/Manifest
+++ b/media-libs/tunepimp/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tunepimp-0.5.3-build-fix.patch 1996 RMD160 cee043ff0a2068123f47641537b99ede832827e9 SHA1 884d39899beec2dfecb77ae1a199fa2d4a084e6e SHA256 e848053e08c075c8df02fd2f48a93e9330bb790c7b8e48453c90e8e011a17e36
 AUX tunepimp-0.5.3-gcc43.patch 4810 RMD160 a180a2a703083f940a2a1bb081018a3bfef320c6 SHA1 ac441ed5903621ebea70ec9e3f4b71f6781d4a05 SHA256 d248c1a84f2157b44e714982e239d2ed93731f39b5455130a3aef422ca48842d
+AUX tunepimp-0.5.3-libtool.patch 1169 RMD160 73479770ef2b9fc320de2ed3be2c6dbbf96a7b4c SHA1 ea28badda640e0de0c7d7d7229f3dbf3fd9f46f7 SHA256 7d9b29199b7186b7b57980fd5bcb08e26e0f13e4f989dc6b8ee04e968f919b40
 DIST libtunepimp-0.5.3.tar.gz 1097005 RMD160 6bc312591b98a5b74824fc3103137cbf60d4b012 SHA1 1b904cd97ce009588fe57336f40e79b6edf9947e SHA256 341744a0be386387632fc4bb906b97d2b3346137beb2c776a41dedaeeb0f2468
-EBUILD tunepimp-0.5.3-r1.ebuild 1709 RMD160 423c5c28e950865b6df2edd44f237ace80436641 SHA1 31c9e0628e2f8af1934585330b834d0a9c4a2184 SHA256 29dfff5a480ddc2a1c0784f2df1aba80923c9efe976dd343b5ec1b19111b3107
-EBUILD tunepimp-0.5.3.ebuild 1498 RMD160 bd8cfac6e3be81e22e2c5614d3b101f711d8b738 SHA1 55fad47a5e8b1e468ca4c3de38d762e44a088877 SHA256 ef84483e80e76923a8a9f6832036dde609c6a5fe35982630ff0bf15cffa17cb2
-MISC ChangeLog 7801 RMD160 d358df3acb54cd28cc85645578e02fc92c15fc2d SHA1 63ff4e44685fd77b5d07d451a47f1d4cc6f2e494 SHA256 be0a737a6b4ace978aee44f3fd93a9c07b3a78cef0578063bbce1367779911c9
+EBUILD tunepimp-0.5.3-r1.ebuild 1741 RMD160 bbc97e42ec4d04a6995af993bb6c55cf2e0f8c12 SHA1 bd0350a8d2baaee1339968137afeaf9c7abf4e8d SHA256 1369eb037aec2b96e9caaa99eba1de09f188aa88f88b96fea6769618b4887bd8
+EBUILD tunepimp-0.5.3.ebuild 1486 RMD160 38649888b6fb835b24dc5d860ace2ebd0d90f730 SHA1 d2d3f73af947a85948610009f4d20925c084e99c SHA256 8146820687e32e700320bcc8f0b4f96a56c33169e68c1b34864a0c242f78775c
+MISC ChangeLog 8108 RMD160 4d7b741303f01cbe22272451817bbf0b728d5d85 SHA1 442e5af9e4c47e9718c9dbf1a0ce9844f229644d SHA256 7fa25aff86e3a61818585412fb9e320cbfd3b1b6a39e41c19674bb4d4fce9a0f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH/TcHfxJ68Jl1NeERAtK3AJ45H6kvLgd3/evpHhmXXRC3hjGa8ACgkky6
-bBDEyTbu+ID0YxFlRN4VVjs=
-=fpaH
-- -----END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH/TebfxJ68Jl1NeERAvL5AKCvyuKfpe0+B5KyI9ARckf1LCsnjACgrrWW
-fm7gAhoggqUWBGtbFEV+EKc=
-=Iyet
------END PGP SIGNATURE-----
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch
new file mode 100644
index 000000000000..b6ca2f6194bd
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch
@@ -0,0 +1,54 @@
+diff -Naur libtunepimp-0.5.3/lib/plugins.cpp libtunepimp-0.5.3.new/lib/plugins.cpp
+--- libtunepimp-0.5.3/lib/plugins.cpp	2006-11-18 11:52:33.000000000 +0100
++++ libtunepimp-0.5.3.new/lib/plugins.cpp	2008-06-13 22:10:44.320195645 +0200
+@@ -33,6 +33,8 @@
+ #include <dirent.h>
+ #include "../libltdl/ltdl.h"
+ #include "plugins.h"
++#include <cstdlib>
++#include <cstdio>
+ 
+ #include <map>
+ using namespace std;
+@@ -103,12 +105,12 @@
+        strcat(init_func, "InitPlugin");
+ 
+        /* Opened plugin ok, now locate our entry function */
+-       init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle_struct *)info.handle, init_func);
++       init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle)info.handle, init_func);
+        if (init_function == NULL)
+        {
+            if (printDebugInfo)
+                fprintf(stderr, "Cannot find entry point in %s (%s).\n", file, lt_dlerror());
+-           lt_dlclose((lt_dlhandle_struct *)info.handle);
++           lt_dlclose((lt_dlhandle)info.handle);
+            continue;
+        }
+ 
+@@ -116,7 +118,7 @@
+        info.methods = (*init_function)();
+        if (info.methods == NULL)
+        {
+-           lt_dlclose((lt_dlhandle_struct *)info.handle);
++           lt_dlclose((lt_dlhandle)info.handle);
+            if (printDebugInfo)
+                fprintf(stderr, "Cannot retrieve supported methods from %s.\n", file);
+            continue;
+@@ -150,7 +152,7 @@
+                   fprintf(stderr, "  [Plugin %s has already been loaded. "
+                        "Skipping.]\n", info.file);
+                info.methods->shutdown();
+-               lt_dlclose((lt_dlhandle_struct *)info.handle);
++               lt_dlclose((lt_dlhandle)info.handle);
+                break;
+            }
+        }
+@@ -173,7 +175,7 @@
+        if ((*i).handle)
+        {
+            (*i).methods->shutdown();
+-           lt_dlclose((lt_dlhandle_struct *)(*i).handle);
++           lt_dlclose((lt_dlhandle)(*i).handle);
+            (*i).handle = NULL;
+        }
+    }
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch
new file mode 100644
index 000000000000..d49785bc7ce2
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch
@@ -0,0 +1,35 @@
+diff -Naur libtunepimp-0.5.3/configure.in libtunepimp-0.5.3.new/configure.in
+--- libtunepimp-0.5.3/configure.in	2006-11-28 21:28:38.000000000 +0100
++++ libtunepimp-0.5.3.new/configure.in	2008-06-13 21:56:12.832195847 +0200
+@@ -33,7 +33,7 @@
+ dnl Checks for programs.
+ AC_PREREQ(2.52)
+ AC_PROG_CC
+-AC_LIBLTDL_CONVENIENCE
++AC_WITH_LTDL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+ AC_LIBTOOL_DLOPEN
+@@ -52,6 +52,14 @@
+   prefix="/usr/local" 
+ fi
+ 
++infodir='${prefix}/info' 
++mandir='${prefix}/man'
++
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ AC_ARG_ENABLE([lgpl],
+               [  --enable--lgpl          Use LGPL license (no mp3 support)], 
+               [use_lgpl=yes], 
+@@ -283,7 +291,6 @@
+ AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX") 
+ AS_AC_EXPAND(LIBDIR, $libdir)
+ AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$LIBDIR/tunepimp/plugins", "PLUGIN_DIR") 
+-AC_CONFIG_SUBDIRS(libltdl)
+ AC_OUTPUT(
+     Makefile
+     lib/Makefile
diff --git a/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild b/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild
index 906629ad67e7..d71f6fe6ba30 100644
--- a/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild,v 1.3 2008/04/07 05:49:25 philantrop Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r1.ebuild,v 1.4 2008/06/14 12:40:44 tgurr Exp $
 
 EAPI="1"
 
@@ -44,6 +41,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-libtool.patch"
+	epatch "${FILESDIR}/${P}-build-fix.patch"
 
 	sed -i -e "s: tta::" configure.in
 
diff --git a/media-libs/tunepimp/tunepimp-0.5.3.ebuild b/media-libs/tunepimp/tunepimp-0.5.3.ebuild
index b20de99f3077..b5db02648773 100644
--- a/media-libs/tunepimp/tunepimp-0.5.3.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3.ebuild,v 1.8 2008/01/02 12:05:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3.ebuild,v 1.9 2008/06/14 12:40:44 tgurr Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -50,7 +50,6 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog INSTALL README TODO
 	if use python; then