[gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Date: Sun,  3 Apr 2011 20:03:02 +0000 (UTC)	[thread overview]
Message-ID: <20110403200302.439DC20054@flycatcher.gentoo.org> (raw)

scarabeus    11/04/03 20:03:02

  Modified:             ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
  Log:
  Drop symlink functionality so this can be unmasked again.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 media-video/mplayer2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	3 Apr 2011 12:55:15 -0000	1.9
+++ ChangeLog	3 Apr 2011 20:03:02 -0000	1.10
@@ -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.



1.8                  media-video/mplayer2/mplayer2-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.7&r2=1.8

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer2-9999.ebuild	3 Apr 2011 12:55:15 -0000	1.7
+++ mplayer2-9999.ebuild	3 Apr 2011 20:03:02 -0000	1.8
@@ -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 @@
 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 @@
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
-	symlink? ( !media-video/mplayer )
 "
 
 X_DEPS="
@@ -241,11 +240,11 @@
 	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 @@
 		--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 @@
 		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 @@
 	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 @@
 
 	# 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
 }



1.7                  media-video/mplayer2/mplayer2-2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.6&r2=1.7

Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer2-2.0.ebuild	31 Mar 2011 18:47:37 -0000	1.6
+++ mplayer2-2.0.ebuild	3 Apr 2011 20:03:02 -0000	1.7
@@ -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 @@
 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 @@
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
-	symlink? ( !media-video/mplayer )
 "
 
 X_DEPS="
@@ -241,11 +240,11 @@
 	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 @@
 		--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 @@
 		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 @@
 	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 @@
 
 	# 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
 }

next             reply	other threads:[~2011-04-03 20:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-03 20:03 Tomas Chvatal (scarabeus) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-11-01  1:05 [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild Samuli Suominen (ssuominen)
2011-05-03 14:57 Jeremy Olexa (darkside)
2011-04-04 12:44 Tomas Chvatal (scarabeus)
2011-04-03 22:16 Tomas Chvatal (scarabeus)
2011-04-03 20:46 Tomas Chvatal (scarabeus)
2011-03-31 18:47 Samuli Suominen (ssuominen)
2011-03-29 16:22 Tomas Chvatal (scarabeus)
2011-03-29 14:03 Tomas Chvatal (scarabeus)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110403200302.439DC20054@flycatcher.gentoo.org \
    --to=scarabeus@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox