media-tv/democracy: omp is right the change doesn't requires a bump, besides genstef is going to delete it ones he notice I put in 0.9.1

svn path=/sunrise/; revision=1660

4 files changed, 14 insertions, 79 deletions

diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog
index c4c70970f..f78c18f07 100644
--- a/media-tv/democracy/ChangeLog
+++ b/media-tv/democracy/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   22 Oct 2006; Jorge Vargas (elpargo) <jorge.vargas@gmail.com>
+  democracy-0.9.0.2.ebuild, -democracy-0.9.0.2-r1.ebuild:
+  omp is right the change doesn't requires a bump, besides genstef is going to
+  delete it ones he notice I put in 0.9.1
+
+  22 Oct 2006; Jorge Vargas (elpargo) <jorge.vargas@gmail.com>
   +democracy-0.9.0.2-r1.ebuild, +democracy-0.9.1.ebuild:
   Added new release, took out check for ffmpeg thanks to Hinrik Örn Sigurðsson
 
diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index 7c9f219e2..f366f7379 100644
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -4,22 +4,18 @@ RMD160 34b1528f276722f70a9d13cbb145dc8bbfed88b1 files/democracy-as-needed-libX11
 SHA256 65bc455fadd9445e34e4dd2fd8eecb5a923939aefe233aabb82b8ead5570e990 files/democracy-as-needed-libX11.patch 640
 DIST Democracy-0.9.0.2.tar.gz 5706611 RMD160 e0e4a375e0fb56564731687401d17a254a632935 SHA1 315bef444b8fffeea42a1ccbcc291685ecf1f436 SHA256 6085eda6d88a0c8eb2f64b276206bacc6d0e3fb2acae80ebdee9f4dc33078707
 DIST Democracy-0.9.1.tar.gz 5827649 RMD160 2f09e12f0738f3bbbc434fcb4276dac6026f63ea SHA1 535fb5c63b0de722ee720072d83d3627d36f1e86 SHA256 a9bc8f9bcd1628d80b31c1997fc76afe8ddc8f3d079f4be58849942244a4afeb
-EBUILD democracy-0.9.0.2-r1.ebuild 1881 RMD160 a2a71fc0ec8e365df381e4de31fb3969449bc5a5 SHA1 e9fd51e30d9ebff9826b62dbbbce68f9d06410e7 SHA256 f8aa96010f269d8d8f78305eb53137a3acd6d8e88c22d0916f5f9d2bc9b3a91a
-MD5 66b22d1bd37431a517ea66e5d2007616 democracy-0.9.0.2-r1.ebuild 1881
-RMD160 a2a71fc0ec8e365df381e4de31fb3969449bc5a5 democracy-0.9.0.2-r1.ebuild 1881
-SHA256 f8aa96010f269d8d8f78305eb53137a3acd6d8e88c22d0916f5f9d2bc9b3a91a democracy-0.9.0.2-r1.ebuild 1881
-EBUILD democracy-0.9.0.2.ebuild 1888 RMD160 4f9b8d546fe64836856b8f6c48ce3365c796f12d SHA1 583cb2e15a87b94946186a3e1c443f41214569b6 SHA256 a0e8630360372182c1e6f5fe3f58771bc509dc98ac7c9dc2049521c05f9c46e3
-MD5 565056b442a1640c671d720f08e3aa8d democracy-0.9.0.2.ebuild 1888
-RMD160 4f9b8d546fe64836856b8f6c48ce3365c796f12d democracy-0.9.0.2.ebuild 1888
-SHA256 a0e8630360372182c1e6f5fe3f58771bc509dc98ac7c9dc2049521c05f9c46e3 democracy-0.9.0.2.ebuild 1888
+EBUILD democracy-0.9.0.2.ebuild 1881 RMD160 a2a71fc0ec8e365df381e4de31fb3969449bc5a5 SHA1 e9fd51e30d9ebff9826b62dbbbce68f9d06410e7 SHA256 f8aa96010f269d8d8f78305eb53137a3acd6d8e88c22d0916f5f9d2bc9b3a91a
+MD5 66b22d1bd37431a517ea66e5d2007616 democracy-0.9.0.2.ebuild 1881
+RMD160 a2a71fc0ec8e365df381e4de31fb3969449bc5a5 democracy-0.9.0.2.ebuild 1881
+SHA256 f8aa96010f269d8d8f78305eb53137a3acd6d8e88c22d0916f5f9d2bc9b3a91a democracy-0.9.0.2.ebuild 1881
 EBUILD democracy-0.9.1.ebuild 1886 RMD160 d82b4179d9586734df9fcf958af1ced4e88dfb27 SHA1 b9f990ed7763bb94487368099c7ed2ee7aaefca6 SHA256 40cc9a1fd7c3607980b50f9c04d7e50065be3b3874bdb77485cff2d153cf3bb5
 MD5 c8189d05e158bb32c18d9eeb3c2b8b08 democracy-0.9.1.ebuild 1886
 RMD160 d82b4179d9586734df9fcf958af1ced4e88dfb27 democracy-0.9.1.ebuild 1886
 SHA256 40cc9a1fd7c3607980b50f9c04d7e50065be3b3874bdb77485cff2d153cf3bb5 democracy-0.9.1.ebuild 1886
