Update to EAPI 4 and respect LDFLAGS (bug #337942).

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 35 insertions, 20 deletions

diff --git a/media-video/bbtools/ChangeLog b/media-video/bbtools/ChangeLog
index 8fe426f2a387..81bf87e09312 100644
--- a/media-video/bbtools/ChangeLog
+++ b/media-video/bbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/bbtools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.6 2007/12/01 10:52:20 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.7 2011/11/20 20:49:51 radhermit Exp $
+
+  20 Nov 2011; Tim Harder <radhermit@gentoo.org> bbtools-1.9.ebuild,
+  files/bbtools-1.9-gentoo.patch:
+  Update to EAPI 4 and respect LDFLAGS (bug #337942).
 
   01 Dec 2007; Vlastimil Babka <caster@gentoo.org> bbtools-1.9.ebuild:
   Add ~amd64, works here.
diff --git a/media-video/bbtools/Manifest b/media-video/bbtools/Manifest
index c603a94df68a..0f8f758d660c 100644
--- a/media-video/bbtools/Manifest
+++ b/media-video/bbtools/Manifest
@@ -1,5 +1,19 @@
-AUX bbtools-1.9-gentoo.patch 2768 RMD160 ffd54b6273d0ee42495bbc76f29631f102c59a10 SHA1 8591748c4abc5311a29cb43df98b573bb4d6a5c7 SHA256 a12a9ebeb600cc34767a9f7545d76e158b6be2f5962d7b2d59dfa5bf9c68b2cd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX bbtools-1.9-gentoo.patch 2816 RMD160 50b4996412278c13f9b5b07e3ad9b2d51a1abf0a SHA1 76a9eea733da772269cc783ad89e810ac36af1f4 SHA256 1fe81381496520d41bb06927aab1bc2776a357906cf3cb51bd80c824b9e0a91c
 DIST bbtool19_src.zip 68080 RMD160 2b155ba8f3b0e78a4398802f624e91898fc4903f SHA1 f82c4a1529117794991258f54f6016e728cadf89 SHA256 69e0b0b2b2f3b1e60f7b5391df3e41b0355612243c2591916fd510d9813a3b2d
-EBUILD bbtools-1.9.ebuild 950 RMD160 f3cb038ff03cb91f6613db802ed67f7c5f369c0f SHA1 3ce190c5c412a3ca91204620f6e6c91c7fd7511b SHA256 f2857697559eaa4b3efe67132c3d4895782ed6128df54e2a936f0286d4340cf9
-MISC ChangeLog 960 RMD160 92160ee930cfce9b1d48344bf072585f3668b120 SHA1 da15618e55c168a5b03e343b702a7ff2ab40ed68 SHA256 f7f7a7e88aba89dc6d54110f9b3536c4d5c2a414063bc39da45b399b648794c2
+EBUILD bbtools-1.9.ebuild 899 RMD160 f2ccfcdaf77bf336cc2adc0dfc06c2218c093910 SHA1 54840b9ff43299cb3341757fc92fa84c8fef42ce SHA256 93ce0ce2fd43ff16298a9be5167c50811bc1dba2a500cfbafe07c6a611ff61cc
+MISC ChangeLog 1121 RMD160 5da49f27aef65e42b5fb87f050ea19b93435c255 SHA1 3ca4b34ec1ce187c1e2c736872c138df56feb78d SHA256 a27cb03a864bfda6c2b319edc2c2b3106341db4524da0581f91e9e4ebc840d63
 MISC metadata.xml 559 RMD160 e385ae62c34b5ab222d91adbf8c223e3f61f00d4 SHA1 b891dd4e8295400dd5141872f39d0efa3ebfde2a SHA256 ca81cbc876f6b651de7931c168a05fa367da12474c32fc2b356f4b71cc3d8ff5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOyWf0AAoJEEqz6FtPBkyjkP8H/1jbwhmPhISCqifpzpG6sjtl
+kGSnda5uqn5gqL7rsV/FnAUPLtdtXxoxQxtmWjNG2OJHiIuY8LQEUDYBoqO9ZFA9
+xJMQPLR2HnZqxwdKO4AbCGgg+CsL5IRrpGQeQ16a8/hF1DR22GXsagmwS7lxsxq6
+Qp7IxUoJnAS93EhSOieQfwg+S5WybqG+0EG6xJ0FHmhmTg1ZZHbrrDo8HeTBAHBd
+HtbqkC7n6EeFtf0sRoM9qocFmHkyPEdvhJ+bbLHJb8RwahnGqtRsufuuNblqFQvW
+JaBvbnAeGqn+0ad8YcJF7Gr0TBAb9cJQ297UPFRkmBGr1mC+6c/2ZYraGZoq60w=
+=hNPN
+-----END PGP SIGNATURE-----
diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild
index 6a4babbdc2ad..fc139db9650f 100644
--- a/media-video/bbtools/bbtools-1.9.ebuild
+++ b/media-video/bbtools/bbtools-1.9.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/bbtools-1.9.ebuild,v 1.5 2007/12/01 10:52:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/bbtools-1.9.ebuild,v 1.6 2011/11/20 20:49:51 radhermit Exp $
 
-inherit eutils flag-o-matic
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="bbdmux, bbinfo, bbvinfo and bbainfo from Brent Beyeler"
 HOMEPAGE="http://members.cox.net/beyeler/bbmpeg.html"
@@ -14,13 +16,10 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	mv BBINFO.cpp bbinfo.cpp || die
 	mv BITS.CPP bits.cpp || die
 	mv BITS.H bits.h || die
@@ -29,13 +28,11 @@ src_unpack() {
 	edos2unix *.cpp *.h
 
 	epatch "${FILESDIR}"/bbtools-${PV}-gentoo.patch
-}
 
-src_compile() {
 	append-lfs-flags
-	emake || die "emake failed"
+	tc-export CXX
 }
 
 src_install() {
-	dobin bbainfo bbdmux bbinfo bbvinfo || die "dobin failed"
+	dobin bbainfo bbdmux bbinfo bbvinfo
 }
diff --git a/media-video/bbtools/files/bbtools-1.9-gentoo.patch b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
index 2c33cae118c7..7f9ff7ab6279 100644
--- a/media-video/bbtools/files/bbtools-1.9-gentoo.patch
+++ b/media-video/bbtools/files/bbtools-1.9-gentoo.patch
@@ -54,16 +54,16 @@
 +all: bbainfo bbdmux bbinfo bbvinfo
 +
 +bbdmux: bits.o bbdmux.o
-+	$(CXX) $(CXXFLAGS) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
 +
 +bbinfo: bits.o bbinfo.o
-+	$(CXX) $(CXXFLAGS) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
 +
 +bbvinfo: bits.o bbvinfo.o
-+	$(CXX) $(CXXFLAGS) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
 +
 +bbainfo: bits.o bbainfo.o
-+	$(CXX) $(CXXFLAGS) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ 
 +
 +%.o: %.c
 +	$(CXX) $(CXXFLAGS) -c -o $@ $<