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

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 93 insertions, 13 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/Manifest b/media-tv/dvbstreamer/Manifest
index a43ab49b004f..00b35a883a7c 100644
--- a/media-tv/dvbstreamer/Manifest
+++ b/media-tv/dvbstreamer/Manifest
@@ -1,7 +1,8 @@
 AUX dvbstreamer-1.1-Werror.patch 1333 RMD160 947cf9482e4d86a400a7c59ecebb1d1ed22158c8 SHA1 242b4f4babc8874c172ceebf677b6087280d667b SHA256 c5f6548c9365720a9762a302d9a81ee257808a39529bcfaa9dc9e61a6e00e5fd
+AUX dvbstreamer-1.1-libtool.patch 2570 RMD160 72329f1adbadf14f52029da3932e0efb9cfea275 SHA1 262212b816596f672aa6db9ff0dad90a309b9faf SHA256 331c360390251b07c5b61564454ea701155a602aae5370f5a25494a2abe6e350
 DIST dvbstreamer-0.9.tar.bz2 868036 RMD160 eb8b4999edde8881e0f830296372c9044a18210e SHA1 33c690f4c00b8c76a5125f8199654bc171a05e73 SHA256 0c1a240dbebda26a49c447936c4741a0fdb08ac44c9e66017d4b225d0db6474b
 DIST dvbstreamer-1.1.tar.bz2 1215626 RMD160 084fc02ff35d011cfbc6eb72193d64968695eab4 SHA1 55f593e97cebb0be7046ca10cc79309aad3d7715 SHA256 52315b436f00174ab8feac262bc9217a213facb7a7c5298159084f754ab46a23
 EBUILD dvbstreamer-0.9.ebuild 950 RMD160 0303a990655d2fdea2b8da68ce18fc9d7cd8d990 SHA1 61599398a32e1a598a1fb213ef506e7817f6e0e3 SHA256 0bbf0f0698c0d9e4b4b90e9e298d15e3345c449e087f7bd2fe16ffedb46c1452
-EBUILD dvbstreamer-1.1.ebuild 986 RMD160 d867f542966f70796710c39217beb0bbb2712d71 SHA1 6b0da9255921a1eea26c8ce39045550b9dfffa2e SHA256 4a80e4caa988134a66a54965b26ec0bd2d4b9cc34cf1773d536e79af3360d8c5
-MISC ChangeLog 2060 RMD160 d1de82015e967d41fe1338232e90f9cd4fc74ae9 SHA1 90149f2613c474dfb14ce805739282cdd3f5de9d SHA256 9f72166c5bff6de20bc23b256f873e2714c07e6b41af08e18e315988be1c208a
+EBUILD dvbstreamer-1.1-r1.ebuild 914 RMD160 8cda704a1a624742436ca9835acc0d4b80150798 SHA1 4588ea0e2a776a8ddd74adda42a9167e44568fb3 SHA256 4843c5a68907f615682de41e0eeee404d4c7f6530e200d3a9aa36b2d5645d688
+MISC ChangeLog 2309 RMD160 eb38a4bf4fc33009d1b3b29d76e6b521a01de6c0 SHA1 ba99b8124c823e8f6984c74a8b766763e1ec49d6 SHA256 bcdf2d21d03029104444311095038fd29249b532d9e4d528db8ee8256444f5fa
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
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"