amd64/ppc64/x86 stable

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 27 insertions, 23 deletions

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index 756e9e0211f5..c1e23feac710 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.30 2013/08/02 06:14:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.31 2013/08/02 06:32:20 ssuominen Exp $
+
+  02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  mpeg-tools-1.5b-r4.ebuild:
+  amd64/ppc64/x86 stable
 
 *mpeg-tools-1.5b-r5 (02 Aug 2013)
 
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index d47033e5c339..31eee0065e12 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -13,18 +13,18 @@ AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 SHA256 2325ccdc43bce07d38522
 AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8 WHIRLPOOL d7b13a803824991a76eec1f9acac1d67611366f344bc63dd71d0b789d95d5a2271d819432126f2448954950a6af2012c47b60d9fb22b43227f68320659acea17
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469 WHIRLPOOL 9e1f06ffa4518903280bc1693fa6c8ae0b71ebcf4936889ed3e74ee6144d22a6de8e347797f61001b037d5148abf5a35edfd11968f12e565f06c8a0fdfb0d2b4
 EBUILD mpeg-tools-1.5b-r3.ebuild 1804 SHA256 3b5ff71ca90dc1c57fa103b701296977ca4f5949619181ab75a81a219abac1fc SHA512 39727996244d37ac733eb28ac59d2911a0f2d5c1bbe924582c594ff3bbe2c2f03ec0f9051f79e35c5273cce457c266b1c24fb3bbf7eff3d72e246f1aaa1803a9 WHIRLPOOL 4d6e1159d9cced6491f5517d9093f768ed80d08f8f9b6a468f7f6d24e5d2d2f2ee43ff1d28237e57cfee2423ca5b8fd8e5b5501a63b2b6e2ee68a731adab2477
-EBUILD mpeg-tools-1.5b-r4.ebuild 2113 SHA256 1059bf37a421786bbed78b3d66b17073d1b20935d87a46fc69c21f1c112a36c5 SHA512 656ee7ca74d0061a3abf0bbc8d99285fba7fdd5ddbb4e441f2c665663e8efe8187fa339085237989a9644eb55e31f8c6c76af13bb0f3932ee9b5e579c9972780 WHIRLPOOL a68c920e9801c79f98b1119f79c89b5fa105ff594c2d5f886caa2f26944b6925a15a8e17002dc3101d6229230b79fda2815378a8a81174fa60ed30e523980978
+EBUILD mpeg-tools-1.5b-r4.ebuild 1968 SHA256 48e7876c32c75e8cf33f7af43ce639edb7d6938026fa0a739c957f09f06e2917 SHA512 91a8b4c488f9d9e204799f33505acb71d6d8ff5813e12f5bf8a4a1844b99e30f69cb7db91fbb11ec8975041707ad505a1f9471e973ad69371a9556791b3a562a WHIRLPOOL 65854361022de11a82fe44f3b30132491aade654264c1e92a732ad5bf5d4df83b64d05bcf72723349b2c66f9897fb37ceb0571e1c0c535d98ecfb2688dbe5791
 EBUILD mpeg-tools-1.5b-r5.ebuild 1918 SHA256 515a5bd4fcecf6dacf2f6866ad597a7d6ec1895adf9a16e30c96276e753f4f48 SHA512 7709811647f724381642ae3532ace56e61b3d86963901915201b3ae79bfe968f26c8fd1e7f84f704d0ff76f4970cfb8a6f08c468d25bc75c84d517864273a210 WHIRLPOOL 150c4459040f7cbbd3e96492ac961fe3190816b39211b3a8b86e58f8a338d25d6e6d4617838da448fe4d0ab40cfc66b8de0094018e67b500435218d8a4c4bbd5
