Version bump and remove old versions, #202960

Package-Manager: portage-2.1.3_rc8

7 files changed, 44 insertions, 103 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/Manifest b/media-libs/swfdec/Manifest
index 0b7845fedd6c..d470622803c3 100644
--- a/media-libs/swfdec/Manifest
+++ b/media-libs/swfdec/Manifest
@@ -1,31 +1,24 @@
-DIST swfdec-0.5.3.tar.gz 1502458 RMD160 1e9985cebad635a71b01e2537c2ac8ae0d89ca2b SHA1 34f9f51d2e4ea2a28bc974ceaa5f07c93703e867 SHA256 ec50bcb06037397d78ff9fef3193664f5431ad8aad9e602f993ddbffb0ed7feb
 DIST swfdec-0.5.4.tar.gz 6857084 RMD160 11c7bbcee4bffa2e826a6d48e28cb4ba09749f29 SHA1 0aed95c3c5d894a323abef2b252bdc47397b8dfb SHA256 b43256d55896d7def5a5d403f0533e0937c511eb32bcca97cb26d228f2e0c94e
-EBUILD swfdec-0.5.3.ebuild 1787 RMD160 1ccdbf97062d72a911829093b2e86eb395dbaba8 SHA1 307901b8fb25241463d41556d15d707f7616ff6c SHA256 cf57de0d0db0a00c95f1f0164a2e93bac8301e5862e99adb470a28912d15742f
-MD5 03949237d71501ad8378fb6356d1fec4 swfdec-0.5.3.ebuild 1787
-RMD160 1ccdbf97062d72a911829093b2e86eb395dbaba8 swfdec-0.5.3.ebuild 1787
-SHA256 cf57de0d0db0a00c95f1f0164a2e93bac8301e5862e99adb470a28912d15742f swfdec-0.5.3.ebuild 1787
+DIST swfdec-0.5.5.tar.gz 8667844 RMD160 4082c07019fcaf733de9eb23d9cf30fef29b337d SHA1 40709a43544d8d4f39cefaac0ea15b7a0feef287 SHA256 30b6f4f0ec424b60c91f8db272068f51cb3df204f6a65f155308389981bb99a6
 EBUILD swfdec-0.5.4-r1.ebuild 2285 RMD160 2c18d2a6b47af4b6d1210df6a212944028582e91 SHA1 2053d02fbb18ebd841788dcd4a7bc04a96b52f90 SHA256 b7b159df94982d4db668efd684b180618c86e643f813faba37c11e5aeee7c673
 MD5 921bf2290089e535f27ce467b64b7c4a swfdec-0.5.4-r1.ebuild 2285
 RMD160 2c18d2a6b47af4b6d1210df6a212944028582e91 swfdec-0.5.4-r1.ebuild 2285
 SHA256 b7b159df94982d4db668efd684b180618c86e643f813faba37c11e5aeee7c673 swfdec-0.5.4-r1.ebuild 2285
