Update to EAPI 4. Respect LDFLAGS, CFLAGS, and CC (bugs #240844 and #335268).

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

3 files changed, 35 insertions, 16 deletions

diff --git a/media-video/mpeg2vidcodec/ChangeLog b/media-video/mpeg2vidcodec/ChangeLog
index e4f499ac9207..37f7505bff0e 100644
--- a/media-video/mpeg2vidcodec/ChangeLog
+++ b/media-video/mpeg2vidcodec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpeg2vidcodec
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/ChangeLog,v 1.22 2011/02/06 07:47:05 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/ChangeLog,v 1.23 2011/11/21 20:12:27 radhermit Exp $
+
+  21 Nov 2011; Tim Harder <radhermit@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Update to EAPI 4. Respect LDFLAGS, CFLAGS, and CC (bugs #240844 and #335268).
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
   Drop to ~mips
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index 79f9a0ccdc17..446531644779 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST mpeg2vidcodec_v12.tar.gz 259790 RMD160 32fbd8edc485e7d03ab84b8328ff40a74a2b3002 SHA1 2ba56c46f3a70213e4f09417ad5340ef2b1e312e SHA256 e59da9988b2e964026c8370658771954a724e8319cc266f75c6aef2a85c40076
-EBUILD mpeg2vidcodec-12-r1.ebuild 860 RMD160 9983674d5473d2c751fbb6a9a84fc1f39568d52c SHA1 df4155dc5d262fd178c141c1ad5595d42ef0a1db SHA256 ba8114627bb53c6600539b54f74c649b07b916ac91ea3a81e53f209f040a7fb6
-MISC ChangeLog 2746 RMD160 8ab39110bc443d7b238532558d8b45b5e48f79e6 SHA1 0cfde70c670b7b2459f63c7f9341d868ade0a3b2 SHA256 2495be42a7c47030962e38def816c20554c0a6af6af893b3de8e66cc4585dc3c
+EBUILD mpeg2vidcodec-12-r1.ebuild 918 RMD160 8f2d76faa58da86c3d6b9841761376f50393bf1b SHA1 0b1483c3c6f2ca32b15ef7dd01ab3f60fc6d267c SHA256 7809e12ae850daf8404e0d5d8be00df1bc876bc78beee3d44ad0dd988af2986d
+MISC ChangeLog 2909 RMD160 b21f0d8676f4d6da60671a47faa973a9c58a09e5 SHA1 4cd2db1f91d5050bdc0513760befba76d4112559 SHA256 ce4b155b26ba198c013eb1acbe70a0203e0b00e8afdf2b1491653dc1d52c37c3
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOyrC7AAoJEEqz6FtPBkyjwQAH/2hy9lSwwRV5XJ+gdmCV4XKM
+XNOnIVpZbLSPzRnQNHwhW8aUWFlNy9Y+WkhX/LzNTYodCu/+lSBJaYTOOKD1mQBx
+K8NS86Ju0AAAQHawKcgpefeV1PT+PYN5hmOZen3lRV77Lf/tU/lcwcerBrlTNcju
+1jq0BKMw2VQ2K0gFSPymNe8IZxyOdRfZQFFbXXMQkY5CS245mTbbe6ug9jtsR/gQ
+4V3C/mE/Zs6J2Aat3PMKVyutPKz+sZZUpCpwjgsW+Pj1+5fdLdlZ0sQE3Of59Xz6
+cPSkndQM6vBu1lLQw/TUrW+tYcFnH+1/6eZAwD6bDtwqa+tDttgDrVoBl0jUVCg=
+=wKQ7
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index 376af07cfbcd..26eb6356ca3b 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.33 2011/02/06 07:47:05 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.34 2011/11/21 20:12:27 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
 
 MY_P="${PN}_v${PV}"
 DESCRIPTION="MPEG Library"
@@ -12,22 +16,20 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
 S=${WORKDIR}/mpeg2
 
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "s:make:\$(MAKE):" \
-		"${S}"/Makefile \
-		|| die "sed Makefile failed"
+src_prepare() {
+	sed -i -e 's:make:$(MAKE):' Makefile || die
+
+	sed -i -e 's:$(CC) $(CFLAGS):\0 $(LDFLAGS):' \
+		src/mpeg2enc/Makefile src/mpeg2dec/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode \
-		|| die "dobin failed"
+	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode
 	dodoc README doc/*
 }