media-tv/democracy: new rc is out, this compiles without ANY patches on gentoo. Thanks to Ben Dean-Kawamura, Chris Lahey and Greg Opperman from democracy team for getting our work into the trunk./testRead.sh testRead.sh Also I added the last stable 0.8.5 from the bug, from now on I'll keel releasing in sunrise.

svn path=/sunrise/; revision=1173

16 files changed, 509 insertions, 48 deletions

diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog
index be334f00f..8faf2be0e 100644
--- a/media-tv/democracy/ChangeLog
+++ b/media-tv/democracy/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2006; Jorge Vargas (elpargo) <jorge.vargas@gmail.com>
+  +democracy-0.8.4.ebuild, democracy-0.8.4.1.ebuild,
+  +democracy-0.8.5.ebuild, +democracy-0.8.5.3.ebuild,
+  +files/democracy-0.8.5.3-firefox.patch,
+  +files/democracy-0.8.5.3-r1-firefox.patch,
+  +files/democracy-0.8.5.9999-firefox.patch,
+  +files/democracy-0.8.5-firefox.patch, +democracy-0.9.0_rc1.ebuild,
+  files/democracy-as-needed-libX11.patch:
+  new rc is out, this compiles without ANY patches on gentoo. Thanks to Ben
+  Dean-Kawamura, Chris Lahey and Greg Opperman from democracy team for getting
+  our work into the trunk./testRead.sh testRead.sh Also I added the last
+  stable 0.8.5 from the bug, from now on I'll keel releasing in sunrise.
+
   05 Jul 2006; Stefan Schweizer <genstef@gentoo.org> ChangeLog:
   Add check for the distutils patch
 
diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index 49a76470a..845efe60b 100644
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -2,23 +2,71 @@ AUX democracy-0.8.4.1-firefox.patch 2522 RMD160 0c13bca0eec65c822e7b4b36bdc3ec45
 MD5 3c6f043a46ad881a704738729b12a5ff files/democracy-0.8.4.1-firefox.patch 2522
 RMD160 0c13bca0eec65c822e7b4b36bdc3ec4557befb8e files/democracy-0.8.4.1-firefox.patch 2522
 SHA256 0806eabe3b55e3c991277bc8100a97fa86076858b3a1ec171692a6b375b7da76 files/democracy-0.8.4.1-firefox.patch 2522
