Version bump and remove old versions, #202960

(Portage version: 2.1.3_rc8)

6 files changed, 32 insertions, 84 deletions

diff --git a/media-libs/swfdec/ChangeLog b/media-libs/swfdec/ChangeLog
index 0814abdd7089..8dfcb12ca714 100644
--- a/media-libs/swfdec/ChangeLog
+++ b/media-libs/swfdec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/swfdec
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.23 2007/12/16 18:46:20 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.24 2007/12/22 10:21:29 pclouds Exp $
+
+*swfdec-0.5.5 (22 Dec 2007)
+
+  22 Dec 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  -swfdec-0.5.3.ebuild, -swfdec-0.5.4.ebuild, +swfdec-0.5.5.ebuild:
+  Version bump and remove old versions, #202960
 
 *swfdec-0.5.4-r1 (16 Dec 2007)
 
diff --git a/media-libs/swfdec/files/digest-swfdec-0.5.3 b/media-libs/swfdec/files/digest-swfdec-0.5.3
deleted file mode 100644
index 01a2562d438f..000000000000
--- a/media-libs/swfdec/files/digest-swfdec-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bbabc83acad340479bae5dd125c40fc7 swfdec-0.5.3.tar.gz 1502458
-RMD160 1e9985cebad635a71b01e2537c2ac8ae0d89ca2b swfdec-0.5.3.tar.gz 1502458
-SHA256 ec50bcb06037397d78ff9fef3193664f5431ad8aad9e602f993ddbffb0ed7feb swfdec-0.5.3.tar.gz 1502458
diff --git a/media-libs/swfdec/files/digest-swfdec-0.5.4 b/media-libs/swfdec/files/digest-swfdec-0.5.4
deleted file mode 100644
index 22fd4291e326..000000000000
--- a/media-libs/swfdec/files/digest-swfdec-0.5.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 506b032204b71ffac7d0424eaf9608c4 swfdec-0.5.4.tar.gz 6857084
-RMD160 11c7bbcee4bffa2e826a6d48e28cb4ba09749f29 swfdec-0.5.4.tar.gz 6857084
-SHA256 b43256d55896d7def5a5d403f0533e0937c511eb32bcca97cb26d228f2e0c94e swfdec-0.5.4.tar.gz 6857084
diff --git a/media-libs/swfdec/files/digest-swfdec-0.5.5 b/media-libs/swfdec/files/digest-swfdec-0.5.5
new file mode 100644
index 000000000000..5d3ecd26770e
--- /dev/null
+++ b/media-libs/swfdec/files/digest-swfdec-0.5.5
@@ -0,0 +1,3 @@
+MD5 b988b014e210cee205aeccaca4d6a9a7 swfdec-0.5.5.tar.gz 8667844
+RMD160 4082c07019fcaf733de9eb23d9cf30fef29b337d swfdec-0.5.5.tar.gz 8667844
+SHA256 30b6f4f0ec424b60c91f8db272068f51cb3df204f6a65f155308389981bb99a6 swfdec-0.5.5.tar.gz 8667844
diff --git a/media-libs/swfdec/swfdec-0.5.4.ebuild b/media-libs/swfdec/swfdec-0.5.4.ebuild
deleted file mode 100644
index 14f33f020c01..000000000000
--- a/media-libs/swfdec/swfdec-0.5.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.5.4.ebuild,v 1.1 2007/11/24 18:12:00 pclouds Exp $
-
-inherit eutils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Macromedia Flash decoding library"
-HOMEPAGE="http://swfdec.freedesktop.org"
-SRC_URI="http://swfdec.freedesktop.org/download/${PN}/${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="ffmpeg gstreamer gnome mad oss"
-
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/glib-2.10
-	>=dev-libs/liboil-0.3.10-r1
-	x11-libs/pango
-	net-libs/libsoup
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.8.0
-	>=media-libs/alsa-lib-1.0.12
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070330 )
-	mad? ( >=media-libs/libmad-0.15.1b )
-	gstreamer? ( >=media-libs/gstreamer-0.10.11 )
-	gnome? ( gnome-base/gnome-vfs )
-	!<=net-www/swfdec-mozilla-0.5.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use ppc && use ffmpeg ; then
-		eerror "swfdec doesn't work with latest ffmpeg version in"
-		eerror "ppc arch. See bug #11841 in Freedesktop Bugzilla."
-		eerror "Please disable ffmpeg flag and enable gstreamer"
-		die "Depends failed"
-	fi
-	if use !gnome ; then
-		ewarn "In order to compile libswfdec-gtk with Gnome-VFS"
-		ewarn "support you must have 'gnome' USE flag enabled"
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	#--with-audio=[auto/alsa/oss/none]
-	use oss && myconf=" --with-audio=oss"
-
-	econf \
-		$(use_enable gstreamer) \
-		$(use_enable ffmpeg) \
-		$(use_enable mad) \
-		$(use_enable gnome gnome-vfs) \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-libs/swfdec/swfdec-0.5.3.ebuild b/media-libs/swfdec/swfdec-0.5.5.ebuild
index bc741e09f8ef..0e4f8b048780 100644
--- a/media-libs/swfdec/swfdec-0.5.3.ebuild
+++ b/media-libs/swfdec/swfdec-0.5.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.5.3.ebuild,v 1.1 2007/10/20 10:45:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.5.5.ebuild,v 1.1 2007/12/22 10:21:29 pclouds Exp $
 