-MISC ChangeLog 4845 SHA256 56207d344ce0a34b786dee5b41cc3f7225ae13848519a1032f6440c872df68c4 SHA512 cb0620243475a0befcd198ffd8103b43565124bf7603cdf0c013677a16aeb5ce8cd15a4378949d4a5f6177e4cca44b0cab72b7ec199f2f7f1c24858130cfa476 WHIRLPOOL 3d257f1dbca54b8c3b90fe6700f821a5e903f1fcd93fe9056935057faab35e9b4f0ed6eb864a10d4d7f3949dd71003ecff8e2059f0043b6591384cb299141924
+MISC ChangeLog 4954 SHA256 61386999ea724b91b509f5191ed79902a531ad9a0c7b18368740ba9ebcdc6baa SHA512 eaca9327bcef8f04d33069ca391bd672ed7472b462b66494ce4873b55483ca567968d18fdb180b21ff3199a29f227f791085a6567a9b854fa2eead56e28dc16e WHIRLPOOL 051e18f31dbb58473bf876196c697421aefa51e3526e30834dd1d90724e444d553708fe11f479b4950809a3ac3e73a5b3d50b22134efe1c9d973c20ef199ca9a
 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+03hAAoJEEdUh39IaPFNZkAH/1uz5p42aprlvvRHkWfz8RFs
-gkNT6WHMZdOgFvz5jl7k/Esn1f2G+byDsFlVJn/BiBtzXLj+y1V/OSVbrKEvV2o3
-h4GNtPf5/Nmr159tfqXKn934knOaNOvyYAwm1OpPvemKqjNbNuJ46S2Qf/uBhSJE
-5K8oNl7vfLBmuIGixB3X3FH4PmmDKZ7K0ZwRBN24xOcvOCRc9D8eKBBjXXhgP6x+
-+bhLIFe82nRWHHfSv0ylEkXt2xJD8cSGo1Ximvh3fkqL1xTBbyCsRQQd8GwSNYxO
-qI+24D9fXpsM2T+IGW9xpzsQsSJmDq/ewCBrf91OxCAepb1caRFjH8qOUUPkX5I=
-=kQjr
+iQEcBAEBCAAGBQJR+1IaAAoJEEdUh39IaPFNzDsH/1oEG2N8oYfcz6uS37u1i+Ys
+iNo8Cm1qGHD/IJ/fDB6U3l9p8iyhZ8WYdzFT5C5ypnVTJYc8yijjS8HIl5SrBO68
+TtgIiBFvNotqdDgrpUtCpeoKjLlxr0wU7xaHCJDnaeOVf3JhbQfptU3EUcq/vuFh
+9fBFK72bwIkyPMxbbHhD7BWsS/b5u/LleNaVgMpa45j5RM5+xfcgUOCrh86kGwMC
+jBLN0zorZ+kIaqxJGuYr35uKwfXOThLE9a+TiMRnL3YEgtPvobEoVi5MDQ1cSRnE
+N3t2rq7aALXhbFoXYkz8QBx8mA15YnFRSXg9BaVWo1VhdWkT+lhmUCgku/RTqis=
+=zQaH
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
index c3a999fe6a74..6afe28a42594 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/06/04 01:29:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.6 2013/08/02 06:32:20 ssuominen Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 MY_PN=mpeg_encode
@@ -11,17 +12,16 @@ SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	virtual/jpeg"
+	virtual/jpeg:0"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_PN}
 
-src_unpack () {
-	unpack ${A}
+src_prepare() {
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
@@ -40,13 +40,13 @@ src_unpack () {
 }
 
 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"
+	emake CC="$(tc-getCC)"
+	emake -C convert CC="$(tc-getCC)"
+	emake -C convert/mtv CC="$(tc-getCC)"
 }
 
-src_install () {
-	dobin mpeg_encode || die "dobin mpeg_encode"
+src_install() {
+	dobin mpeg_encode
 	doman docs/*.1
 	dodoc BUGS CHANGES README TODO VERSION
 	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
@@ -54,13 +54,13 @@ src_install () {
 	dodoc examples/*
 
 	cd ../convert
-	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid || die "dobin convert utils"
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
 	newdoc README README.convert
 	newdoc mtv/README README.mtv
 }
 
 pkg_postinst() {
-	if [[ -z $(best_version media-libs/netpbm) ]] ; then
+	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