media-tv/democracy: cosmetics and drop old

svn path=/sunrise/; revision=3266

4 files changed, 7 insertions, 76 deletions

diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog
index 939ea9254..acf633c3e 100644
--- a/media-tv/democracy/ChangeLog
+++ b/media-tv/democracy/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Mar 2007; Markus Ullmann <jokey@gentoo.org> -democracy-0.9.2.2.ebuild,
+  democracy-0.9.5.1.ebuild:
+  cosmetics and drop old
+
   13 Mar 2007; Jürgen Geuter (tante) <tante@emptiness.de>
   +democracy-0.9.5.1.ebuild:
   Version bump to 0.9.5.1 and added dependency for dbus-python-0.71
diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index abda87225..808ec9aad 100644
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -1,7 +1,5 @@
 AUX democracy-as-needed-libX11.patch 640 RMD160 34b1528f276722f70a9d13cbb145dc8bbfed88b1 SHA1 50bd164b5ad24231252afb1a28a1c5b6f8bd9f05 SHA256 65bc455fadd9445e34e4dd2fd8eecb5a923939aefe233aabb82b8ead5570e990
-DIST Democracy-0.9.2.2.tar.gz 6185004 RMD160 94e6ec5b9b5dc9b498dd085eaa48cb76a32679d7 SHA1 f33d7096657eda1391ef42f2aaea9004c83ce56b SHA256 27f179063e7791f30cca00fa4fecdd40ec329ed328410391fbc13caaa0ca57aa
 DIST Democracy-0.9.5.1.tar.gz 6472007 RMD160 4cc77c12ab43c7e3eb475fd5d26dcc67a1110b02 SHA1 cd9df95fbd9469fae6cc302c7facfa684eab1848 SHA256 6ee751c59e2aa80753f680b1a038409562ad9244588d8c454bc2bb5f13e0ac8c
-EBUILD democracy-0.9.2.2.ebuild 2288 RMD160 193f72083e3ff23ffcb80f1ecfa706f64bcba7a5 SHA1 1eb26f87d938cc55faf1f0ef98f3071c7cf8c32c SHA256 43530c3504f9a5c19dc5b6a1b5b5c78c8c751872f72765a9b16517ee6708c161
-EBUILD democracy-0.9.5.1.ebuild 2476 RMD160 7db72d44418ed3e3bd51716b05cdc80764dbd98b SHA1 9f5439743797e7027502e82a752820ad3860e93f SHA256 4c0693821a118d772e3cbe6e14faa0bc87142919e93281fe0e17c9c9a4382642
-MISC ChangeLog 4470 RMD160 5e9b3c9ca899fe277291437b4a0e043378d7d4e4 SHA1 ed707f975caa897454d25071a43d1d447d14d892 SHA256 e6811e39bea8040fc8345709ff3dafedb8326f5854da2ce8f31bddd981ebee9c
+EBUILD democracy-0.9.5.1.ebuild 2475 RMD160 658504e5e51aa074d1eb6668c25a00500a210ec6 SHA1 120adff3f2f1189c612d94aff2884b7a12026d5e SHA256 bc8ad7c2fdad27f63f3a523be1c3cb9108a63618bbc0f76698e3b9139558b247
+MISC ChangeLog 4600 RMD160 1d365f90a84f08345ef6d440f1b5e42a4663a4b4 SHA1 344648a0e6ae2bf359d0030fe60797ccb1c35cdc SHA256 def47adff7e03c3d5db58c59219fc2042544f6fdec464b69442487c5921b5eca
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-tv/democracy/democracy-0.9.2.2.ebuild b/media-tv/democracy/democracy-0.9.2.2.ebuild
deleted file mode 100644
index 8928d3bb9..000000000
--- a/media-tv/democracy/democracy-0.9.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils eutils versionator multilib
-
-MY_P="Democracy-${PV}"
-DESCRIPTION="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"
-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
-		dev-python/gst-python
-		x11-apps/xset"
-		# see https://develop.participatoryculture.org/democracy/ticket/3067
-
-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
-
-	python_version
-	if ! grep -q compiler.find /usr/$(get_libdir)/python${PYVER}/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 as root:"
-		eerror "wget -q 'http://sourceforge.net/tracker/download.php?group_id=5470&atid=305470&file_id=144928&aid=1254718' -O -|patch -p1 -d /usr/$(get_libdir)/python${PYVER}"
-		die "python version not patched"
-	fi
-
-	if ! built_with_use -o gnome-python-extras seamonkey firefox; then
-		eerror "You must build gnome-python-extras with seamonkey or firefox support"
-		die "Please re-emerge gnome-python-extras with seamonkey or firefox USE flag ON"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/democracy-as-needed-libX11.patch
-}
-
-pkg_postinst(){
-	if ! built_with_use xine-lib aac alsa mad asf flac sdl win32codecs mp3; then
-		ewarn "The Democracy team recommends you to emerge xine-lib as follows:"
-		ewarn ""
-		ewarn "# echo \"media-libs/xine-lib aac mad asf flac sdl
-		win32codecs mp3 \" \ "
-		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.5.1.ebuild b/media-tv/democracy/democracy-0.9.5.1.ebuild
index 47b1ea3c6..08c9e75e8 100644
--- a/media-tv/democracy/democracy-0.9.5.1.ebuild
+++ b/media-tv/democracy/democracy-0.9.5.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-python/pyrex
 		x11-apps/xset
 		=dev-python/dbus-python-0.71"
 		# dbus-python versions >0.80 changed the api so democracyplayer does
-		# not work with them, therefore depending on the 0.71 version in portage 
+		# not work with them, therefore depending on the 0.71 version in portage
 		# see https://develop.participatoryculture.org/democracy/ticket/3067
 
 DEPEND="${RDEPEND}