Fix building with -Wl,--as-needed wrt #247871.

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

3 files changed, 31 insertions, 13 deletions

diff --git a/media-video/chaplin/ChangeLog b/media-video/chaplin/ChangeLog
index ba69cc33c6fe..840817964d24 100644
--- a/media-video/chaplin/ChangeLog
+++ b/media-video/chaplin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/chaplin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.10 2007/02/12 14:35:16 blubb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.11 2009/12/19 21:59:26 ssuominen Exp $
+
+  19 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  chaplin-1.10-r1.ebuild, +files/chaplin-1.10-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #247871.
 
   12 Feb 2007; Simon Stelling <blubb@gentoo.org> chaplin-1.10-r1.ebuild:
   stable on amd64; bug 165375
diff --git a/media-video/chaplin/chaplin-1.10-r1.ebuild b/media-video/chaplin/chaplin-1.10-r1.ebuild
index acf8b768bccc..6d743ed90770 100644
--- a/media-video/chaplin/chaplin-1.10-r1.ebuild
+++ b/media-video/chaplin/chaplin-1.10-r1.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.5 2007/02/12 14:35:16 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.6 2009/12/19 21:59:26 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
-IUSE="transcode vcd"
-
-S="${WORKDIR}/${PN}"
-
 DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
 HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
 SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
@@ -15,18 +12,20 @@ SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+IUSE="transcode vcd"
 
 DEPEND=">=media-libs/libdvdread-0.9.4
 	>=media-gfx/imagemagick-5.5.7.14
 	transcode? ( >=media-video/transcode-0.6.2 )
 	vcd? ( >=media-video/vcdimager-0.7.2 )"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-libdvdread-0.9.6.patch"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdvdread-0.9.6.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_install() {
-	dobin chaplin || die "Failed installing file chaplin"
-	dobin chaplin-genmenu || die "Failed installing file chaplin-genmenu"
+	dobin chaplin chaplin-genmenu || die
 }
diff --git a/media-video/chaplin/files/chaplin-1.10-asneeded.patch b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
new file mode 100644
index 000000000000..46acde6666cb
--- /dev/null
+++ b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
@@ -0,0 +1,15 @@
+--- chaplin.orig/Makefile	2004-03-21 18:44:18.000000000 +0100
++++ chaplin/Makefile	2009-10-25 18:34:26.082229887 +0100
+@@ -6,10 +6,10 @@
+ all: build
+ 
+ build:
+-	gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
++	gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
+ 
+ debug:
+-	gcc -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
++	gcc -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
+ 
+ dist:
+ 	cd .. ; tar cvfz chaplin.tgz chaplin/Makefile chaplin/chaplin.c chaplin/chaplin-genmenu chaplin/chaplin