diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2007-02-17 14:16:40 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2007-02-17 14:16:40 +0000 |
| commit | e873ef7f408103ee5cac557a3e6a33a5f2e3d795 (patch) | |
| tree | 7eb66f0d9ccbcf56f68b75e7dc5cb86363134794 /media-video/mplayer | |
| parent | Version bump (diff) | |
| download | gentoo-2-e873ef7f408103ee5cac557a3e6a33a5f2e3d795.tar.gz gentoo-2-e873ef7f408103ee5cac557a3e6a33a5f2e3d795.tar.bz2 gentoo-2-e873ef7f408103ee5cac557a3e6a33a5f2e3d795.zip | |
only use amd64codecs if we're not distributing the build
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_rc1-r2.ebuild | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index f734f09ee7ec..28734a7bfd46 100644 --- 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/mplayer-1.0_rc1-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild index 1fec6e61291b..f78d5575a04b 100644 --- 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 |