-EBUILD swfdec-0.5.4.ebuild 1787 RMD160 c54cf4071ebd9ad9dbdbba9b3a8593d8346f6d43 SHA1 d1cda27f04843142d39b25f6f80fa9b858e6f539 SHA256 20d51a8ca3ec7afde6ed22d6c5978009720e3627783dde91554cf21b091b8e1e
-MD5 a1984592479720e8eaa33784eaee337d swfdec-0.5.4.ebuild 1787
-RMD160 c54cf4071ebd9ad9dbdbba9b3a8593d8346f6d43 swfdec-0.5.4.ebuild 1787
-SHA256 20d51a8ca3ec7afde6ed22d6c5978009720e3627783dde91554cf21b091b8e1e swfdec-0.5.4.ebuild 1787
-MISC ChangeLog 2921 RMD160 7543095490eb4a5dc01fbecd897e5ff7df6e6b69 SHA1 810b91dc02536c8c9745c4733ff788697ba2ac15 SHA256 d37e2865d3799b7dd1eaf8446e96c38134953e50eda14f0ef65bc7b3fa7063d7
-MD5 804dfa040a27a88a896ccde53369a875 ChangeLog 2921
-RMD160 7543095490eb4a5dc01fbecd897e5ff7df6e6b69 ChangeLog 2921
-SHA256 d37e2865d3799b7dd1eaf8446e96c38134953e50eda14f0ef65bc7b3fa7063d7 ChangeLog 2921
+EBUILD swfdec-0.5.5.ebuild 2249 RMD160 1e5d3aa6bd2dc2da1e27023536ed04b7afe42b36 SHA1 76349b22825ce7cee078be10f00a6670f339618b SHA256 812127055ec095a7b038a6ddf3ec30bcb183a185d272f51df084722ac60222dc
+MD5 a233f501a8a48c15189a907a722d170b swfdec-0.5.5.ebuild 2249
+RMD160 1e5d3aa6bd2dc2da1e27023536ed04b7afe42b36 swfdec-0.5.5.ebuild 2249
+SHA256 812127055ec095a7b038a6ddf3ec30bcb183a185d272f51df084722ac60222dc swfdec-0.5.5.ebuild 2249
+MISC ChangeLog 3129 RMD160 fb31b72bb6acb450dd7580e1b94cc3aa31400ba6 SHA1 63390457fd181869dbdc5785e41fb08de61ba570 SHA256 6a0c26c4d147fb64f79ac3735652cc000f796f5d4f8cf3bddb3fd452a8b38c44
+MD5 f45e7cd758994ba5e1be893f76cd2a5b ChangeLog 3129
+RMD160 fb31b72bb6acb450dd7580e1b94cc3aa31400ba6 ChangeLog 3129
+SHA256 6a0c26c4d147fb64f79ac3735652cc000f796f5d4f8cf3bddb3fd452a8b38c44 ChangeLog 3129
 MISC metadata.xml 553 RMD160 5bd09816d32a27f6589d6c012baa73ee2c6e0922 SHA1 a63c5e107699a1b5f9e76cc98cbd1b56c6d07975 SHA256 5589f6c42f3f6f0a3627bd3df83f3432181bd0a6b52935bca9d3a58c43c1b304
 MD5 1990ebcdd48fabf834e51833b7d743ad metadata.xml 553
 RMD160 5bd09816d32a27f6589d6c012baa73ee2c6e0922 metadata.xml 553
 SHA256 5589f6c42f3f6f0a3627bd3df83f3432181bd0a6b52935bca9d3a58c43c1b304 metadata.xml 553
-MD5 00cad4596e1a7e50319a373239c52f91 files/digest-swfdec-0.5.3 241
-RMD160 555c13fc81768bf00e4e975a43e8eefcbb815979 files/digest-swfdec-0.5.3 241
-SHA256 f2eeeb2b3629312c1bc0e2163d70b92231d64155f00fd21097c111ca8a227fd2 files/digest-swfdec-0.5.3 241
-MD5 006bc3f5bc4b59eac999356127f007d9 files/digest-swfdec-0.5.4 241
-RMD160 64b5668a2d3649aa71c6c33d137de2a544cc72e3 files/digest-swfdec-0.5.4 241
-SHA256 67c6f4d18eff4b6d3a3af7a39857e98e64389acaf4483990d440882810cfa180 files/digest-swfdec-0.5.4 241
 MD5 006bc3f5bc4b59eac999356127f007d9 files/digest-swfdec-0.5.4-r1 241
 RMD160 64b5668a2d3649aa71c6c33d137de2a544cc72e3 files/digest-swfdec-0.5.4-r1 241
 SHA256 67c6f4d18eff4b6d3a3af7a39857e98e64389acaf4483990d440882810cfa180 files/digest-swfdec-0.5.4-r1 241
+MD5 2b067187cf26866fab161aa8b5580e98 files/digest-swfdec-0.5.5 241
+RMD160 e250c1a4801e7636b023bd8162d636ce65f19a7d files/digest-swfdec-0.5.5 241
+SHA256 19d33ce86b8da833fbe6c5a5d2d8261bc64885775c0f29b60728af23198a69bb files/digest-swfdec-0.5.5 241
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"