mplayer: full sync with portage tree

3 files changed, 30 insertions, 46 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 1646807..eef3f46 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -6,6 +6,11 @@
 # Advanced overlay ebuild is meant to be in sync with portage one,
 # provide additional features and eventually send some of them upstream.
 
+  23 Sep 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
+  Fully synced with portage tree.
+  Remove hooks for non-live ebuilds: they will not be supported
+  anyway.
+
   22 Sep 2012; Andrew Savchenko <bircoph@gmail.com>
   -files/mplayer-x86-sse2.patch, files/mplayer-live555.patch,
   mplayer-9999.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 50570ad..bf012eb 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,6 +3,6 @@ AUX mplayer-vesa.patch 1096 SHA256 b8b501493c5ea6548c9c2d23697098155d090fe0315c7
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
-EBUILD mplayer-9999.ebuild 18805 SHA256 9b9d499150c12847fa0e34666a3a8e388cb966c07fa4a897d233808b6d18d636 SHA512 8c9c4f7736eddf5c419be415c5f32ee8d86ee9cc5e43cf5e53fcfda8a664a8fb0644d0b6a8ceff158b454bfd1f1bc7571f59865d0effc0f763685fc9c1fc2634 WHIRLPOOL 28fbc6a09aa43b05bd59b260d1bca73643d92537d84725b0b2108d30cbdb77ddce26ae357a9d551505c65067b8df01f6aa2809d904493fb6b5360bb06f57ad42
-MISC ChangeLog 5800 SHA256 4efad15d362367dea7498b4d7bf091fbab8c55df8dbe29bf2be274f5fbc1ef01 SHA512 baa6b638aa5ed455622339bda630c14e791fc6e7db55c18e174803623a24d7ef9b59289e7a9e005ab0f6a1b0b5b7d73d3bd577963c2a699fa036e4c1d887c770 WHIRLPOOL 15655a5909143b520ed4958b2b264d28682ec85aaf2213ea89fd5941390ae451a382ec47cc73be2a3a2cf3b8a67ad5aaa5d3fc0b91227a838174a92861431c29
+EBUILD mplayer-9999.ebuild 18150 SHA256 bcff60ac3916e297364a2605983313db6efd5a7bc5e70444ec239340312f89be SHA512 b9a57f234dc87e85bb576f87ac48c761b0c5e9456361c8716979f4d8e118b658cea5f22824f8ae63dfbde2e8369135e7d9e56d35228d06f291ffe234d66c12b1 WHIRLPOOL e64cb19f53289ac578c461cde57d58a71617fd456a6ab7d892e72252bf976e9dd245566c2aab6cacd1b560c0a2cf43386ef7329d16d6551a6ee863d48760790d
+MISC ChangeLog 5982 SHA256 d28207eef851e2e113f8716357d8018bfc722c0a1b88812c8bd874b4eb2bf5be SHA512 59d4d3f7ec656d9426cbdebf1e5ae0371e0a4e7189fe8bee534982cb6210ad4018f9e5bd0b041654da5f1afc50eabca2a1e02ded24ddfce1b7b988acb48d18fa WHIRLPOOL e27aeebe11cf155b712cbb10cb838e0d1613dcd65dfa0e1d7d302c29d5a994217adf13b306e6a7ba6ad3bd3c206ba9640605036c43690676e229483724a7c675
 MISC metadata.xml 4048 SHA256 85f2e9d3c7eb8ef1465184d7ebf952af289a9c848b6a68c506504354e4550625 SHA512 86f654b98dbd2cf9ab97181b18292fb598034734e4682a7c466b07ebdb44c192fce6b584495422e77098a62445ff565d062b754b51c1aad8be0d1c7b654e4f43 WHIRLPOOL 406bf8d3010fcfa2543d0094a24ee2c63cc2d71ffdc6e9c39df612faa24f264097d4af8e9df5341224e241de953c44a18d7c8d87ab7e5becf2e9570a2426337d
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 0f66562..97c5f5b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -5,12 +5,8 @@
 EAPI=4
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
 
-inherit base eutils flag-o-matic multilib toolchain-funcs ${SVN_ECLASS}
-
-# BUMP ME PLZ, NO COOKIES OTHERWISE
-[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r32598
+inherit base eutils flag-o-matic git-2 multilib subversion toolchain-funcs ${SVN_ECLASS}
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec amr aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga +dirac
@@ -36,13 +32,7 @@ FONT_URI="
 	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
 "
-if [[ ${PV} == *9999* ]]; then
-	RELEASE_URI=""
-else
-	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )"
+SRC_URI="!truetype? ( ${FONT_URI} )"
 
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
@@ -170,11 +160,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
-	KEYWORDS=""
-fi
+KEYWORDS=""
 
 # bindist does not cope with amr codecs (#299405#c6), faac codecs are nonfree, win32codecs are nonfree
 # libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
@@ -203,22 +189,26 @@ for x in ${uses}; do
 	"
 done
 # xorg options require X useflag enabled
-uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv xvmc"
+uses="dga dxr3 ggi vdpau vidix xinerama xscreensaver xv"
 for x in ${uses}; do
 	REQUIRED_USE+="
 		${x}? ( X )
 	"
 done
+uses="opengl osdmenu"
+for x in ${uses}; do
+	REQUIRED_USE+="
+		${x}? ( || ( X aqua ) )
+	"
+done
 unset uses
 
 pkg_setup() {
-	if [[ ${PV} == *9999* ]]; then
-		elog
-		elog "This is a live ebuild which installs the latest from upstream's"
-		elog "subversion repository, and is unsupported by Gentoo."
-		elog "Everything but bugs in the ebuild itself will be ignored."
-		elog
-	fi
+	elog
+	elog "This is a live ebuild which installs the latest from upstream's"
+	elog "subversion repository, and is unsupported by Gentoo."
+	elog "Everything but bugs in the ebuild itself will be ignored."
+	elog
 
 	if use cpudetection; then
 		ewarn
@@ -234,14 +224,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-		cd "${WORKDIR}"
-		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
-	else
-		unpack ${A}
-	fi
+	subversion_src_unpack
+	cd "${WORKDIR}"
+	rm -rf "${WORKDIR}/${P}/ffmpeg/"
+	( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
 
 	if ! use truetype; then
 		unpack font-arial-iso-8859-1.tar.bz2 \
@@ -251,14 +237,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die
-	else
-		# Set version #
-		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
-	fi
+	# Set SVN version manually
+	subversion_wc_info
+	sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die
 
 	# fix path to bash executable in configure scripts
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
@@ -540,9 +521,7 @@ src_configure() {
 	###################
 	# External FFmpeg #
 	###################
-	if [[ ${PV} == *9999* ]]; then
-		use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
-	fi
+	use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
 
 	tc-export PKG_CONFIG
 	./configure \