-AUX democracy-as-needed-libX11.patch 628 RMD160 1fcd86335cabce0642488fee43fe866c8cd1f46c SHA1 5768a12373fdd968cf2ded7736dd7cf41d1eee00 SHA256 cc6335f87db36c2a71c7e28aabe363b4156a16836f77088f298f89feafb891f4
-MD5 66e5acf5517b1f0c6075960d9816195a files/democracy-as-needed-libX11.patch 628
-RMD160 1fcd86335cabce0642488fee43fe866c8cd1f46c files/democracy-as-needed-libX11.patch 628
-SHA256 cc6335f87db36c2a71c7e28aabe363b4156a16836f77088f298f89feafb891f4 files/democracy-as-needed-libX11.patch 628
+AUX democracy-0.8.5-firefox.patch 1841 RMD160 bc9e624471cb3c160d62910fd8bba5aad894ae5a SHA1 26590f344e911aa07ef994b12fb766038e3c9182 SHA256 576694bfcde8a521f8317a695baa6e7d5f25ce7a7f83232de5f883209ada3a99
+MD5 c855de8dce6a702056c0ae639f99dbbe files/democracy-0.8.5-firefox.patch 1841
+RMD160 bc9e624471cb3c160d62910fd8bba5aad894ae5a files/democracy-0.8.5-firefox.patch 1841
+SHA256 576694bfcde8a521f8317a695baa6e7d5f25ce7a7f83232de5f883209ada3a99 files/democracy-0.8.5-firefox.patch 1841
+AUX democracy-0.8.5.3-firefox.patch 1841 RMD160 bc9e624471cb3c160d62910fd8bba5aad894ae5a SHA1 26590f344e911aa07ef994b12fb766038e3c9182 SHA256 576694bfcde8a521f8317a695baa6e7d5f25ce7a7f83232de5f883209ada3a99
+MD5 c855de8dce6a702056c0ae639f99dbbe files/democracy-0.8.5.3-firefox.patch 1841
+RMD160 bc9e624471cb3c160d62910fd8bba5aad894ae5a files/democracy-0.8.5.3-firefox.patch 1841
+SHA256 576694bfcde8a521f8317a695baa6e7d5f25ce7a7f83232de5f883209ada3a99 files/democracy-0.8.5.3-firefox.patch 1841
+AUX democracy-0.8.5.3-r1-firefox.patch 794 RMD160 4e5e48ae10d48c67aac14f2ebce6909c095c6bd4 SHA1 6c36b7ebb8334719e287b2f93638b8ac004d900c SHA256 7885640bf5fcb5b7741dd8cb085b3b68cc4364ac2cc067e13182446f85b95763
+MD5 d8758d1a226aabc72302a72b3c6c17cf files/democracy-0.8.5.3-r1-firefox.patch 794
+RMD160 4e5e48ae10d48c67aac14f2ebce6909c095c6bd4 files/democracy-0.8.5.3-r1-firefox.patch 794
+SHA256 7885640bf5fcb5b7741dd8cb085b3b68cc4364ac2cc067e13182446f85b95763 files/democracy-0.8.5.3-r1-firefox.patch 794
+AUX democracy-0.8.5.9999-firefox.patch 1856 RMD160 c855334e143a66d425458bf0eecae2208e25180d SHA1 7ac8e1ffcee06dc73bd272b7cc370acd0d90725f SHA256 bf43ec1a2ea036de67a3e41c48ff0bcdf0ba436b7475e4159ffcdf17311a9be8
+MD5 ffd5e0d359a6a95cdc1f27f40f1cd587 files/democracy-0.8.5.9999-firefox.patch 1856
+RMD160 c855334e143a66d425458bf0eecae2208e25180d files/democracy-0.8.5.9999-firefox.patch 1856
+SHA256 bf43ec1a2ea036de67a3e41c48ff0bcdf0ba436b7475e4159ffcdf17311a9be8 files/democracy-0.8.5.9999-firefox.patch 1856
+AUX democracy-as-needed-libX11.patch 640 RMD160 34b1528f276722f70a9d13cbb145dc8bbfed88b1 SHA1 50bd164b5ad24231252afb1a28a1c5b6f8bd9f05 SHA256 65bc455fadd9445e34e4dd2fd8eecb5a923939aefe233aabb82b8ead5570e990
+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.8.4.1.tar.gz 4903115 RMD160 94c0e73248b65b4a475277c185554cfd53f4a607 SHA1 badb9977f9efb791ed6424aada0ee27b10fa7b28 SHA256 d754a72610df4deb93ae7671d1cb45ea3cae104ec2bf198bf4a7d8de3cdf1025
-EBUILD democracy-0.8.4.1.ebuild 1891 RMD160 70dba1cd410cc0f0798a508f21885bc402984494 SHA1 3029c6d4465ac410815f43b529d9b1570afa2cc3 SHA256 e45c2bd890a923d77baeb7d6192472f9adfd73de1008a87641a63d620095b3fe
-MD5 b9ebe00183360be5d208039f56ea6f3d democracy-0.8.4.1.ebuild 1891
-RMD160 70dba1cd410cc0f0798a508f21885bc402984494 democracy-0.8.4.1.ebuild 1891
-SHA256 e45c2bd890a923d77baeb7d6192472f9adfd73de1008a87641a63d620095b3fe democracy-0.8.4.1.ebuild 1891
-MISC ChangeLog 656 RMD160 fbc1e53c297714bfc289bbe701806ba6a1576db8 SHA1 a89933cce3346d94639d5be6754d818ad063a212 SHA256 3e0b8518bda69edaffb302f234893ed8e7dc4e1e2ccd9b5283656985e379222f
-MD5 17527994bff89b63f05caf16d1621fbc ChangeLog 656
-RMD160 fbc1e53c297714bfc289bbe701806ba6a1576db8 ChangeLog 656
-SHA256 3e0b8518bda69edaffb302f234893ed8e7dc4e1e2ccd9b5283656985e379222f ChangeLog 656
+DIST Democracy-0.8.4.tar.gz 4902212 RMD160 03855834a79f7cdab03fc5004236d92b6e581e0c SHA1 54b3a6c496b488ecb81ac39c4fd7f3db2d5558c1 SHA256 461ac75b59bd6d389aee318de7e46bba89b6eb397ca7f3903d874b7b6f88e162
+DIST Democracy-0.8.5.3.tar.gz 4877765 RMD160 f96f283d0cb994fa21c300578f7a11dfbcaed632 SHA1 0536a7b5d45846506b102b12beab76513b4935b6 SHA256 9c343fed2d46b0e49124b96a9766934e3d5ed589f5b69b01748bd93395ad2be9
+DIST Democracy-0.8.5.tar.gz 4841321 RMD160 50e03285679c73874537f490027dfac7e094efbb SHA1 b517afb17241b9d0156ea63fe0cb884bd8c83fa3 SHA256 a23ea777df0bb3467b9a25945fde460e31b6b01dd69cbc041658ba3860310583
+DIST Democracy-0.9.0-rc1.tar.gz 5704016 RMD160 47a5fa85d25a4a70fcc8e1bda1b696a492b23bd5 SHA1 0e5875b5048c768f1905b02bb5710b8c24d96f42 SHA256 7fb074653d46a52a3fcd080adafa408f6d8d69b7b4894351b6f29b8038d73e9b
+EBUILD democracy-0.8.4.1.ebuild 1593 RMD160 830b620a2a59ce489fee39e9362bc3b6ca5ca984 SHA1 e33d0a0648d90b55573867f3607333077d1e6e88 SHA256 714954089dc4e54d960519a7b2061d7928f556275f1eb43b597e5163404cc5d3
+MD5 330b11c50923f330d81ee35533ea2ab3 democracy-0.8.4.1.ebuild 1593
+RMD160 830b620a2a59ce489fee39e9362bc3b6ca5ca984 democracy-0.8.4.1.ebuild 1593
+SHA256 714954089dc4e54d960519a7b2061d7928f556275f1eb43b597e5163404cc5d3 democracy-0.8.4.1.ebuild 1593
+EBUILD democracy-0.8.4.ebuild 1593 RMD160 830b620a2a59ce489fee39e9362bc3b6ca5ca984 SHA1 e33d0a0648d90b55573867f3607333077d1e6e88 SHA256 714954089dc4e54d960519a7b2061d7928f556275f1eb43b597e5163404cc5d3
+MD5 330b11c50923f330d81ee35533ea2ab3 democracy-0.8.4.ebuild 1593
+RMD160 830b620a2a59ce489fee39e9362bc3b6ca5ca984 democracy-0.8.4.ebuild 1593
+SHA256 714954089dc4e54d960519a7b2061d7928f556275f1eb43b597e5163404cc5d3 democracy-0.8.4.ebuild 1593
+EBUILD democracy-0.8.5.3.ebuild 1890 RMD160 ebf30f4304dd6e472a85b237fd5715416ffed558 SHA1 269b2c6616b45156cb431cc6e5e9fe5a1d9d2cf8 SHA256 2cf58acd11ce25a62ce7f0d5d5b9a4c2a69174bedad7f7c64e4fcd88cafb0d8c
+MD5 aadd17b42abbe4ca176807b6311facf7 democracy-0.8.5.3.ebuild 1890
+RMD160 ebf30f4304dd6e472a85b237fd5715416ffed558 democracy-0.8.5.3.ebuild 1890
+SHA256 2cf58acd11ce25a62ce7f0d5d5b9a4c2a69174bedad7f7c64e4fcd88cafb0d8c democracy-0.8.5.3.ebuild 1890
+EBUILD democracy-0.8.5.ebuild 1889 RMD160 ca830ba2bc0f211f0b0ab931354c34b8a4380819 SHA1 2ba13b34813cfa67f1196f4df9dcc2dcc657014b SHA256 8ab2d23c6e99df50bc6be577f9fe34790d17356abd4ecb14e4b0c794fbe76263
+MD5 5d889aa0e7ac17276870c528afa2c16d democracy-0.8.5.ebuild 1889
+RMD160 ca830ba2bc0f211f0b0ab931354c34b8a4380819 democracy-0.8.5.ebuild 1889
+SHA256 8ab2d23c6e99df50bc6be577f9fe34790d17356abd4ecb14e4b0c794fbe76263 democracy-0.8.5.ebuild 1889
+EBUILD democracy-0.9.0_rc1.ebuild 1947 RMD160 1d23a86133883914881000641bda655cec9492d6 SHA1 9cccf924c5e7338b73ebe15aac2e379ee94cfeb4 SHA256 72490403dbfce7878dd8a72b2e199681cb463f5dbff634bbcebfe6baddf60f7a
+MD5 21bb2bdcce59779925d503b1926b43ca democracy-0.9.0_rc1.ebuild 1947
+RMD160 1d23a86133883914881000641bda655cec9492d6 democracy-0.9.0_rc1.ebuild 1947
+SHA256 72490403dbfce7878dd8a72b2e199681cb463f5dbff634bbcebfe6baddf60f7a democracy-0.9.0_rc1.ebuild 1947
+MISC ChangeLog 1371 RMD160 2ce25b60ae431d18912abd5b4ec2c05ac25c2843 SHA1 3a451e02c047ed3660563847674e35646e18885d SHA256 fb0181a5bc8537939c02dbe447a0f4362c91f0764d64c5a92ad4a37872d70df1
+MD5 755794a26a028995fa24edad56d15224 ChangeLog 1371
+RMD160 2ce25b60ae431d18912abd5b4ec2c05ac25c2843 ChangeLog 1371
+SHA256 fb0181a5bc8537939c02dbe447a0f4362c91f0764d64c5a92ad4a37872d70df1 ChangeLog 1371
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+MD5 c35e59175c95c68698f6ab4aaf9c3bdd files/digest-democracy-0.8.4 250
+RMD160 c7c8001c646d440832cf4a32d3bc96b65071755a files/digest-democracy-0.8.4 250
+SHA256 52737a179d7ddf8de026222aef626575fd34d6df5672963cd56b48fe902c6b7b files/digest-democracy-0.8.4 250
 MD5 78ee599b9cb6df9cef93666321ee8d9d files/digest-democracy-0.8.4.1 256
 RMD160 f1edbb622732b4c6382ba61bc4e9d7d375312a39 files/digest-democracy-0.8.4.1 256
 SHA256 1b1bb6db5e84319ca5a663d3b78e74fa6a1fc04175958c76fa9bba0a17645428 files/digest-democracy-0.8.4.1 256
