version bumb plus some minor changes

svn path=/sunrise/; revision=2601

3 files changed, 75 insertions, 0 deletions

diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index b7a75417f..894c5c69d 100644
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -3,10 +3,15 @@ MD5 d6ca50568d4e6093fd942f0a9b14b85f files/democracy-as-needed-libX11.patch 640
 RMD160 34b1528f276722f70a9d13cbb145dc8bbfed88b1 files/democracy-as-needed-libX11.patch 640
 SHA256 65bc455fadd9445e34e4dd2fd8eecb5a923939aefe233aabb82b8ead5570e990 files/democracy-as-needed-libX11.patch 640
 DIST Democracy-0.9.2.1.tar.gz 5847927 RMD160 aa5a6ac70c015ce9f1a8751d5e73fa51856f14b9 SHA1 d58db11defdb0298cc425b900c1ae595422b8c16 SHA256 e69a0cbe039b34946b5aa1459b85721c216dc54c24f4d9b96123451e15639ab9
+DIST Democracy-0.9.2.2.tar.gz 6185004 RMD160 94e6ec5b9b5dc9b498dd085eaa48cb76a32679d7 SHA1 f33d7096657eda1391ef42f2aaea9004c83ce56b SHA256 27f179063e7791f30cca00fa4fecdd40ec329ed328410391fbc13caaa0ca57aa
 EBUILD democracy-0.9.2.1-r1.ebuild 1911 RMD160 0c9c1db9a9af628c4e6faf26fb2c43a6c8f63780 SHA1 f5eb9bb01f6d2bc0d0771aedd431a59f6b9e89b7 SHA256 f16ab4b23a7d7ff28e32cb76f7f8cc0b32d2952c82195f0e4859676233cfba87
 MD5 ee7dcc3e8249ea079dd6f3cf3723ca1f democracy-0.9.2.1-r1.ebuild 1911
 RMD160 0c9c1db9a9af628c4e6faf26fb2c43a6c8f63780 democracy-0.9.2.1-r1.ebuild 1911
 SHA256 f16ab4b23a7d7ff28e32cb76f7f8cc0b32d2952c82195f0e4859676233cfba87 democracy-0.9.2.1-r1.ebuild 1911
+EBUILD democracy-0.9.2.2.ebuild 2003 RMD160 e4ae7b22574abf605594fdabad3a9b05a884cc65 SHA1 7bc30197e3a9f602164e69a06f5bb945c5cbf58d SHA256 85ba5bbec3ec28aa66cbd93c93dd5db8e0a91c4acafe91a33140baa6106f00fe
+MD5 00b240ead66668a070c421e5c6554306 democracy-0.9.2.2.ebuild 2003
+RMD160 e4ae7b22574abf605594fdabad3a9b05a884cc65 democracy-0.9.2.2.ebuild 2003
+SHA256 85ba5bbec3ec28aa66cbd93c93dd5db8e0a91c4acafe91a33140baa6106f00fe democracy-0.9.2.2.ebuild 2003
 MISC ChangeLog 3628 RMD160 c0b443c27f0bf6e528cfda4ba1e3d362ccec9bb8 SHA1 5e85dd3f7bfa9dce6a00264eacf42d3e7d8fd7ae SHA256 8f1d26ff7861830514264a7b15342525c7162b852a93c267ab13098e6241cbfd
 MD5 29829bbd7d6f1ce05c9f34bf7f5dac5b ChangeLog 3628
 RMD160 c0b443c27f0bf6e528cfda4ba1e3d362ccec9bb8 ChangeLog 3628
@@ -18,3 +23,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 efcf7a0523c205acd52cb0a557d41032 files/digest-democracy-0.9.2.1-r1 256
 RMD160 51e4599f45c42d64971849b80d25d73862bcad65 files/digest-democracy-0.9.2.1-r1 256
 SHA256 83707f1eaea9468d601347b0adecbc050f8635a3423d283814e2eeae4b441f3f files/digest-democracy-0.9.2.1-r1 256
+MD5 cc3613f8e33de234d09e0a798e51b549 files/digest-democracy-0.9.2.2 256
+RMD160 a973ef36e7e2b366f4332524126a29209f9e7243 files/digest-democracy-0.9.2.2 256
+SHA256 98e75d1d4068df51d8e34fedb186bc087234e31c4b16ab7e98b7f31150a64563 files/digest-democracy-0.9.2.2 256
diff --git a/media-tv/democracy/democracy-0.9.2.2.ebuild b/media-tv/democracy/democracy-0.9.2.2.ebuild
new file mode 100644
index 000000000..e44f143d7
--- /dev/null
+++ b/media-tv/democracy/democracy-0.9.2.2.ebuild
@@ -0,0 +1,64 @@
+# 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"
+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
+
+	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 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/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 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/files/digest-democracy-0.9.2.2 b/media-tv/democracy/files/digest-democracy-0.9.2.2
new file mode 100644
index 000000000..2959b02bc
--- /dev/null
+++ b/media-tv/democracy/files/digest-democracy-0.9.2.2
@@ -0,0 +1,3 @@
+MD5 0b92aa3efb2a93e7c066152137fcf9fa Democracy-0.9.2.2.tar.gz 6185004
+RMD160 94e6ec5b9b5dc9b498dd085eaa48cb76a32679d7 Democracy-0.9.2.2.tar.gz 6185004
+SHA256 27f179063e7791f30cca00fa4fecdd40ec329ed328410391fbc13caaa0ca57aa Democracy-0.9.2.2.tar.gz 6185004