-MISC ChangeLog 2929 RMD160 1a1bdf08e56dcfa25200ebfa6cc61e128affd6a5 SHA1 09b97cbf4469d361f79a47c4b8e675b2e655a754 SHA256 242fa6caad57de7f23b498de003ca5064fabdf2e69a651bedd20eb0ea0df3fd3
-MD5 3c9a8c997883ecaabce0ecadeb3c5ee9 ChangeLog 2929
-RMD160 1a1bdf08e56dcfa25200ebfa6cc61e128affd6a5 ChangeLog 2929
-SHA256 242fa6caad57de7f23b498de003ca5064fabdf2e69a651bedd20eb0ea0df3fd3 ChangeLog 2929
+MISC ChangeLog 3172 RMD160 dfd7c21ca300ce2359c91d8de44a0acd08da210a SHA1 e9af64ea969bfb5368714659e0cd1b1016e164c2 SHA256 49a062158965c33be99dcea2265b63c2ff7d1a70987b403717d68566aed2e66e
+MD5 92a96d2d440f9a68725def7243e226a8 ChangeLog 3172
+RMD160 dfd7c21ca300ce2359c91d8de44a0acd08da210a ChangeLog 3172
+SHA256 49a062158965c33be99dcea2265b63c2ff7d1a70987b403717d68566aed2e66e ChangeLog 3172
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -27,9 +23,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 972cbbd69c9c0ad7745be0dada0040a8 files/digest-democracy-0.9.0.2 256
 RMD160 7909a1bf54616bbb00a4a76e9f000d391b56f103 files/digest-democracy-0.9.0.2 256
 SHA256 de4d7f6f4464c4713583cf6a8c2c5d930082ae0da34924c6ca284565ff19cf32 files/digest-democracy-0.9.0.2 256
-MD5 972cbbd69c9c0ad7745be0dada0040a8 files/digest-democracy-0.9.0.2-r1 256
-RMD160 7909a1bf54616bbb00a4a76e9f000d391b56f103 files/digest-democracy-0.9.0.2-r1 256
-SHA256 de4d7f6f4464c4713583cf6a8c2c5d930082ae0da34924c6ca284565ff19cf32 files/digest-democracy-0.9.0.2-r1 256
 MD5 4afa6812e0604534b28f0f10faca1e77 files/digest-democracy-0.9.1 250
 RMD160 d4f51095a959333c7bd45ec210158fc83c79bfd8 files/digest-democracy-0.9.1 250
 SHA256 1f65d16ace77714bb864e0636462e0d12160f21b1ab937187e332458b1139707 files/digest-democracy-0.9.1 250
diff --git a/media-tv/democracy/democracy-0.9.0.2-r1.ebuild b/media-tv/democracy/democracy-0.9.0.2-r1.ebuild
deleted file mode 100644
index 02b8c9c39..000000000
--- a/media-tv/democracy/democracy-0.9.0.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils eutils versionator
-
-MY_P="Democracy-${PV}"
-DESCRIPTION="Democracy is a free and open internet TV platform."
-HOMEPAGE="http://www.getdemocracy.com/"
-SRC_URI="ftp://ftp.osuosl.org/pub/pculture.org/democracy/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pyrex
-	>virtual/python-2.4
-	media-libs/xine-lib
-	dev-libs/boost
-	>=dev-python/pygtk-2.0
-	dev-python/gnome-python-extras
-	www-client/mozilla-firefox
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="README"
-
-S=${WORKDIR}/${MY_P}/platform/gtk-x11
-
-pkg_setup() {
-	if ! built_with_use python berkdb; then
-		eerror "You must build python with berkdb support"
-		die "Please re-emerge python with berkdb USE flag ON"
-	fi
-
-	if ! grep -q compiler.find /usr/lib/python2.4/distutils/unixccompiler.py; then
-		eerror "You need to apply a patch to make distutils use the correct RPATH."
-		eerror "To do this execute the following command:"
-		eerror "wget -q 'http://sourceforge.net/tracker/download.php?group_id=5470&atid=305470&file_id=144928&aid=1254718' -O -|patch -p1 -d /usr/lib/python2.4"
-		die "python version not patched"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/democracy-as-needed-libX11.patch
-}
-
-pkg_postinst(){
-	if ! built_with_use xine-lib aac mad asf flac sdl win32codecs; then
-		ewarn "The Democracy team recommends you to emerge xine-lib as follows:"
-		ewarn ""
-		ewarn "# echo \"media-libs/xine-lib aac ffmpeg mad asf flac sdl win32codecs\" \ "
-		ewarn ">> /etc/portage/package.use && emerge xine-lib"
-		ewarn ""
-		ewarn "This way you will have support enabled for the most popular"
-		ewarn "video and audio formats. You may also want to add support"
-		ewarn "for theora and vorbis"
-	fi
-}
diff --git a/media-tv/democracy/democracy-0.9.0.2.ebuild b/media-tv/democracy/democracy-0.9.0.2.ebuild
index 67d518e34..02b8c9c39 100644
--- a/media-tv/democracy/democracy-0.9.0.2.ebuild
+++ b/media-tv/democracy/democracy-0.9.0.2.ebuild
@@ -50,7 +50,7 @@ src_unpack() {
 }
 
 pkg_postinst(){
-	if ! built_with_use xine-lib aac ffmpeg mad asf flac sdl win32codecs; then
+	if ! built_with_use xine-lib aac mad asf flac sdl win32codecs; then
 		ewarn "The Democracy team recommends you to emerge xine-lib as follows:"
 		ewarn ""
 		ewarn "# echo \"media-libs/xine-lib aac ffmpeg mad asf flac sdl win32codecs\" \ "