+MD5 ed182da3c1dd3beffafd4040b5ae58a4 files/digest-democracy-0.8.5 250
+RMD160 c380930f8075c9b28f828bba629015d63b5e499d files/digest-democracy-0.8.5 250
+SHA256 c14818dc835f1abf2fa43823a126c387741514f54e5113387acdf9e24efceba7 files/digest-democracy-0.8.5 250
+MD5 bbdfb1c65bed779ef7f637e32beb8acc files/digest-democracy-0.8.5.3 256
+RMD160 e672d4b7b02c5667ad0c980745b7010c11451828 files/digest-democracy-0.8.5.3 256
+SHA256 5c263f9532af340e2088eed1f9467a7e5d9108813eb73a0cf9ab39e3fa44b853 files/digest-democracy-0.8.5.3 256
+MD5 d8d01c66c2bb9f74c609d00e80169834 files/digest-democracy-0.9.0_rc1 262
+RMD160 986d6f32b87b33106c4463692b7be77ccd12ea2d files/digest-democracy-0.9.0_rc1 262
+SHA256 b1f9ed774fe6fae985b53f8cb09eab9b24d97e6fa39998acdaff379d72024602 files/digest-democracy-0.9.0_rc1 262
diff --git a/media-tv/democracy/democracy-0.8.4.1.ebuild b/media-tv/democracy/democracy-0.8.4.1.ebuild
index 89961c2dd..f55a40e68 100644
--- a/media-tv/democracy/democracy-0.8.4.1.ebuild
+++ b/media-tv/democracy/democracy-0.8.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit distutils eutils
+inherit distutils 
 
 MY_P="Democracy-${PV}"
 DESCRIPTION="Democracy is a free and open internet TV platform."
