Drop symlink functionality so this can be unmasked again.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 43 insertions, 57 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index ecd05a94749a..4737fee3357f 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.9 2011/04/03 12:55:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.10 2011/04/03 20:03:02 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+  mplayer2-9999.ebuild:
+  Drop symlink functionality so this can be unmasked again.
 
   03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
   Internal mp3lib was dropped.
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 84e12e0c270e..8f194c163eca 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -5,14 +5,14 @@ DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910
-EBUILD mplayer2-2.0.ebuild 17830 RMD160 780ed2da39f6c8a612015f466e1bbb50b1110145 SHA1 56ec003d2fce7fb558f8057ac0c91e88f785568f SHA256 72061c5a88ce183eaf535713c71dbe7631bb40d257ad7deb33b58d643665e36a
-EBUILD mplayer2-9999.ebuild 17780 RMD160 3af72c355147c4cf91e8cb1c474ab172040035d9 SHA1 6cc4b6795fabdfa7fe8874d8ccec33f21d58f64a SHA256 0a95ecdac63667c622b6785ca8546ce2e93b6989304b6292ed70205abe973eac
-MISC ChangeLog 4915 RMD160 ee2747ab56adc5c400e5e02b7a1dc401476025d7 SHA1 63af87d72ebccda636b1060bad8b68af785ff8e5 SHA256 380763d80c4bfc92b27aad8b7b9c795ababac6905f0e4303404fb9abf9792062
+EBUILD mplayer2-2.0.ebuild 17429 RMD160 c160a95b4982f80ac9ca81930e2ca112b3e53329 SHA1 f3ab8c217a0386aa6060c6e39f562f045c32d92f SHA256 acdcde35195a721ebf535ea2db571285c79f03e99f8ee6bf397d56a273bc6675
+EBUILD mplayer2-9999.ebuild 17379 RMD160 f097ecc864080cf7bc4565496f73f50d0986d267 SHA1 08dfee8e8fe6247553420452ddc74c672e343e33 SHA256 b03197f18a9a2be7bd326836f3e33abd164e9c71fe0a5db90e0d75f8a6db91c8
+MISC ChangeLog 5077 RMD160 36b0805e609e47c3edd54db2a4eada7c7c1c517a SHA1 174f04d59c323a2fca1961d8453bcc2a5a3b9355 SHA256 8427431fd026937eeec76b075ae523de342b730f2577373e9e0353cb8c873ca8
 MISC metadata.xml 3524 RMD160 f38004354cad62e00187ba86fc8631e32c66c758 SHA1 d8427eb2677ee960721f4978b25547c27a76b88c SHA256 19101cf058d0e18b088f2ad258b082d946db339d817d8e9956c6bb55388029e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2YbjkACgkQHB6c3gNBRYd6/QCcCAAL6GC9NdWeZBgc+e+iLn/8
-09QAn38bsNDqJFBQJfhBgo2j5va837Iy
-=JUx3
+iEYEARECAAYFAk2Y0TcACgkQHB6c3gNBRYeRrwCgq3dqiadoWkCRZtGAD+kxAs6S
+b0YAn3VImR5+Jc1Gsv9Vx0PQBQw9N4eC
+=F6hB
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild
index 19a9907c6e89..8d52cab2e14e 100644
--- a/media-video/mplayer2/mplayer2-2.0.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.6 2011/03/31 18:47:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.7 2011/04/03 20:03:02 scarabeus Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
 ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
 libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
 +network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
+radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
 tga +theora +truetype +unicode v4l v4l2 vdpau
 +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
 
@@ -125,7 +125,6 @@ RDEPEND+="
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
-	symlink? ( !media-video/mplayer )
 "
 
 X_DEPS="
