From a120c9377a8c8ae1da070af3fe772b13a60b29e6 Mon Sep 17 00:00:00 2001 From: Peter Alfredsen Date: Wed, 17 Dec 2008 22:05:34 +0100 Subject: Fix forced-as-needed (Portage version: 2.2_rc17/git/Linux 2.6.28-rc6 x86_64) (Unsigned Manifest commit) --- media-video/videotrans/ChangeLog | 4 +++ media-video/videotrans/Manifest | 5 +-- .../files/videotrans-1.6.0-forced-as-needed.patch | 41 ++++++++++++++++++++++ media-video/videotrans/videotrans-1.6.0.ebuild | 4 ++- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch diff --git a/media-video/videotrans/ChangeLog b/media-video/videotrans/ChangeLog index e08a5fe..d09349d 100644 --- a/media-video/videotrans/ChangeLog +++ b/media-video/videotrans/ChangeLog @@ -2,6 +2,10 @@ # 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 $ + 17 Dec 2008; Peter Alfredsen + +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) 04 Feb 2008; Stefan Briesenick diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest index 22d97d5..9e07d38 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 70c3f6ec753c8d07fb7bfbd5e2d768e4cfad0e35 SHA1 3fe61495222a9a7de3c19bfe94eac15da84be9ed SHA256 0b70a3a596152d5e82502a62f9b137b6865a0031c0e1ef8d598e55c4641d6dba +MISC ChangeLog 1201 RMD160 5033529380df594a7f515b29f5a62db764d6521a SHA1 4c0d72de4366edc016618a99e092ca14d98195d4 SHA256 766ea7204db7fc41a3aa208e025c7d2288000753923549aeb70262619962eeee 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 0000000..4dca748 --- /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 34a34b3..d912733 100644 --- a/media-video/videotrans/videotrans-1.6.0.ebuild +++ b/media-video/videotrans/videotrans-1.6.0.ebuild @@ -2,7 +2,7 @@ # 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 $ -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'." -- cgit v1.2.3-65-gdbad