Version bump. Ebuild improvements by Agostino "ago" Sarubbo close bugs #380577, #383357 & #383649. Remove vulnerable version for security bug #383991.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

5 files changed, 82 insertions, 129 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 0fdec5c356df..31bc00bd503a 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.218 2011/09/04 12:16:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.219 2011/09/22 15:00:05 chainsaw Exp $
+
+*audacious-plugins-3.0.3 (22 Sep 2011)
+
+  22 Sep 2011; Tony Vroon <chainsaw@gentoo.org>
+  -audacious-plugins-3.0.2.ebuild, +audacious-plugins-3.0.3.ebuild,
+  metadata.xml:
+  Version bump. Ebuild improvements by Agostino "ago" Sarubbo close bugs
+  #380577, #383357 & #383649. Remove vulnerable version for security bug
+  #383991.
 
   04 Sep 2011; Markus Meier <maekke@gentoo.org> audacious-plugins-2.5.4.ebuild:
   x86 stable, bug #380575
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f049c6403b8e..172eef72df8a 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
 DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
-DIST audacious-plugins-3.0.2.tar.bz2 2279700 RMD160 8f4505974d2059056fff73b386740a04d20069b1 SHA1 2b083d598f6fca9786854416b24989b948ad8584 SHA256 40d0044cc78dda8202b9226004e28c1953aab8504ecd544f0f880f4f455e3875
+DIST audacious-plugins-3.0.3.tar.bz2 2176767 RMD160 faa39df5bcd13e1134a97355c30422f6259af5e2 SHA1 12807cff9235bde8348d90d2fa9968855850ab36 SHA256 fe4620895b72c0e829b69105ef819c708ceb2c2ceb01b5438a50496dce62772e
+DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
 EBUILD audacious-plugins-2.4.4-r1.ebuild 3531 RMD160 a93df94ec3a230388160482c2969774fd7cddab0 SHA1 7197ed03af5324a3006793b61ae272daeec722de SHA256 cb979f8810e5d741c7e24a750e5072ee8dfbbb95ba151b05f17f63829dfbdb4d
 EBUILD audacious-plugins-2.5.4.ebuild 3489 RMD160 6f3892ca321671e3eb18edaa649e19d655de7f85 SHA1 55b85f6ada0eacfdbdb6dd5e5a31c8360609e2e3 SHA256 a55fb032c6692ceaf3b9f5ac4cdec7d2045b100beb4712897d9219dfed5b278e
-EBUILD audacious-plugins-3.0.2.ebuild 3529 RMD160 3be7c178fe8e2b0510126db579d9e05582fc8cca SHA1 76038188ab8dfbf25d57b6feb15872387edbcd9f SHA256 4e0ff1b09236a9843687875d06ac9860d13bfbe5df38e912bd1343b8e404c2cb
-MISC ChangeLog 45817 RMD160 f53a4315cb8d1dc7a9c1ab71de850db6f3c44866 SHA1 2af04735ef630306046ec802a51c3aa1a621cabf SHA256 8980738faf23d6a621c3b9c24e61fa753e83aa40bed2a52fc373b0f2c8c84b9f
-MISC metadata.xml 793 RMD160 6ed971d5b4c08275c3f0cad7f599431231d6d6e6 SHA1 73ed2881b74c9beaec7c99f8ca5e2f84d1a65b58 SHA256 487034ec4c5105e48198d65eeb4f3ba2600ebdb5d771e557a8d44e6d6a07fb48
+EBUILD audacious-plugins-3.0.3.ebuild 1816 RMD160 148f8e223aa51b7b7273257d122feb62ae70cbbd SHA1 29b2b0e73a49bb9d962749fc5ea30dbce7fdc31b SHA256 f4a5e8324a1cb3d4a331bde87398b3a139f6dc96e61f7d72c47ce0370407f31e
+MISC ChangeLog 46149 RMD160 19211f87a864c7fb22da6ff0737107d03edab8d1 SHA1 c60a99206fc5f36ef56616df45c3870df64cac97 SHA256 17b9da122e08e5636e3f823e63a3ee1c5569ecf8a71594ef157f19b73d06ac3e
+MISC metadata.xml 955 RMD160 e53e44c1dd73d42260dc7fb087f5f49e1714d11f SHA1 2802490d133f9c3e0612d5bf981c7ad5fe1d6150 SHA256 25ef6909662538c10f03d14527dd2211ceb628d69610bbd90bf24984fe646ef8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5jbDsACgkQkKaRLQcq0GIOFACgheSjuHA67spCL/V9lcJHUqk6
-enMAoLOz+/wDi4+ItysGMl5JdTnS2+Ul
-=Vq0V
+iEYEARECAAYFAk57TYAACgkQp5vW4rUFj5ohugCgkxTDWXKWzfxx/1//DBQJ4xDd
+xzsAn069Gwb/ewAklu9bGlju6OlHMQj/
+=uG/V
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild
deleted file mode 100644
index b8d3819614fe..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild,v 1.1 2011/08/24 21:52:16 chainsaw Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	>=media-sound/audacious-3.0.2
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14:2
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3
-		  !media-video/libav )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (  >=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm-1.0 \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.0.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.0.3.ebuild
new file mode 100644
index 000000000000..e7f0da102290
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.0.3.ebuild,v 1.1 2011/09/22 15:00:05 chainsaw Exp $
+
+EAPI=4
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="altivec chardet gtk3 nls session sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	gtk3? ( x11-libs/gtk+:3 ) || ( >=x11-libs/gtk+-2.14:2 )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	chardet? ( app-i18n/libguess )
+	nls? ( dev-util/intltool )"
+
+PDEPEND=">=media-plugins/audacious-plugins-3.0.3"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable altivec) \
+		$(use_enable chardet) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable sse2)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 5247b5ec59dd..881c9a55344b 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -11,8 +11,10 @@
 		support</flag>
 	<flag name='bs2b'>Enable Bauer Bauer stereophonic-to-binaural
 		headphone filter</flag>
+	<flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
 	<flag name='cue'>Support CUE sheets using the libcue library</flag>
 	<flag name='fluidsynth'>Support FluidSynth as MIDI synth backend</flag>
+	<flag name='gtk3'>Build against GTK+ version 3 rather than version 2</flag>
 	<flag name='midi'>Build with amidi-plug (MIDI synth) support</flag>
 	<flag name='scrobbler'>Build with scrobbler/LastFM submission support</flag>
 	<flag name='sid'>Build with SID (Commodore 64 Audio) support</flag>