From: Steve Dibb <beandog@gentoo.org>
Date: Tue, 23 Jan 2007 09:28:47 +0000 (+0000)
Subject: Autotools fix, bug 163376
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44a6777279919951240ce2c86b308567a54abc63;p=gentoo.git

Autotools fix, bug 163376
Package-Manager: portage-2.1.1-r2
---

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 2b1c7ac4b46a..818b1e08979a 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # 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.105 2007/01/22 15:52:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.106 2007/01/23 09:28:47 beandog Exp $
+
+  23 Jan 2007; Steve Dibb <beandog@gentoo.org> avidemux-2.3.0.ebuild:
+  Autotools fix, bug 163376
 
 *avidemux-2.3.0 (22 Jan 2007)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 12685a96d74a..c6ec43ee62ef 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -31,14 +31,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 3502 RMD160 7466a910af90ac8a98e207ad26e002c91a1137a1 SHA1 520b8d1a965e95a456ae35d1157dcea8f552b270 SHA256 628b077ba6887d4eecd8e1a2ac76a018d7fcf42b21eb18f4334d17a69787f9fd
-MD5 300b86256c5453d655433c5c8cfd7383 avidemux-2.3.0.ebuild 3502
-RMD160 7466a910af90ac8a98e207ad26e002c91a1137a1 avidemux-2.3.0.ebuild 3502
-SHA256 628b077ba6887d4eecd8e1a2ac76a018d7fcf42b21eb18f4334d17a69787f9fd avidemux-2.3.0.ebuild 3502
-MISC ChangeLog 19336 RMD160 953cb85626afae6b8b3af70cf4163584483a1b93 SHA1 bc5bfbe1b8e83616159165f0b2f94190b5aecbb9 SHA256 b725fd7804338893acdb8fcaabdd390b8ca443f4b7cb613a06f79db9f3e5c991
-MD5 48b702e1d988af3808f639a1989a8a03 ChangeLog 19336
-RMD160 953cb85626afae6b8b3af70cf4163584483a1b93 ChangeLog 19336
-SHA256 b725fd7804338893acdb8fcaabdd390b8ca443f4b7cb613a06f79db9f3e5c991 ChangeLog 19336
+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
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
index 155aef49355b..b76801347d49 100644
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ b/media-video/avidemux/avidemux-2.3.0.ebuild
@@ -1,8 +1,11 @@
 # 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.1 2007/01/22 15:52:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.2 2007/01/23 09:28:47 beandog Exp $
 
-inherit eutils flag-o-matic subversion
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic subversion autotools
 
 MY_P=${PN}_${PV}
 S=${WORKDIR}/${MY_P}
@@ -58,9 +61,8 @@ pkg_setup() {
 	filter-flags "-fforce-addr"
 
 	if ! built_with_use dev-lang/spidermonkey threadsafe; then
-		eerror "dev-lang/spidermonkey is missing threadsafe support, please make"
-		eerror "sure you get the spidermonkey ebuild with threadsafe USE flag"
-		eerror "from an overlay, enable the threadsafe USE flag and re-emerge"
+		eerror "dev-lang/spidermonkey is missing threadsafe support, please"
+		eerror "enable the threadsafe USE flag and re-emerge"
 		eerror "dev-lang/spidermonkey - this avidemux build will not compile"
 		eerror "nor work without it!"
 		die "dev-lang/spidermonkey needs threadsafe support"
@@ -74,13 +76,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
+	cd ${S}
 
 	epatch ${FILESDIR}/${P}-dts.patch
 	epatch ${FILESDIR}/${P}-configure.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."
 }