@@ -241,11 +240,11 @@ src_prepare() {
 	if [[ -n ${namesuf} ]]; then
 		sed -e "/elif linux ; then/a\  _exesuf=\"${namesuf}\"" \
 			-i configure || die
-		sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\	mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \
-			-e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\	mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/mplayer${namesuf}.1" \
+		sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\	mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/${PN}.1" \
+			-e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\	mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/${PN}.1" \
 			-e "s/er.1/er${namesuf}.1/g" \
 			-i Makefile || die
-		sed -e "s/mplayer/mplayer${namesuf}/" \
+		sed -e "s/mplayer/${PN}/" \
 			-i TOOLS/midentify.sh || die
 	fi
 
@@ -567,8 +566,8 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--confdir="${EPREFIX}"/etc/mplayer${namesuf} \
-		--datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \
+		--confdir="${EPREFIX}"/etc/${PN} \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--mandir="${EPREFIX}"/usr/share/man \
 		--localedir="${EPREFIX}"/usr/share/locale \
 		--enable-translation \
@@ -584,7 +583,7 @@ src_compile() {
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
-			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]; then
 			emake -j1 -C DOCS/xml html-chunked
@@ -621,31 +620,29 @@ src_install() {
 	fi
 
 	if ! use ass && ! use truetype; then
-		dodir /usr/share/mplayer${namesuf}/fonts
+		dodir /usr/share/${PN}/fonts
 		# Do this generic, as the mplayer people like to change the structure
 		# of their zips ...
 		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
 			cp -pPR "${i}" "${ED}/usr/share/mplayer${namesuf}/fonts"
 		done
 		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer${namesuf}/font"
+		rm -rf "${ED}/usr/share/${PN}/font"
 		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font
 	fi
 
-	insinto /etc/mplayer${namesuf}
+	insinto /etc/${PN}
 	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 # Config options can be section specific, global
 # options should go in the default section
 [default]
 _EOF_
 	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
+	use osdmenu && doins "${S}/etc/menu.conf"
 
 	if use ass || use truetype; then
-		cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4
 subfont-text-scale=3
@@ -659,17 +656,11 @@ _EOF_
 
 	# bug 256203
 	if use rar; then
-		cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 unrarexec=${EPREFIX}/usr/bin/unrar
 _EOF_
 	fi
-	dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf
+	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
 
 	newbin "${S}/TOOLS/midentify.sh" midentify${namesuf}
-
-	if [[ -n ${namesuf} ]] && use symlink; then
-		dosym /etc/mplayer${namesuf} /etc/mplayer
-		dosym "mplayer${namesuf}" /usr/bin/mplayer
-		dosym "midentify${namesuf}" /usr/bin/midentify
-	fi
 }
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index b54207c895e8..0aeab231b575 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.7 2011/04/03 12:55:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.8 2011/04/03 20:03:02 scarabeus Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
 ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
 libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
 +network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
+radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
 tga +theora +truetype +unicode v4l v4l2 vdpau
 +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
 
@@ -125,7 +125,6 @@ RDEPEND+="
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
-	symlink? ( !media-video/mplayer )
 "
 
 X_DEPS="
@@ -241,11 +240,11 @@ src_prepare() {
 	if [[ -n ${namesuf} ]]; then
 		sed -e "/elif linux ; then/a\  _exesuf=\"${namesuf}\"" \
 			-i configure || die
-		sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\	mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \
-			-e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\	mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/mplayer${namesuf}.1" \
+		sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\	mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/${PN}.1" \
+			-e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\	mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/${PN}.1" \
 			-e "s/er.1/er${namesuf}.1/g" \
 			-i Makefile || die
-		sed -e "s/mplayer/mplayer${namesuf}/" \
+		sed -e "s/mplayer/${PN}/" \
 			-i TOOLS/midentify.sh || die
 	fi
 
@@ -566,8 +565,8 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--confdir="${EPREFIX}"/etc/mplayer${namesuf} \
-		--datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \
+		--confdir="${EPREFIX}"/etc/${PN} \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--mandir="${EPREFIX}"/usr/share/man \
 		--localedir="${EPREFIX}"/usr/share/locale \
 		--enable-translation \
@@ -583,7 +582,7 @@ src_compile() {
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
-			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]; then
 			emake -j1 -C DOCS/xml html-chunked
@@ -620,31 +619,29 @@ src_install() {
 	fi
 
 	if ! use ass && ! use truetype; then
-		dodir /usr/share/mplayer${namesuf}/fonts
+		dodir /usr/share/${PN}/fonts
 		# Do this generic, as the mplayer people like to change the structure
 		# of their zips ...
 		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
 			cp -pPR "${i}" "${ED}/usr/share/mplayer${namesuf}/fonts"
 		done
 		# Fix the font symlink ...
-		rm -rf "${ED}/usr/share/mplayer${namesuf}/font"
+		rm -rf "${ED}/usr/share/${PN}/font"
 		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font
 	fi
 
-	insinto /etc/mplayer${namesuf}
+	insinto /etc/${PN}
 	newins "${S}/etc/example.conf" mplayer.conf
-	cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+	cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 # Config options can be section specific, global
 # options should go in the default section
 [default]
 _EOF_
 	doins "${S}/etc/input.conf"
-	if use osdmenu; then
-		doins "${S}/etc/menu.conf"
-	fi
+	use osdmenu && doins "${S}/etc/menu.conf"
 
 	if use ass || use truetype; then
-		cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4
 subfont-text-scale=3
@@ -658,17 +655,11 @@ _EOF_
 
 	# bug 256203
 	if use rar; then
-		cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 unrarexec=${EPREFIX}/usr/bin/unrar
 _EOF_
 	fi
-	dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf
+	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
 
 	newbin "${S}/TOOLS/midentify.sh" midentify${namesuf}
-
-	if [[ -n ${namesuf} ]] && use symlink; then
-		dosym /etc/mplayer${namesuf} /etc/mplayer
-		dosym "mplayer${namesuf}" /usr/bin/mplayer
-		dosym "midentify${namesuf}" /usr/bin/midentify
-	fi
 }