@@ -10,51 +10,51 @@ 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="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64" 
+#currently the support for firefox appears to be broken
+#IUSE="gecko-sdk mozilla firefox"
+
 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"
+		www-client/mozilla
+		net-libs/gecko-sdk"
+		#this are pull by gnome-python
+		#gnome-base/gconf
+		#gnome-base/gnome-vfs
 
-DOCS="README"
+#TODO  gnome2_src_configure ${G2CONF}
+# maybe add support in this way
+#/usr/portage/dev-python/gnome-python-extras/gnome-python-extras-2.14.0.ebuild 
 
-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
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
 
-	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
-}
+DOCS="CREDITS README LAYOUT license.txt"
+
+S="${WORKDIR}/${MY_P}/platform/gtk-x11/"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/democracy-{0.8.4.1-firefox,as-needed-libX11}.patch
+	cd ${S}
+	epatch ${FILESDIR}/setup.py-gecko-sdk-${PV}.patch
 }
 
 pkg_postinst(){
-	if ! built_with_use xine-lib aac ffmpeg 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
+if ! built_with_use xine-lib aac ffmpeg 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\" >>
+/etc/portage/package.use && emerge xine-lib"
+ewarn ""
+ewarn "This way you will have support enable for the most popular video and
+audio formats"
+ewarn "You may also want to add support for theora and vorbis " 
+fi
 }
