media-tv/democracy: Sorry those two files are not used.

svn path=/sunrise/; revision=1176

4 files changed, 9 insertions, 71 deletions

diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog
index 8faf2be0e..da055a165 100644
--- a/media-tv/democracy/ChangeLog
+++ b/media-tv/democracy/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   07 Sep 2006; Jorge Vargas (elpargo) <jorge.vargas@gmail.com>
+  -files/democracy-0.8.5.3-r1-firefox.patch,
+  -files/democracy-0.8.5.9999-firefox.patch:
+  Sorry those two files are not used.
+
+  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,
diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest
index 845efe60b..e1e3047e1 100644
--- a/media-tv/democracy/Manifest
+++ b/media-tv/democracy/Manifest
@@ -10,14 +10,6 @@ AUX democracy-0.8.5.3-firefox.patch 1841 RMD160 bc9e624471cb3c160d62910fd8bba5aa
 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
@@ -47,10 +39,10 @@ EBUILD democracy-0.9.0_rc1.ebuild 1947 RMD160 1d23a86133883914881000641bda655cec
 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 ChangeLog 1563 RMD160 3663179e785638dd0d292e3707bfbd728450f91a SHA1 33018c380ecc22e93fabc5fdba6a0ba60ac71ca4 SHA256 b3e67437a26ae337c928f0ca7b4c4862b9a141324e8318212907cf71d835a309
+MD5 96b6d1b632fa7763074c8a2702664291 ChangeLog 1563
+RMD160 3663179e785638dd0d292e3707bfbd728450f91a ChangeLog 1563
+SHA256 b3e67437a26ae337c928f0ca7b4c4862b9a141324e8318212907cf71d835a309 ChangeLog 1563
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
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
deleted file mode 100644
index fa8ea3f4d..000000000
--- a/media-tv/democracy/files/democracy-0.8.5.3-r1-firefox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 1d9e56bfc..000000000
--- a/media-tv/democracy/files/democracy-0.8.5.9999-firefox.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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',