only use amd64codecs if we're not distributing the build

Package-Manager: portage-2.1.2-r9

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f734f09ee7ec9336fb560f91755112e35e5394b7..28734a7bfd469dcf241d3cf232a5e9276c8cf50a 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.460 2007/02/16 12:13:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.461 2007/02/17 14:16:40 blubb Exp $
+
+  17 Feb 2007; Simon Stelling <blubb@gentoo.org> mplayer-1.0_rc1-r2.ebuild:
+  only use amd64codecs if we're not distributing the build
 
   16 Feb 2007; Simon Stelling <blubb@gentoo.org> mplayer-1.0_rc1-r2.ebuild:
   depend on >=portage-2.1.2 to make sure the assembler USE flags are unmasked

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1b09d7a82c6679023d944c43f990fc396504b1a4..b2bc47a055d5ab56a46750ba1bec0b95d23f4876 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -36,18 +36,18 @@ EBUILD mplayer-1.0_rc1-r1.ebuild 16371 RMD160 56b3bded2bd3befc12217e10f720657916
 MD5 382390159d7046d162b6efb9e7ee86dc mplayer-1.0_rc1-r1.ebuild 16371
 RMD160 56b3bded2bd3befc12217e10f7206579164d8530 mplayer-1.0_rc1-r1.ebuild 16371
 SHA256 ee82ada04b8833d922c7b2f5d9dec44e079405f2f3cc1c8f27451a12c82e384b mplayer-1.0_rc1-r1.ebuild 16371
-EBUILD mplayer-1.0_rc1-r2.ebuild 16303 RMD160 934641992641076c81c8edca8282ba756970d952 SHA1 f8b6feb0fb3e3be1a5a6f4793ad518eb31f24500 SHA256 c8f9181155333fe547d69282dc2ced5f600bd828b9cad211772a96db8ab5d87e
-MD5 28d03944ace069bda71733202a39341b mplayer-1.0_rc1-r2.ebuild 16303
-RMD160 934641992641076c81c8edca8282ba756970d952 mplayer-1.0_rc1-r2.ebuild 16303
-SHA256 c8f9181155333fe547d69282dc2ced5f600bd828b9cad211772a96db8ab5d87e mplayer-1.0_rc1-r2.ebuild 16303
+EBUILD mplayer-1.0_rc1-r2.ebuild 16352 RMD160 57f141c7024127ef5b8f6f8cccf42048b8af0495 SHA1 9445b50c292914115b37e50824a0bbef5a9b3795 SHA256 76e51ecdbc5f226c539a5c6badf1267c615084779bd555ccb9da07c9fafa2e88
+MD5 03d03c34d77877d5e6cc3f4a26f1c204 mplayer-1.0_rc1-r2.ebuild 16352
+RMD160 57f141c7024127ef5b8f6f8cccf42048b8af0495 mplayer-1.0_rc1-r2.ebuild 16352
+SHA256 76e51ecdbc5f226c539a5c6badf1267c615084779bd555ccb9da07c9fafa2e88 mplayer-1.0_rc1-r2.ebuild 16352
 EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 SHA1 82326953105606b7b802c45e3473303dd05e1508 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
-MISC ChangeLog 81893 RMD160 83f21b68ee37a40c3dc581249e8bc2a3019f83fa SHA1 1c001e8900055c84119f10ff4d76a92f84f785b9 SHA256 27dea5e60898a9bfe131596fde1b70b6513c7cf21b00a0d84d6f21caf8b3c308
-MD5 a51904701072f31bca238b97d2b816f1 ChangeLog 81893
-RMD160 83f21b68ee37a40c3dc581249e8bc2a3019f83fa ChangeLog 81893
-SHA256 27dea5e60898a9bfe131596fde1b70b6513c7cf21b00a0d84d6f21caf8b3c308 ChangeLog 81893
+MISC ChangeLog 82029 RMD160 39827339c26fcf857c2b4eb8dbb2617e39895b15 SHA1 3711d15bb42dc3d5357cc3c6a33505a431481979 SHA256 dff3da180c9973ceab08e873f913f1ef70fcfa3a0cb36101d488c516e6d0f1fd
+MD5 5b1b94064e1424c1e81771c42a020074 ChangeLog 82029
+RMD160 39827339c26fcf857c2b4eb8dbb2617e39895b15 ChangeLog 82029
+SHA256 dff3da180c9973ceab08e873f913f1ef70fcfa3a0cb36101d488c516e6d0f1fd ChangeLog 82029
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223

diff --git a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
index 1fec6e61291b76a261d09c5e1d532d81b17ff826..f78d5575a04bca24b14020492e65a9d9229e6465 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild,v 1.11 2007/02/16 12:13:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild,v 1.12 2007/02/17 14:16:40 blubb Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 RESTRICT="nostrip"
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
@@ -48,7 +48,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
                !livecd? (
                        !bindist? ( >=media-libs/win32codecs-20040916 ) ) )
        x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
-       amd64? ( real? ( media-libs/amd64codecs ) )
+       amd64? ( real? ( !bindist? ( media-libs/amd64codecs ) ) )
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
        arts? ( kde-base/arts )
@@ -133,8 +133,8 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 pkg_setup() {
        if use real && use x86; then
                REALLIBDIR="/opt/RealPlayer/codecs"
-       elif use real && use amd64; then
-               REALLIBDIR="/usr/lib64/codecs"
+       elif use real && use amd64 && ! use bindist ; then
+               REALLIBDIR="/usr/$(get_libdir)/codecs"
        fi
 
        if use truetype && ! use iconv ; then