Use system libtool wrt #252404, thanks to Diego E. 'Flameeyes' Pettenò for reporting.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 90 insertions, 11 deletions

diff --git a/media-tv/dvbstreamer/ChangeLog b/media-tv/dvbstreamer/ChangeLog
index 0fbe83b5b4fa..f1a636580ce5 100644
--- a/media-tv/dvbstreamer/ChangeLog
+++ b/media-tv/dvbstreamer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/dvbstreamer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/ChangeLog,v 1.12 2009/08/10 07:53:09 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/ChangeLog,v 1.13 2010/02/03 10:39:56 ssuominen Exp $
+
+*dvbstreamer-1.1-r1 (03 Feb 2010)
+
+  03 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +dvbstreamer-1.1-r1.ebuild, +files/dvbstreamer-1.1-libtool.patch:
+  Use system libtool wrt #252404, thanks to Diego E. 'Flameeyes' Pettenò
+  for reporting.
 
   10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   dvbstreamer-1.1.ebuild, +files/dvbstreamer-1.1-Werror.patch:
diff --git a/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild b/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild
index 426a97ea4cab..fa85594b54c4 100644
--- a/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild
+++ b/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild,v 1.4 2009/08/10 07:53:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/dvbstreamer-1.1-r1.ebuild,v 1.1 2010/02/03 10:39:56 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -15,15 +15,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-db/sqlite:3
-	sys-libs/readline"
+	sys-libs/readline
+	>=sys-devel/libtool-2.2.6"
 DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
 
 src_prepare() {
-	# delete unneeded linking against libtermcap
-	sed -i -e 's:-ltermcap::' src/Makefile.am || die "sed failed"
-	epatch "${FILESDIR}"/${P}-Werror.patch
-	AT_NO_RECURSIVE="yes" eautoreconf
+	rm -rf libltdl
+	epatch "${FILESDIR}"/${P}-Werror.patch \
+		"${FILESDIR}"/${P}-libtool.patch
+	eautoreconf
 }
 
 src_configure() {
@@ -32,8 +33,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/doc/
+	emake DESTDIR="${D}" install || die
+	rm -rf "${D}"/usr/doc
 
 	dodoc doc/*.txt ChangeLog README AUTHORS NEWS TODO
 }
diff --git a/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch b/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch
new file mode 100644
index 000000000000..1b95f79447ed
--- /dev/null
+++ b/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch
@@ -0,0 +1,71 @@
+diff -ur dvbstreamer-1.1.orig/configure.in dvbstreamer-1.1/configure.in
+--- dvbstreamer-1.1.orig/configure.in	2008-10-31 16:49:00.000000000 +0200
++++ dvbstreamer-1.1/configure.in	2010-02-03 12:30:56.000000000 +0200
+@@ -23,7 +23,6 @@
+ 
+ AM_INIT_AUTOMAKE("dvbstreamer", $SPEC_VERSION)
+ 
+-AC_CONFIG_SUBDIRS(libltdl)
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+@@ -35,12 +34,8 @@
+ dnl ---------------------------------------------------------------------------
+ dnl Libltdl setup
+ dnl ---------------------------------------------------------------------------
+-AC_LIBTOOL_WIN32_DLL dnl Make sure under cygwin we can load plugins !!!
+-AC_LIBTOOL_DLOPEN
+-AC_LIBLTDL_CONVENIENCE
+-AC_PROG_LIBTOOL
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
++LT_PREREQ([2.2.6])
++LT_INIT([dlopen win32-dll disable-static])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl Work out the libdir name (copied from xine-lib configure.ac)
+diff -ur dvbstreamer-1.1.orig/Makefile.am dvbstreamer-1.1/Makefile.am
+--- dvbstreamer-1.1.orig/Makefile.am	2008-10-31 16:25:03.000000000 +0200
++++ dvbstreamer-1.1/Makefile.am	2010-02-03 12:25:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## DVBStreamer main Makefile
+ 
+-SUBDIRS = libltdl include include/dvbpsi src/dvbpsi src src/plugins
++SUBDIRS = include include/dvbpsi src/dvbpsi src src/plugins
+ 
+ dvbstreamerdocdir = ${prefix}/doc/DVBStreamer
+ dvbstreamerdoc_DATA = \
+diff -ur dvbstreamer-1.1.orig/src/Makefile.am dvbstreamer-1.1/src/Makefile.am
+--- dvbstreamer-1.1.orig/src/Makefile.am	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/Makefile.am	2010-02-03 12:33:30.000000000 +0200
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-INCLUDES = @INCLTDL@
+-
+ AM_CFLAGS =\
+      -I$(top_srcdir)/include -Wall -Werror -D_GNU_SOURCE 
+ 
+@@ -104,7 +102,7 @@
+ dvbstreamer_LDFLAGS = -rdynamic -Wl,-whole-archive -Wl,dvbpsi/libdvbpsi.a -Wl,-no-whole-archive 
+ 
+ dvbstreamer_LDADD = \
+-	  -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ @LIBLTDL@
++	  -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ -lltdl
+ 
+ #
+ # dvbctrl
+diff -ur dvbstreamer-1.1.orig/src/pluginmgr.c dvbstreamer-1.1/src/pluginmgr.c
+--- dvbstreamer-1.1.orig/src/pluginmgr.c	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/pluginmgr.c	2010-02-03 12:27:53.000000000 +0200
+@@ -22,9 +22,9 @@
+ */
+ #include <stdlib.h>
+ #include <string.h>
++#include <ltdl.h>
+ 
+ #include "config.h"
+-#include "ltdl.h"
+ #include "list.h"
+ #include "deliverymethod.h"
+ #include "patprocessor.h"