-inherit eutils versionator
+inherit eutils versionator confutils
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Macromedia Flash decoding library"
@@ -13,14 +13,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="ffmpeg gstreamer gnome mad oss"
+IUSE="ffmpeg gstreamer gnome mad oss alsa pulseaudio soup"
 
 RESTRICT="test"
 
-RDEPEND=">=dev-libs/glib-2.10
-	>=dev-libs/liboil-0.3.10-r1
-	x11-libs/pango
-	net-libs/libsoup
+RDEPEND=">=dev-libs/glib-2.12
+	>=dev-libs/liboil-0.3.1
+	>=x11-libs/pango-1.16.4
+	soup? ( >=net-libs/libsoup-2.2.0 )
 	>=x11-libs/cairo-1.2
 	>=x11-libs/gtk+-2.8.0
 	>=media-libs/alsa-lib-1.0.12
@@ -28,7 +28,8 @@ RDEPEND=">=dev-libs/glib-2.10
 	mad? ( >=media-libs/libmad-0.15.1b )
 	gstreamer? ( >=media-libs/gstreamer-0.10.11 )
 	gnome? ( gnome-base/gnome-vfs )
-	!<=net-www/swfdec-mozilla-0.5.2"
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	pulseaudio? ( media-sound/pulseaudio )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -44,19 +45,31 @@ pkg_setup() {
 		ewarn "In order to compile libswfdec-gtk with Gnome-VFS"
 		ewarn "support you must have 'gnome' USE flag enabled"
 	fi
+	if use !soup ; then
+		ewarn "swfdec will be built without HTTP protocol support"
+		ewarn "so you won't be able to use swfdec-mozilla, please"
+		ewarn "add 'soup' to your USE flags"
+	fi
+	confutils_use_conflict oss alsa pulseaudio
 }
 
 src_compile() {
 	local myconf
+	local myaudio
 
 	#--with-audio=[auto/alsa/oss/none]
-	use oss && myconf=" --with-audio=oss"
+	myaudio="none"
+	use oss && myaudio="oss"
+	use pulseaudio && myaudio="pa"
+	use alsa && myaudio="alsa"
+	myconf=" --with-audio=$myaudio"
 
 	econf \
 		$(use_enable gstreamer) \
 		$(use_enable ffmpeg) \
 		$(use_enable mad) \
 		$(use_enable gnome gnome-vfs) \
+		$(use_enable soup) \
 		${myconf} || die "configure failed"
 
 	emake || die "emake failed"