3 files changed, 118 insertions, 2 deletions
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index f44f41787fa9..323a5a43eb69 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.23 2009/10/30 18:57:01 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.24 2010/02/04 23:43:33 jlec Exp $
+
+*mpeg-tools-1.5b-r4 (04 Feb 2010)
+
+  04 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +mpeg-tools-1.5b-r4.ebuild, +files/mpeg-tools-1.5b-as-needed.patch:
+  As-needed conform linking and respecting LDFLAGS, #282733
 
   30 Oct 2009; Fabian Groffen <grobian@gentoo.org>
   mpeg-tools-1.5b-r3.ebuild:
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
new file mode 100644
index 000000000000..58c74e124f09
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
@@ -0,0 +1,47 @@
+--- convert/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/Makefile.new	2009-08-25 21:22:54.000000000 +0200
+@@ -53,13 +53,13 @@
+ all: $(TARGETS)
+ 
+ vidtoppm: vidtoppm.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@  -lXvid -lX11
+ 
+ vidtojpeg: vidtojpeg.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtojpeg vidtojpeg.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ vidtoeyuv: vidtoeyuv.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoeyuv vidtoeyuv.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ wc:;		wc -l *.[ch] *.pl *.table
+ clean:;		rm -f *.o core *~ gmon.out $(TARGETS)
+--- convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/mtv/Makefile.new	2009-08-25 21:24:31.000000000 +0200
+@@ -15,12 +15,12 @@
+ default: movieToVid
+ 
+ movieToVid: movieToVid.o
+-	$(CC) $(CFLAGS) -o movieToVid movieToVid.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o
+ 
+ clean:
+ 	rm -f core lintout makeout tags Makefile.bak *.o \
+ 		movieToVid
+ 
+ purify:	$(OBJ)
+-	$(PURIFY) $(CC) $(OBJ) -o movieToVid.purify
++	$(PURIFY) $(CC) $(LDFLAGS) $(OBJ) -o movieToVid.purify
+ 
+--- mpeg_encode//Makefile	2009-08-25 21:19:43.000000000 +0200
++++ mpeg_encode//Makefile.new	2009-08-25 21:27:12.000000000 +0200
+@@ -203,7 +203,6 @@
+ ############
+ 
+ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
+-	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+-	strip mpeg_encode
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+ 
+ profile: $(MP_ALL_OBJS)
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
new file mode 100644
index 000000000000..aaaa75dfe7c4
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.1 2010/02/04 23:43:33 jlec Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PN=mpeg_encode
+DESCRIPTION="Tools for MPEG video"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=media-libs/jpeg-7"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack () {
+	unpack ${A}
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	cd "${S}"
+	rm -r jpeg
+	epatch "${FILESDIR}"/${P}-system-jpeg.patch
+	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
+	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+	emake -C convert CC="$(tc-getCC)" || die "emake convert failed"
+	emake -C convert/mtv CC="$(tc-getCC)" || die "emake convert/mtv failed"
+}
+
+src_install () {
+	dobin mpeg_encode || die "dobin mpeg_encode"
+	doman docs/*.1
+	dodoc BUGS CHANGES README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+
+	cd ../convert
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid || die "dobin convert utils"
+	newdoc README README.convert
+	newdoc mtv/README README.mtv
+}
+
+pkg_postinst() {
+	if [[ -z $(best_version media-libs/netpbm) ]] ; then
+		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
+		elog "emerge the netpbm package.  It has updated versions."
+	fi
+}