diff --git a/media-tv/democracy/democracy-0.8.4.ebuild b/media-tv/democracy/democracy-0.8.4.ebuild
new file mode 100644
index 000000000..f55a40e68
--- /dev/null
+++ b/media-tv/democracy/democracy-0.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils 
+
+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="~x86 ~amd64" 
+#currently the support for firefox appears to be broken
+#IUSE="gecko-sdk mozilla firefox"
+
+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
+		net-libs/gecko-sdk"
+		#this are pull by gnome-python
+		#gnome-base/gconf
+		#gnome-base/gnome-vfs
+
+#TODO  gnome2_src_configure ${G2CONF}
+# maybe add support in this way
+#/usr/portage/dev-python/gnome-python-extras/gnome-python-extras-2.14.0.ebuild 
+
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+DOCS="CREDITS README LAYOUT license.txt"
+
+S="${WORKDIR}/${MY_P}/platform/gtk-x11/"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/setup.py-gecko-sdk-${PV}.patch
+}
+
+pkg_postinst(){
+if ! built_with_use xine-lib aac ffmpeg 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\" >>
+/etc/portage/package.use && emerge xine-lib"
+ewarn ""
+ewarn "This way you will have support enable for the most popular video and
+audio formats"
+ewarn "You may also want to add support for theora and vorbis " 
+fi
+}
diff --git a/media-tv/democracy/democracy-0.8.5.3.ebuild b/media-tv/democracy/democracy-0.8.5.3.ebuild
new file mode 100644
index 000000000..f65da8f5f
--- /dev/null
+++ b/media-tv/democracy/democracy-0.8.5.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils eutils
+
+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="~x86 ~amd64 ~ppc"
+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-{0.8.5-firefox,as-needed-libX11}.patch
+}
+
+pkg_postinst(){
+	if ! built_with_use xine-lib aac ffmpeg 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.8.5.ebuild b/media-tv/democracy/democracy-0.8.5.ebuild
new file mode 100644
index 000000000..330fee237
--- /dev/null
+++ b/media-tv/democracy/democracy-0.8.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils eutils
+
+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="~x86 ~amd64 ~ppc"
+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-{0.8.5-firefox,as-needed-libX11}.patch
+}
+
+pkg_postinst(){
+	if ! built_with_use xine-lib aac ffmpeg 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_rc1.ebuild b/media-tv/democracy/democracy-0.9.0_rc1.ebuild
new file mode 100644
index 000000000..fbe117d15
--- /dev/null
+++ b/media-tv/democracy/democracy-0.9.0_rc1.ebuild
@@ -0,0 +1,61 @@
+# 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}"
+MY_P="Democracy-$(replace_version_separator "_" "-")"
+DESCRIPTION="Democracy is a free and open internet TV platform."
+HOMEPAGE="http://www.getdemocracy.com"
+SRC_URI="http://participatoryculture.org/nightlies/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+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-{0.8.5-firefox,as-needed-libX11}.patch
+}
+
+pkg_postinst(){
+	if ! built_with_use xine-lib aac ffmpeg 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/files/democracy-0.8.5-firefox.patch b/media-tv/democracy/files/democracy-0.8.5-firefox.patch
new file mode 100644
index 000000000..a7641b5f9
--- /dev/null
+++ b/media-tv/democracy/files/democracy-0.8.5-firefox.patch
@@ -0,0 +1,44 @@
+diff -urN Democracy-0.8.5/platform/gtk-x11/setup.py Democracy-0.8.5-patched/platform/gtk-x11/setup.py
+--- Democracy-0.8.5/platform/gtk-x11/setup.py	2006-07-21 05:20:25.000000000 +0930
++++ Democracy-0.8.5-patched/platform/gtk-x11/setup.py	2006-07-29 11:41:22.000000000 +0930
+@@ -145,10 +145,11 @@
+ 
+     if options_dict is None:
+         options_dict = {
+-            'include_dirs' : [],
++            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
++                              '/usr/lib/mozilla-firefox/include/dom',
++                              '/usr/lib/mozilla-firefox/include/uriloader'],
+             'library_dirs' : [],
+             'libraries' : [],
+-            'extra_compile_args' : []
+         }
+     commandLine = "%s --cflags --libs %s" % (command, components)
+     output = getCommandOutput(commandLine).strip()
+@@ -160,8 +161,6 @@
+             options_dict['library_dirs'].append(rest)
+         elif prefix == '-l':
+             options_dict['libraries'].append(rest)
+-        else:
+-            options_dict['extra_compile_args'].append(comp)
+     return options_dict
+ 
+ #### The fasttypes extension ####
+@@ -172,15 +171,8 @@
+     )
+ 
+ #### MozillaBrowser Extension ####
+-packages = getCommandOutput("pkg-config --list-all")
+-if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
+-    xpcom = 'xulrunner-xpcom'
+-    gtkmozembed = 'xulrunner-gtkmozembed'
+-elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+-    xpcom = 'mozilla-xpcom'
+-    gtkmozembed = 'mozilla-gtkmozembed'
+-else:
+-    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
++xpcom = 'firefox-xpcom'
++gtkmozembed = 'firefox-gtkmozembed'
+ mozilla_browser_options = parsePkgConfig("pkg-config" , 
+         "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
+ mozilla_lib_path = parsePkgConfig('pkg-config', 
diff --git a/media-tv/democracy/files/democracy-0.8.5.3-firefox.patch b/media-tv/democracy/files/democracy-0.8.5.3-firefox.patch
new file mode 100644
index 000000000..a7641b5f9
--- /dev/null
+++ b/media-tv/democracy/files/democracy-0.8.5.3-firefox.patch
@@ -0,0 +1,44 @@
+diff -urN Democracy-0.8.5/platform/gtk-x11/setup.py Democracy-0.8.5-patched/platform/gtk-x11/setup.py
+--- Democracy-0.8.5/platform/gtk-x11/setup.py	2006-07-21 05:20:25.000000000 +0930
++++ Democracy-0.8.5-patched/platform/gtk-x11/setup.py	2006-07-29 11:41:22.000000000 +0930
+@@ -145,10 +145,11 @@
+ 
+     if options_dict is None:
+         options_dict = {
+-            'include_dirs' : [],
++            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
++                              '/usr/lib/mozilla-firefox/include/dom',
++                              '/usr/lib/mozilla-firefox/include/uriloader'],
+             'library_dirs' : [],
+             'libraries' : [],
+-            'extra_compile_args' : []
+         }
+     commandLine = "%s --cflags --libs %s" % (command, components)
+     output = getCommandOutput(commandLine).strip()
+@@ -160,8 +161,6 @@
+             options_dict['library_dirs'].append(rest)
+         elif prefix == '-l':
+             options_dict['libraries'].append(rest)
+-        else:
+-            options_dict['extra_compile_args'].append(comp)
+     return options_dict
+ 
+ #### The fasttypes extension ####
+@@ -172,15 +171,8 @@
+     )
+ 
+ #### MozillaBrowser Extension ####
+-packages = getCommandOutput("pkg-config --list-all")
+-if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
+-    xpcom = 'xulrunner-xpcom'
+-    gtkmozembed = 'xulrunner-gtkmozembed'
+-elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+-    xpcom = 'mozilla-xpcom'
+-    gtkmozembed = 'mozilla-gtkmozembed'
+-else:
+-    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
++xpcom = 'firefox-xpcom'
++gtkmozembed = 'firefox-gtkmozembed'
+ mozilla_browser_options = parsePkgConfig("pkg-config" , 
+         "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
+ mozilla_lib_path = parsePkgConfig('pkg-config', 
diff --git a/media-tv/democracy/files/democracy-0.8.5.3-r1-firefox.patch b/media-tv/democracy/files/democracy-0.8.5.3-r1-firefox.patch
new file mode 100644
index 000000000..fa8ea3f4d
--- /dev/null
+++ b/media-tv/democracy/files/democracy-0.8.5.3-r1-firefox.patch
@@ -0,0 +1,15 @@
+--- Democracy-0.8.5.3/platform/gtk-x11/setup.py.orig	2006-08-23 01:17:15.000000000 -0400
++++ Democracy-0.8.5.3/platform/gtk-x11/setup.py	2006-08-23 01:28:43.000000000 -0400
+@@ -179,8 +179,11 @@
+ elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+     xpcom = 'mozilla-xpcom'
+     gtkmozembed = 'mozilla-gtkmozembed'
++elif re.search("^firefox-xpcom", packages,re.MULTILINE):
++    xpcom = 'firefox-xpcom'
++    gtkmozembed = 'firefox-gtkmozembed'
+ else:
+-    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
++    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom or firefox-xpcom")
+ mozilla_browser_options = parsePkgConfig("pkg-config" , 
+         "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
+ mozilla_lib_path = parsePkgConfig('pkg-config', 
diff --git a/media-tv/democracy/files/democracy-0.8.5.9999-firefox.patch b/media-tv/democracy/files/democracy-0.8.5.9999-firefox.patch
new file mode 100644
index 000000000..1d9e56bfc
--- /dev/null
+++ b/media-tv/democracy/files/democracy-0.8.5.9999-firefox.patch
@@ -0,0 +1,44 @@
+diff -urN Democracy-2006-07-25/platform/gtk-x11/setup.py Democracy-0.8.5-patched/platform/gtk-x11/setup.py
+--- Democracy-2006-07-25/platform/gtk-x11/setup.py	2006-07-21 05:20:25.000000000 +0930
++++ Democracy-2006-07-25-patched/platform/gtk-x11/setup.py	2006-07-29 11:41:22.000000000 +0930
+@@ -146,10 +146,11 @@
+ 
+     if options_dict is None:
+         options_dict = {
+-            'include_dirs' : [],
++            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
++                              '/usr/lib/mozilla-firefox/include/dom',
++                              '/usr/lib/mozilla-firefox/include/uriloader'],
+             'library_dirs' : [],
+             'libraries' : [],
+-            'extra_compile_args' : []
+         }
+     commandLine = "%s --cflags --libs %s" % (command, components)
+     output = getCommandOutput(commandLine).strip()
+@@ -160,8 +161,6 @@
+             options_dict['library_dirs'].append(rest)
+         elif prefix == '-l':
+             options_dict['libraries'].append(rest)
+-        else:
+-            options_dict['extra_compile_args'].append(comp)
+     return options_dict
+ 
+ #### The fasttypes extension ####
+@@ -172,15 +171,8 @@
+     )
+ 
+ #### MozillaBrowser Extension ####
+-packages = getCommandOutput("pkg-config --list-all")
+-if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
+-    xpcom = 'xulrunner-xpcom'
+-    gtkmozembed = 'xulrunner-gtkmozembed'
+-elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+-    xpcom = 'mozilla-xpcom'
+-    gtkmozembed = 'mozilla-gtkmozembed'
+-else:
+-    raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
++xpcom = 'firefox-xpcom'
++gtkmozembed = 'firefox-gtkmozembed'
+ mozilla_browser_options = parsePkgConfig("pkg-config" , 
+         "gtk+-2.0 glib-2.0 pygtk-2.0 %s %s" % (gtkmozembed, xpcom))
+ mozilla_lib_path = parsePkgConfig('pkg-config', 
diff --git a/media-tv/democracy/files/democracy-as-needed-libX11.patch b/media-tv/democracy/files/democracy-as-needed-libX11.patch
index 711ed296a..f730c14b2 100644
--- a/media-tv/democracy/files/democracy-as-needed-libX11.patch
+++ b/media-tv/democracy/files/democracy-as-needed-libX11.patch
@@ -1,7 +1,7 @@
-diff -ur Democracy-0.8.4.1.orig/platform/gtk-x11/setup.py Democracy-0.8.4.1/platform/gtk-x11/setup.py
---- Democracy-0.8.4.1.orig/platform/gtk-x11/setup.py	2006-06-24 12:49:54.000000000 +0200
-+++ Democracy-0.8.4.1/platform/gtk-x11/setup.py	2006-06-24 12:52:30.000000000 +0200
-@@ -168,7 +168,7 @@
+diff -ur Democracy-2006-07-25.orig/platform/gtk-x11/setup.py Democracy-2006-07-25/platform/gtk-x11/setup.py
+--- Democracy-2006-07-25.orig/platform/gtk-x11/setup.py	2006-06-24 12:49:54.000000000 +0200
++++ Democracy-2006-07-25/platform/gtk-x11/setup.py	2006-06-24 12:52:30.000000000 +0200
+@@ -213,7 +213,7 @@
  
  #### Xine Extension ####
  xine_options = parsePkgConfig('pkg-config', 
diff --git a/media-tv/democracy/files/digest-democracy-0.8.4 b/media-tv/democracy/files/digest-democracy-0.8.4
new file mode 100644
index 000000000..9912131a1
--- /dev/null
+++ b/media-tv/democracy/files/digest-democracy-0.8.4
@@ -0,0 +1,3 @@
+MD5 2afde58224a3ea94a0dfe29303f3d431 Democracy-0.8.4.tar.gz 4902212
+RMD160 03855834a79f7cdab03fc5004236d92b6e581e0c Democracy-0.8.4.tar.gz 4902212
+SHA256 461ac75b59bd6d389aee318de7e46bba89b6eb397ca7f3903d874b7b6f88e162 Democracy-0.8.4.tar.gz 4902212
diff --git a/media-tv/democracy/files/digest-democracy-0.8.5 b/media-tv/democracy/files/digest-democracy-0.8.5
new file mode 100644
index 000000000..8af82daf6
--- /dev/null
+++ b/media-tv/democracy/files/digest-democracy-0.8.5
@@ -0,0 +1,3 @@
+MD5 749736edc9f3fd8d6525697347a40f58 Democracy-0.8.5.tar.gz 4841321
+RMD160 50e03285679c73874537f490027dfac7e094efbb Democracy-0.8.5.tar.gz 4841321
+SHA256 a23ea777df0bb3467b9a25945fde460e31b6b01dd69cbc041658ba3860310583 Democracy-0.8.5.tar.gz 4841321
diff --git a/media-tv/democracy/files/digest-democracy-0.8.5.3 b/media-tv/democracy/files/digest-democracy-0.8.5.3
new file mode 100644
index 000000000..3a41b6873
--- /dev/null
+++ b/media-tv/democracy/files/digest-democracy-0.8.5.3
@@ -0,0 +1,3 @@
+MD5 d9ee290c64fb6537c88c66b4682273fc Democracy-0.8.5.3.tar.gz 4877765
+RMD160 f96f283d0cb994fa21c300578f7a11dfbcaed632 Democracy-0.8.5.3.tar.gz 4877765
+SHA256 9c343fed2d46b0e49124b96a9766934e3d5ed589f5b69b01748bd93395ad2be9 Democracy-0.8.5.3.tar.gz 4877765
diff --git a/media-tv/democracy/files/digest-democracy-0.9.0_rc1 b/media-tv/democracy/files/digest-democracy-0.9.0_rc1
new file mode 100644
index 000000000..ccffa55b7
--- /dev/null
+++ b/media-tv/democracy/files/digest-democracy-0.9.0_rc1
@@ -0,0 +1,3 @@
+MD5 e7b07298bf7fcbc0ae83736e64ec7425 Democracy-0.9.0-rc1.tar.gz 5704016
+RMD160 47a5fa85d25a4a70fcc8e1bda1b696a492b23bd5 Democracy-0.9.0-rc1.tar.gz 5704016
+SHA256 7fb074653d46a52a3fcd080adafa408f6d8d69b7b4894351b6f29b8038d73e9b Democracy-0.9.0-rc1.tar.gz 5704016