parallel make fix, bug #163376, add some quotes, einfo -> elog conversion

Package-Manager: portage-2.1.2-r6

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 818b1e08979a9526b75e04337c314b20add3ca4a..8b55639f8ca9a408691e6852bad9fa972361a4d1 100644 (file)
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.106 2007/01/23 09:28:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.107 2007/02/02 07:35:46 aballier Exp $
+
+  02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/avidemux-2.3.0-po.makefile.patch, avidemux-2.3.0.ebuild:
+  parallel make fix, bug #163376, add some quotes, einfo -> elog conversion
 
   23 Jan 2007; Steve Dibb <beandog@gentoo.org> avidemux-2.3.0.ebuild:
   Autotools fix, bug 163376

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index c6ec43ee62efb9e66cbb4c5489654f93a48faa17..8a32d323a5a3c1f3b1b66725bcc0c5e9cd21e71a 100644 (file)
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX avidemux-2.0.42-as-needed.patch 2089 RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 SHA1 ff9e17c351b172f9c62ff0ffcb7a6e0836cd564e SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f
 MD5 2827b9dff4e9519e37be7898ef7e84f7 files/avidemux-2.0.42-as-needed.patch 2089
 RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 files/avidemux-2.0.42-as-needed.patch 2089
@@ -10,6 +13,10 @@ AUX avidemux-2.3.0-dts.patch 275 RMD160 474435e6a459ac626e02c4937f1552a982a37707
 MD5 d159311005a9646a9cdcc39d186b3259 files/avidemux-2.3.0-dts.patch 275
 RMD160 474435e6a459ac626e02c4937f1552a982a37707 files/avidemux-2.3.0-dts.patch 275
 SHA256 075e602335f8cbe8a1128538a169def1f9f63d780319a15cc595de090aa61448 files/avidemux-2.3.0-dts.patch 275
+AUX avidemux-2.3.0-po.makefile.patch 750 RMD160 2d8faa77bb8c4c670b6aee925451282b097aa916 SHA1 a839177d55f7567702737bcd35225e0e2ae8ec8b SHA256 589f5c71f6a740a315d9da05f4ee004e74b04867c0206cff6e7c5c7e572a1615
+MD5 bf3b3bc7f5684849698077e2a0188c05 files/avidemux-2.3.0-po.makefile.patch 750
+RMD160 2d8faa77bb8c4c670b6aee925451282b097aa916 files/avidemux-2.3.0-po.makefile.patch 750
+SHA256 589f5c71f6a740a315d9da05f4ee004e74b04867c0206cff6e7c5c7e572a1615 files/avidemux-2.3.0-po.makefile.patch 750
 AUX avidemux-altivec.patch 9371 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 SHA1 4ac716eb8dffa2327c10d9d8927044790fae39f4 SHA256 74b2e5b86bbdf204636cbf1f339d339e14be1ef89f67b47cf3c2fd6fcad83bf2
 MD5 7709231a89b035414b4877681aa78dc1 files/avidemux-altivec.patch 9371
 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 files/avidemux-altivec.patch 9371
@@ -31,14 +38,14 @@ EBUILD avidemux-2.1_pre1.ebuild 3173 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af
 MD5 18fe28a4bc669584f38bc88bfb06cb88 avidemux-2.1_pre1.ebuild 3173
 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af9e38 avidemux-2.1_pre1.ebuild 3173
 SHA256 33c4babb491a2e64ddf5989f949890fff35d24614684cc4a8c67e2cd08328bca avidemux-2.1_pre1.ebuild 3173
