Update the tarball to use proper versioning. Update the ebuild from multimedia overlay. Add bump script. Thanks to Nikoli for the patches.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

5 files changed, 64 insertions, 17 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 4e075e083379..ce2fb84b825a 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.65 2012/09/02 10:19:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.66 2012/09/03 16:33:52 scarabeus Exp $
+
+*mplayer2-2.0_p20120828 (03 Sep 2012)
+
+  03 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +files/generate-tarball.sh,
+  +mplayer2-2.0_p20120828.ebuild, -mplayer2-2.0_p20120902.ebuild, metadata.xml,
+  mplayer2-9999.ebuild:
+  Update the tarball to use proper versioning. Update the ebuild from multimedia
+  overlay. Add bump script. Thanks to Nikoli for the patches.
 
   02 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   mplayer2-2.0_p20120902.ebuild, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/files/generate-tarball.sh b/media-video/mplayer2/files/generate-tarball.sh
new file mode 100644
index 000000000000..809a670601bc
--- /dev/null
+++ b/media-video/mplayer2/files/generate-tarball.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/files/generate-tarball.sh,v 1.1 2012/09/03 16:33:53 scarabeus Exp $
+
+# Orginal author: Nikoli <nikoli@lavabit.com>
+
+PN="mplayer2"
+
+TMPDIR=$(mktemp -d)
+
+echo "Creating git clone in \"${TMPDIR}\""
+pushd ${TMPDIR} > /dev/null
+
+# src_unpack
+git clone git://git.mplayer2.org/mplayer2.git "${PN}" || exit 1
+pushd "${PN}" > /dev/null
+	P="${PN}-2.0_p$(git log -n1 --date=short --format=%cd|tr -d '-')"
+
+	# Set snapshot version manually
+	echo "$(git describe --match "v[0-9]*" --always)" \
+		> snapshot_version || exit 1
+	find . -name .git\* -exec rm -rf {} \;
+popd > /dev/null
+
+mv "${PN}" "${P}" || exit 1
+tar --owner root --group root -cJpf "${P}.tar.xz" "${P}" || exit 1
+
+popd > /dev/null
+
+mv "${TMPDIR}/${P}.tar.xz" . || exit 1
+echo "Tarball created: \"${P}.tar.xz\""
+
+rm -rf "${TMPDIR}"
diff --git a/media-video/mplayer2/metadata.xml b/media-video/mplayer2/metadata.xml
index 48424de1ee81..1f5d88ced036 100644
--- a/media-video/mplayer2/metadata.xml
+++ b/media-video/mplayer2/metadata.xml
@@ -40,15 +40,16 @@
 	<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
 	<flag name="postproc">Enable image post-processing via libpostproc</flag>
 	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
+	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
 	<flag name="radio">Enable V4L2 radio interface and support</flag>
 	<flag name="rar">Enable Unique RAR File Library</flag>
 	<flag name="real">Adds real audo/video support</flag>
 	<flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
 	<flag name="shm">Enable support for shm</flag>
 	<flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+	<flag name="symlink">Copy all binaries and configuration into locations occupied by <pkg>media-video/mplayer</pkg> and thus act like drop-in replacement.</flag>
 	<flag name="tga">Enables Targa video output</flag>
 	<flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag>
-	<flag name="symlink">Copy all binaries and configuration into locations occupied by <pkg>media-video/mplayer</pkg> and thus act like drop-in replacement.</flag>
-    <flag name="xanim">Enables support for xanim based codecs</flag>
+	<flag name="xanim">Enables support for xanim based codecs</flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index 26ff29258359..c4077ccb4938 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild,v 1.2 2012/09/02 10:19:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.1 2012/09/03 16:33:52 scarabeus Exp $
 
 EAPI=4
 
@@ -30,13 +30,13 @@ SLOT="0"
 if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
 IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
 	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
 	fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
 	+libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
-	portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba
+	portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba
 	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
 	xanim xinerama +xscreensaver +xv xvid"
 IUSE+=" symlink"
@@ -53,12 +53,12 @@ done
 
 # bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	libass? ( truetype )
 	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	dxr3? ( X )
 	ggi? ( X )
+	libass? ( truetype )
 	opengl? ( || ( X aqua ) )
 	radio? ( || ( dvb v4l ) )
 	truetype? ( iconv )
@@ -128,6 +128,7 @@ RDEPEND+="
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
 	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
 	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( media-libs/libquvi )
 	rar? (
 		|| (
 			app-arch/unrar
@@ -250,6 +251,7 @@ src_configure() {
 	use bidi || myconf+=" --disable-fribidi"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
+	use quvi || myconf+=" --disable-libquvi"
 	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
@@ -419,8 +421,8 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	for i in ${CPU_FEATURES}; do
-		myconf+=" $(use_enable ${i/+/})"
+	for i in ${CPU_FEATURES//+/}; do
+		myconf+=" $(use_enable ${i})"
 	done
 
 	use debug && myconf+=" --enable-debug=3"
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 1e45ad1120d3..697a93ca420f 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.44 2012/09/02 10:19:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.45 2012/09/03 16:33:52 scarabeus Exp $
 
 EAPI=4
 
@@ -35,10 +35,10 @@ fi
 IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
 	cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
 	fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-	+libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
-	portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba
-	sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
-	xanim xinerama +xscreensaver +xv xvid"
+	+libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png
+	pnm portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real
+	+rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis
+	win32codecs +X xanim xinerama +xscreensaver +xv xvid"
 IUSE+=" symlink"
 
 CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
@@ -53,12 +53,12 @@ done
 
 # bindist does not cope with win32codecs, which are nonfree
 REQUIRED_USE="
-	libass? ( truetype )
 	bindist? ( !win32codecs )
 	cddb? ( cdio network )
 	dvdnav? ( dvd )
 	dxr3? ( X )
 	ggi? ( X )
+	libass? ( truetype )
 	opengl? ( || ( X aqua ) )
 	radio? ( || ( dvb v4l ) )
 	truetype? ( iconv )
@@ -128,6 +128,7 @@ RDEPEND+="
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
 	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
 	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( media-libs/libquvi )
 	rar? (
 		|| (
 			app-arch/unrar
@@ -250,6 +251,7 @@ src_configure() {
 	use bidi || myconf+=" --disable-fribidi"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
+	use quvi || myconf+=" --disable-libquvi"
 	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
@@ -419,8 +421,8 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	for i in ${CPU_FEATURES}; do
-		myconf+=" $(use_enable ${i/+/})"
+	for i in ${CPU_FEATURES//+/}; do
+		myconf+=" $(use_enable ${i})"
 	done
 
 	use debug && myconf+=" --enable-debug=3"