Fix forced-as-needed

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 53 insertions, 5 deletions

diff --git a/media-video/videotrans/ChangeLog b/media-video/videotrans/ChangeLog
index e08a5fe40548..87b166c57072 100644
--- a/media-video/videotrans/ChangeLog
+++ b/media-video/videotrans/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/videotrans
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/ChangeLog,v 1.6 2008/02/04 00:58:17 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/ChangeLog,v 1.7 2008/12/17 21:10:04 loki_val Exp $
+
+  17 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/videotrans-1.6.0-forced-as-needed.patch, videotrans-1.6.0.ebuild:
+  Fix forced-as-needed
 
 *videotrans-1.6.0 (04 Feb 2008)
 
diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest
index 22d97d560d32..e7a1b0a07b26 100644
--- a/media-video/videotrans/Manifest
+++ b/media-video/videotrans/Manifest
@@ -1,4 +1,5 @@
+AUX videotrans-1.6.0-forced-as-needed.patch 1248 RMD160 633bfe95c1b59d40caaa7958383e44db126d6cc6 SHA1 10afae578e0c05bb36835ed23328a6f543f6a620 SHA256 7c57349fc0b2c8dd2d228724420628a49fda1390822fc003861a5d83adda9f5b
 DIST videotrans-1.6.0.tar.bz2 91205 RMD160 dc22a60d7fce3e36c54ff84988700ff89bd48c53 SHA1 7939c3c663251e45df88a2bce66e7299452b0882 SHA256 96595d2cb9b53406c9cb364d348645568b2f2f615e64dc2377ac74521d5d3cce
-EBUILD videotrans-1.6.0.ebuild 976 RMD160 87da990874aed15a1a22502ef9c887e4b066dff0 SHA1 81f9bf4608d813566d7d0c5513407ecb669503d1 SHA256 05f7ff50b6c875a61cd6a7f771cb00c22173cb33cdbcd30ddfea8ec51156a818
-MISC ChangeLog 1049 RMD160 6c383c89036fab02da46dea0fa556b7a54356dd8 SHA1 0923051292a4919a0a8192a6fa218c5fe4b02343 SHA256 1106c4569f01d72b7619d333f078bd6f0c4a17b68002f5353ac46a404fdaf13b
+EBUILD videotrans-1.6.0.ebuild 1036 RMD160 7fbad3e4da34760024841e2d5cd33ad19f7c6480 SHA1 15be2759fff8dbd67c0267354cf3f53371e45b28 SHA256 bc007b91b0f84e89895f505675648423cf149e396cab59a25911747646a5ac40
+MISC ChangeLog 1201 RMD160 777a5a40639d08c4848b02d2397c8f9587afe7e9 SHA1 7c6b92fcd78202ce92b528f0840e5b6a6c3ffae9 SHA256 e78f78045eb6c7fff6691d8b9f0833aae0c65bf610c2c320e6d33f295561700a
 MISC metadata.xml 545 RMD160 f6e67aafdb33cd68131205c6a289cc278427c23a SHA1 8eaf14fb76231228e11649fb7595d51b356d8c4c SHA256 388d9444521267ef15ae602416796a5530f0f701bbb2418fc68b23973b20dc58
diff --git a/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch b/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch
new file mode 100644
index 000000000000..4dca7482ed1a
--- /dev/null
+++ b/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch
@@ -0,0 +1,41 @@
+diff -NrU5 videotrans-1.6.0.orig/src/Makefile.in videotrans-1.6.0/src/Makefile.in
+--- videotrans-1.6.0.orig/src/Makefile.in	2008-12-17 21:58:32.000000000 +0100
++++ videotrans-1.6.0/src/Makefile.in	2008-12-17 22:02:36.000000000 +0100
+@@ -1,9 +1,9 @@
+ # This "Makefile.in" file is converted into "Makefile" by "configure".
+ 
+ CFLAGS		= @CFLAGS@ @DEFINES@
+-LDFLAGS		= -g @LIBS@
++LIBS		= @LIBS@
+ CC		= @CC@
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+ INSTALL_DATA	= @INSTALL_DATA@
+@@ -14,23 +14,23 @@
+ MANDIR		= $(DESTDIR)/@mandir@
+ 
+ all:		zoomcalc fakewavspeed progress
+ 
+ zoomcalc:	zoomcalc.o
+-		$(CC) -o zoomcalc $(LDFLAGS) zoomcalc.o
++		$(CC) $(LDFLAGS) zoomcalc.o $(LIBS) -o zoomcalc
+ 
+ zoomcalc.o:	zoomcalc.c
+ 		$(CC) $(CFLAGS) -o zoomcalc.o -c zoomcalc.c
+ 
+ fakewavspeed:	fakewavspeed.o
+-		$(CC) -o fakewavspeed $(LDFLAGS) fakewavspeed.o
++		$(CC) $(LDFLAGS) fakewavspeed.o $(LIBS) -o fakewavspeed
+ 
+ fakewavspeed.o:	fakewavspeed.c
+ 		$(CC) $(CFLAGS) -o fakewavspeed.o -c fakewavspeed.c
+ 
+ progress:	progress.o
+-		$(CC) -o progress $(LDFLAGS) progress.o
++		$(CC) $(LDFLAGS) progress.o $(LIBS) -o progress
+ 
+ progress.o:	progress.c
+ 		$(CC) $(CFLAGS) -o progress.o -c progress.c
+ 
+ install:	all
diff --git a/media-video/videotrans/videotrans-1.6.0.ebuild b/media-video/videotrans/videotrans-1.6.0.ebuild
index 34a34b3a9c3d..3dd83ad2286c 100644
--- a/media-video/videotrans/videotrans-1.6.0.ebuild
+++ b/media-video/videotrans/videotrans-1.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/videotrans-1.6.0.ebuild,v 1.1 2008/02/04 00:58:17 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/videotrans-1.6.0.ebuild,v 1.2 2008/12/17 21:10:04 loki_val Exp $
 
-inherit eutils
+inherit base eutils
 
 DESCRIPTION="A package to convert movies to DVD format and to build DVDs with."
 HOMEPAGE="http://videotrans.sourceforge.net/"
@@ -26,6 +26,8 @@ RDEPEND="${DEPEND}
 	app-shells/bash
 	sys-devel/bc"
 
+PATCHES=( "${FILESDIR}/${P}-forced-as-needed.patch" )
+
 pkg_setup() {
 	if ! built_with_use media-video/mjpegtools png; then
 		eerror "Please emerge media-video/mjpegtools with useflag 'png'."