Add MULTILIB_IN_SOURCE_BUILD

8 files changed, 28 insertions, 9 deletions

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 482d221cb..0061d541b 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -4,7 +4,7 @@ AUX xvid-1.1.3-ia64-build.patch 393 RMD160 2d4b9e76e7c8bcea8466e19c76458db378c12
 DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
 DIST xvidcore-1.1.3.tar.bz2 625974 RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 SHA1 7a945c245851e115bc107aa621f72d775a5d1adb SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed
 DIST xvidcore-1.2.1.tar.bz2 641101 RMD160 fcb6a5a0410d1921d99361fe5d580f00128b9ba3 SHA1 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3 SHA256 ef0175aa86b2d8b48138ca993526645403371b87683c69853b09f1163797ddcc
-EBUILD xvid-1.1.3.ebuild 1991 RMD160 93ac42d4712f610bd88693945c21d84b412dfe49 SHA1 3d873cb7861e8698af4ee8240474fa42ce296ea4 SHA256 95dcd78c21066cd5c70750ba62407fd955cb315f72457a976062797153efb985
-EBUILD xvid-1.2.1.ebuild 1508 RMD160 76c683db9b704e5d0c1482dae2ba16536d5149f7 SHA1 832d45ed36b4829bdb8eeecebbe9afdd5912a49d SHA256 99db7984e2ddaa07b11effcbf87120d8e70ed40a9b76d98c48ee1120813290dd
+EBUILD xvid-1.1.3.ebuild 2079 RMD160 926e9182e9c17dcb432858aa5bd1af90cd173ecf SHA1 a37725dae8d55865b8cd534737069922d98528ed SHA256 f259c7cfe2b80c3afa0519ebfc471de6f3c882a7c2c4d27b8e49090e662fbd83
+EBUILD xvid-1.2.1.ebuild 1682 RMD160 0dec5768aaf8bff66d50bcf9b6966ca78102a4da SHA1 45bb87b2daeefdd34e0046164d91d4ac05e0f9b4 SHA256 1e2389c1e4677d28f00caf14d5b68574d927e97140b4529d0b2d530339064713
 MISC ChangeLog 13700 RMD160 fecb2e6bd5424f282beda3a03b6ed3663a360128 SHA1 0453139bc8b1a160abd1e9437cb535bf213139f4 SHA256 8ea139d451ea30768211c091c9e9b2d74db313822e70394b416d57e7e14f2359
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/xvid/xvid-1.1.3.ebuild b/media-libs/xvid/xvid-1.1.3.ebuild
index 68871e512..9ada24113 100644
--- a/media-libs/xvid/xvid-1.1.3.ebuild
+++ b/media-libs/xvid/xvid-1.1.3.ebuild
@@ -28,7 +28,8 @@ DEPEND="x86? ( ${NASM} )
 	amd64? ( ${NASM} )"
 RDEPEND=""
 