-EBUILD avidemux-2.3.0.ebuild 3456 RMD160 2b12fdfac555464e498a0ae7ecc24d4d70081fa4 SHA1 b514b35ecaea1b3fe1cadd26ca801f097b463524 SHA256 9a4f9cd2bab570b11bac1c781532b2fbff9d5ff8fe91cf2fc58ab12e2a4e364a
-MD5 f73360abb147a6e2ba3f7f5e6f7c3179 avidemux-2.3.0.ebuild 3456
-RMD160 2b12fdfac555464e498a0ae7ecc24d4d70081fa4 avidemux-2.3.0.ebuild 3456
-SHA256 9a4f9cd2bab570b11bac1c781532b2fbff9d5ff8fe91cf2fc58ab12e2a4e364a avidemux-2.3.0.ebuild 3456
-MISC ChangeLog 19435 RMD160 6d67c1438b5be20f84099d436683fe7cc74116e6 SHA1 f3806486b64fac187367b1011092537cb23848ac SHA256 65ce6b85568eda06267040b446c4d6f5cf4a75fe43409b88d965a46d90b80c44
-MD5 ddc17db8c9c967591f5021bf9fceae33 ChangeLog 19435
-RMD160 6d67c1438b5be20f84099d436683fe7cc74116e6 ChangeLog 19435
-SHA256 65ce6b85568eda06267040b446c4d6f5cf4a75fe43409b88d965a46d90b80c44 ChangeLog 19435
+EBUILD avidemux-2.3.0.ebuild 3508 RMD160 324d21d8a03eccea877619ca7ab88ffc30e9d99f SHA1 b9421c2fa61b18b3080114751275e8368381bc88 SHA256 9e5501ed2ede65a09c7e59e09c94e4cf60ba4facb651ffeec22f8ed024ee7ffd
+MD5 844346276a1dbaf6e459c5418d864d07 avidemux-2.3.0.ebuild 3508
+RMD160 324d21d8a03eccea877619ca7ab88ffc30e9d99f avidemux-2.3.0.ebuild 3508
+SHA256 9e5501ed2ede65a09c7e59e09c94e4cf60ba4facb651ffeec22f8ed024ee7ffd avidemux-2.3.0.ebuild 3508
+MISC ChangeLog 19631 RMD160 7d45cbda893411f2ea8a8f3948c2facd822d1368 SHA1 49dcec8bd63237c26d804fb47ca1c4c3c918cf9f SHA256 a0bad11eb0d19c524cb35def339d45f16286ba6d233338ffd696cc8356fba119
+MD5 110fca7026b301d9b9ff95cf678f527e ChangeLog 19631
+RMD160 7d45cbda893411f2ea8a8f3948c2facd822d1368 ChangeLog 19631
+SHA256 a0bad11eb0d19c524cb35def339d45f16286ba6d233338ffd696cc8356fba119 ChangeLog 19631
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
@@ -52,3 +59,10 @@ SHA256 644e49f2f95b30ddf41a9a0a11a1d3d3462980ab9228faf88925e8af348025d5 files/di
 MD5 fda1590238aeae5793a212a88836635b files/digest-avidemux-2.3.0 247
 RMD160 e6bc5a151861e06a0df2a5d143d03d200472c55e files/digest-avidemux-2.3.0 247
 SHA256 9e7c104e7929ebe25b34ce8c772b4c888865242eb143abddc5f4cd77e0357e4d files/digest-avidemux-2.3.0 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFwunavFcC4BYPU0oRAjt7AJ4jUxTVFq4P2IiUBsHIbgEF/p5IAgCgjuHH
+mcYs0e7Kac4sJ2vAqceGK2k=
+=0KQ7
+-----END PGP SIGNATURE-----

diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
index b76801347d4958fd10588f9baed33bba641021c8..8b46410cfad8850d68a43edeb8dab136c785bf47 100644 (file)
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ b/media-video/avidemux/avidemux-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.2 2007/01/23 09:28:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.3 2007/02/02 07:35:46 aballier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -76,10 +76,11 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
-       epatch ${FILESDIR}/${P}-dts.patch
-       epatch ${FILESDIR}/${P}-configure.patch
+       epatch "${FILESDIR}/${P}-dts.patch"
+       epatch "${FILESDIR}/${P}-configure.patch"
+       epatch "${FILESDIR}/${P}-po.makefile.patch"
        #sed -i -e 's/x264=no,-lm/x264=no,-lm -lX11/' configure.in.in || die "sed failed."
 
        gmake -f Makefile.dist || die "autotools failed."
@@ -115,9 +116,9 @@ src_install() {
 
 pkg_postinst() {
        if use ppc && use oss; then
-               echo
-               einfo "OSS sound output may not work on ppc"
-               einfo "If your hear only static noise, try"
-               einfo "changing the sound device to ALSA or arts"
+               elog ""
+               elog "OSS sound output may not work on ppc"
+               elog "If your hear only static noise, try"
+               elog "changing the sound device to ALSA or arts"
        fi
 }

diff --git a/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch b/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch
new file mode 100644 (file)
index 0000000..677b301
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch
@@ -0,0 +1,12 @@
+diff -N -u -r avidemux_2.2_preview2-old/po/Makefile.in.in avidemux_2.2_preview2/po/Makefile.in.in
+--- avidemux_2.2_preview2-old/po/Makefile.in.in        2006-08-26 19:06:27.631751295 +0200
++++ avidemux_2.2_preview2/po/Makefile.in.in    2006-08-26 19:07:30.397921873 +0200
+@@ -68,7 +68,7 @@
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+-      cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
++      cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po
+ 
+ .sin.sed:
+       sed -e '/^#/d' $< > t-$@