Raise libsidplay depend to -r2 of 2.1.1 because that's where we started building shared library out of libresid-builder.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 11 insertions, 137 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 31edac089568..54ecc84c0915 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.119 2009/06/18 11:27:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.120 2009/06/18 11:57:04 ssuominen Exp $
+
+  18 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -audacious-plugins-2.1_alpha1.ebuild,
+  audacious-plugins-2.1_alpha1-r1.ebuild:
+  Raise libsidplay depend to -r2 of 2.1.1 because that's where we started
+  building shared library out of libresid-builder.
 
   17 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   audacious-plugins-2.0.1.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index c3197beae669..641d09239dd9 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
 AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
@@ -10,14 +7,6 @@ DIST audacious-plugins-2.0.1.tgz 3505273 RMD160 61c8528f6a2440dbc433aff5ae6849d7
 DIST audacious-plugins-2.1-alpha1.tgz 3485851 RMD160 a0532804463fbbd15c4eb267f5a8abe870310428 SHA1 0749cd608c82dafdc9e781dfe9637e3c51552354 SHA256 c96c281e6b1deed010dd5c6920202c9c8725bde2a27634f452ebf6854f794dbc
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
 EBUILD audacious-plugins-2.0.1.ebuild 3311 RMD160 ce409ff96140ce931153489663523b25945eaa68 SHA1 666919331d0589446a4a41d1becd9ed590647fcd SHA256 91ad5b72808ceace07e0d1a8a31e88457f9ca00aa27b371f3b2c4caf866e85e4
-EBUILD audacious-plugins-2.1_alpha1-r1.ebuild 3509 RMD160 9bfb0970bf1543a237828fe7a5ba05bff66a5ee6 SHA1 ff5175f041cf1e67b2c0483fda0cc9e1670a894f SHA256 d0162ee654920b79bf0c41a838857f2c3e05e8dc4dd569d7961daca37a2fbab8
-EBUILD audacious-plugins-2.1_alpha1.ebuild 3411 RMD160 593fa1abd50788f138a5f7f3767f7d08b4d0fcb3 SHA1 2c5e545cea989cbcba48899a1eddb6fb7137d5d3 SHA256 8dd8c25c768f0f582423d1bc0c5879e0984a1f11713ff63bcb1e19775cfe76e6
-MISC ChangeLog 25125 RMD160 40ba83e322c00e0552795c8e9be2b68351899f92 SHA1 07db959372aaa441e9f4b0bcf15ab44faca97eb1 SHA256 2d01321d1b6187e0e1d22f43e21eadefb0b68e385a5be8bb4c07db58e0789acc
+EBUILD audacious-plugins-2.1_alpha1-r1.ebuild 3521 RMD160 9df3a69f20349bd6deced7897287a345bbf7fe3d SHA1 608ce8964ef5bac15e6d4f7d307e4b4ff6e2d49b SHA256 47a75cf5801261fb974ac536d27002384b4fa34bec06ce304c0f8d5d5093919e
+MISC ChangeLog 25388 RMD160 36b8e1a460b5cde772e008534888bd8e2a4501af SHA1 88641a7d9fb3be29b2e0ae13a616e60cd69b2554 SHA256 91b6009734cc2726652aa30c76f2ad10e609bf43c25c9e35b2b5c0375390c254
 MISC metadata.xml 995 RMD160 4f335ce5ec797fde2d14288575e8ebe8359c15aa SHA1 2037d8e8601216cf05ff8218ec13ac90d39bd5cb SHA256 5d24a7ec85edfd9a1156b2b3d6745fe125dbef85a26a8f7e7989de862513b0fa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko6JIMACgkQp5vW4rUFj5ovDACfR7/2vU0AqPO94etGdtTn1Btg
-x/AAoJ/6u9wfjYbbcidgwr8CPWRKM/AW
-=+84L
------END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild
index 8420ac045359..61f12b472719 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild,v 1.1 2009/06/17 20:35:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild,v 1.2 2009/06/18 11:57:04 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,7 +41,7 @@ RDEPEND="app-arch/unzip
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
 	scrobbler? ( net-misc/curl )
 	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( media-libs/libsidplay )
+	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	timidity? ( media-sound/timidity++ )
 	tta? ( media-libs/libid3tag )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1.ebuild
deleted file mode 100644
index c4c9adaf0830..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1.ebuild,v 1.1 2009/06/16 14:04:09 chainsaw Exp $
-
-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}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adplug alsa bs2b cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
-nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.1_alpha1
-	>=net-misc/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdaudio? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	musepack? ( media-libs/libmpcdec media-libs/taglib )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( media-libs/libsidplay )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	timidity? ( media-sound/timidity++ )
-	tta? ( media-libs/libid3tag )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.41.0 )
-	wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! useq mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	# This is masked in the portage tree, so I'll save you the
-	# popup. Be good, bugs go upstream and we like patches.
-	append-flags -DNOT_ALPHA_RELEASE
-
-	mp3_warning
-
-	econf \
-		--enable-aac \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-coreaudio \
-		--disable-dockalbumart \
-		--disable-projectm \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable adplug) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable bs2b) \
-		$(use_enable cdaudio) \
-		$(use_enable esd) \
-		$(use_enable flac flacng) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable musepack) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable timidity) \
-		$(use_enable tta) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wma) \
-		$(use_enable wma mms) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-}