-S="${WORKDIR}"/${MY_P}/build/generic
+#S="${WORKDIR}"/${MY_P}/build/generic
+S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -37,16 +38,18 @@ src_unpack() {
 	epatch "${WORKDIR}"/${PN}-1.1.2-noexec-stack.patch
 	epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
 	epatch "${FILESDIR}"/${P}-ia64-build.patch
-	cd "${S}"
+	cd "${S}"/build/generic
 	eautoreconf
 }
 
 multilib-native_src_compile_internal() {
+	cd "${S}"/build/generic
 	econf $(use_enable altivec)
 	emake || die "emake failed."
 }
 
 multilib-native_src_install_internal() {
+	cd "${S}"/build/generic
 	emake DESTDIR="${D}" install || die "emake install failed."
 
 	dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
diff --git a/media-libs/xvid/xvid-1.2.1.ebuild b/media-libs/xvid/xvid-1.2.1.ebuild
index 644463260..3b33ab63c 100644
--- a/media-libs/xvid/xvid-1.2.1.ebuild
+++ b/media-libs/xvid/xvid-1.2.1.ebuild
@@ -26,13 +26,21 @@ DEPEND="x86? ( ${NASM} )
 	x86-fbsd? ( ${NASM} )"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_PN}/build/generic"
+#S="${WORKDIR}/${MY_PN}/build/generic"
+S="${WORKDIR}/${MY_PN}"
 
 multilib-native_src_configure_internal() {
+	cd "${S}"/build/generic
 	econf $(use_enable altivec)
 }
 
+multilib-native_src_compile_internal() {
+	cd "${S}"/build/generic
+	emake || die "emake failed."
+}
+
 multilib-native_src_install_internal() {
+	cd "${S}"/build/generic
 	emake DESTDIR="${D}" install || die "emake install failed."
 
 	dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a4173f3fc..97e5a6c26 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,9 +2,9 @@ AUX ffmpeg-0.4.9_p20081014-sparc-gcc43.patch 503 RMD160 3b7b0deb5c8ceac2b8ec39c4
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
 DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dceecdb5a1a174 SHA1 97262f1bc663c4bd4fdcb12e8572628174cceae6 SHA256 60af968bdcac2284799a2395d4d9cdcb5319493c91da231992f5f90cd663647a
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
-EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6511 RMD160 461cf10370503e3fcea65e0dc56b80b3f354f3b9 SHA1 6de1fe4c1b6c0f714239257c8abe695f045b82c9 SHA256 cd660416433e187cd2beabe6ac32bd3ffa24aaf62ea4536bd850684baf8e5857
-EBUILD ffmpeg-0.4.9_p20090201.ebuild 6539 RMD160 450867134a6f0f4e2d8547c00534187f2fc80e74 SHA1 ef9550d6d69ef92c641d7e3c9ea1ea892682d055 SHA256 f22cfbf63c6ccbca7bd715dcca834b4263e6a09993a758457662f5c6b897e5f6
-EBUILD ffmpeg-0.5-r1.ebuild 6401 RMD160 6974d6f4d05ba36b05e8da8a760560cabe45fec1 SHA1 dd52a57840b9f5ab48d74b0f39f936354636474d SHA256 3c4999a71475ef85f3f752ba6fed64813ffff880f3b5a3c1325688e558b5e3db
-EBUILD ffmpeg-9999.ebuild 6290 RMD160 d55ec71de92f683ee80ec34f239967718ceabb89 SHA1 a427e4f9490e8d063e671433cc94000bbec6ab0e SHA256 c0d4c262171fc3b79f867e12d5aa08d3a057eb0eba517f670764439f16eb7811
+EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6543 RMD160 466776b70ab962c2d588e68c14298079535a07dd SHA1 f85b8486c7ef83880471cc3706c040fd1e8370ea SHA256 8431ff6e52480dd530f6ba2ebe780a1aea73c51ce2356789de27478944e0cf84
+EBUILD ffmpeg-0.4.9_p20090201.ebuild 6571 RMD160 70987f6ffcb4a05fdfcf2164d58bba2cb2319c84 SHA1 da91d06e4402d7fba9adcfeb5918ad56d1f905d2 SHA256 062c86fbdfe5ae0686ad8740da1e0199d677450dec13747cfeec3c7ee9901437
+EBUILD ffmpeg-0.5-r1.ebuild 6433 RMD160 603fb7875b0f6890646f6f05d0f972a5008a6f49 SHA1 701a820a3b95020b5fae2d3c121ae163278adc6b SHA256 d60adfe6abb70570ac17df5b2d777207ce9b19826b0cdfaf4a5308dc6e51b5f7
+EBUILD ffmpeg-9999.ebuild 6322 RMD160 5f863724c94c912a14bac6391311f611c18d5066 SHA1 df0e33cee33d3ddf83e5a638fb6c8dd359410313 SHA256 794a19f4074db507ccce1914be9e07e15d6828d0e2c8634ad114b876b1571107
 MISC ChangeLog 42299 RMD160 c498d2b1faf4a81b2f563ac6ccf7853dfe1428db SHA1 e2780f17244ddd85643553fb92a60914c7b21bdd SHA256 61a3970a9407afeaa8b2b1486b25d2cfcfa6253a6e569a9ee3f840dd842cf7f9
 MISC metadata.xml 1573 RMD160 befd4c2d30f834fda711f150843aebcc6f027b57 SHA1 a5128622bfb5d2c1bdc44e1542a2a09664516193 SHA256 7c1a4821aa99606ae3c52df66cf3a3fa8d32d94cfc0e07d346b203e6966a1183
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
index de1664c11..ce55b8ccd 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=1
 
+MULTILIB_IN_SOURCE_BUILD="yes"
+
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-native
 
 FFMPEG_SVN_REV="16916"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
index e6f19a04b..c517b8282 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=1
 
+MULTILIB_IN_SOURCE_BUILD="yes"
+
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-native
 
 FFMPEG_SVN_REV="16916"
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index 94d33a196..551bbc6b6 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=1
 
+MULTILIB_IN_SOURCE_BUILD="yes"
+
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-native
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video.
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 7de1b0a74..0ed5e2b31 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=1
 
+MULTILIB_IN_SOURCE_BUILD="yes"
+
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
 
 inherit eutils flag-o-matic multilib toolchain-funcs subversion multilib-native