dev-python/python-report: fix 0.23 patches

6 files changed, 8 insertions, 64 deletions

diff --git a/dev-python/python-report/Manifest b/dev-python/python-report/Manifest
index 625a679..7b618ef 100644
--- a/dev-python/python-report/Manifest
+++ b/dev-python/python-report/Manifest
@@ -1,9 +1,8 @@
-AUX bugs.sabayon.org.ini 171 RMD160 87fd58ee98c30e9924c569e65bbf7c4b03707095 SHA1 d3769ff4c5d2418bab0128291d337d535ba66b16 SHA256 84060de5c596e836a58d166c12fc373852cfe104da78853b4499acebbc3e92b5
+AUX bugs.gentoo.org.ini 169 RMD160 48cc8450ef9d80ef70318a2d245ac3896b423085 SHA1 9b235d9541ac8443e3b654859c403130b0a50377 SHA256 ac5db04e9a9747c82851ad4fa859b371217059a7846b17c6d1896ffe0d48dbeb
 AUX python-report-0.10-disable-rpm.patch 1292 RMD160 816b671a5418a25f5c3d2874de98eed5bb962127 SHA1 649c42b4c17e03b015badb0c8a70215350111b39 SHA256 38633e72b7265580a33b118deddb3f6cae932f6935a9c40f73fa4ec3e1dab990
 AUX python-report-0.10-fix-version-detection.patch 1038 RMD160 39db9d2b7835a5e5902946e5e623dad3608d3acd SHA1 41ce2a64447e23e7612a1f5b28da953fd96e2233 SHA256 a6e61621ac0a0d3eb0f906e78b6726eee357f0213b41b68e2a1efe4f8788c545
 AUX python-report-0.10-sabayon-defaults.patch 2816 RMD160 16cd841db8789c664c5a3cc2d595e735ecf0fa6b SHA1 3b0ef79a491c5e4bd91d16fee35392762c244e68 SHA256 7e662cea4143c5d3f27646c6250cf57f3e91b29d58bb0aff883e60e1d1478830
-AUX python-report-0.23-disable-rpm.patch 1292 RMD160 816b671a5418a25f5c3d2874de98eed5bb962127 SHA1 649c42b4c17e03b015badb0c8a70215350111b39 SHA256 38633e72b7265580a33b118deddb3f6cae932f6935a9c40f73fa4ec3e1dab990
-AUX python-report-0.23-fix-version-detection.patch 1038 RMD160 39db9d2b7835a5e5902946e5e623dad3608d3acd SHA1 41ce2a64447e23e7612a1f5b28da953fd96e2233 SHA256 a6e61621ac0a0d3eb0f906e78b6726eee357f0213b41b68e2a1efe4f8788c545
-AUX python-report-0.23-sabayon-defaults.patch 2816 RMD160 16cd841db8789c664c5a3cc2d595e735ecf0fa6b SHA1 3b0ef79a491c5e4bd91d16fee35392762c244e68 SHA256 7e662cea4143c5d3f27646c6250cf57f3e91b29d58bb0aff883e60e1d1478830
+AUX python-report-0.23-disable-rpm.patch 1292 RMD160 d2c0f4850fd164e5189b7ba82670ab4175ee197c SHA1 f575707f201a5d7ca34dd64c7b68a8aae07457cf SHA256 90033bfb2be73b5a7db6e8df28fe3d07607243bddac90d02797c06d54439e252
+AUX python-report-0.23-fix-version-detection.patch 1038 RMD160 5f19d77189c6e49ef3d861a175f57bb32eaafcfe SHA1 73e05a342ca400fe07cab2dc601eb81551bccf80 SHA256 aab8bf0581f588df16b521e99061b68180c2c27f5feb8f442284081edab7c7e7
 EBUILD python-report-0.10-r1.ebuild 1625 RMD160 c75181e9f255443ac05250e6e09837f68d8149b7 SHA1 14c8a07e1941780074ab9eb7eb7f2162946fd383 SHA256 ddabf039882ae47a4c2c0615f3f8420010f6663df16b816c59a1d7efce701627
-EBUILD python-report-0.23.ebuild 1625 RMD160 c75181e9f255443ac05250e6e09837f68d8149b7 SHA1 14c8a07e1941780074ab9eb7eb7f2162946fd383 SHA256 ddabf039882ae47a4c2c0615f3f8420010f6663df16b816c59a1d7efce701627
+EBUILD python-report-0.23.ebuild 1575 RMD160 184c7bd64302edca629a4a9bc834f0971f87a6b4 SHA1 3f2ba032290cbdd78502870855c8a63b3725a89f SHA256 c97c40d66d8aa1f8d60b49ffb41892eb5287f587b2f1cfbccb4ae141b50e03c8
diff --git a/dev-python/python-report/files/bugs.sabayon.org.ini b/dev-python/python-report/files/bugs.gentoo.org.ini
index 9fa2982..4498ad9 100644
--- a/dev-python/python-report/files/bugs.sabayon.org.ini
+++ b/dev-python/python-report/files/bugs.gentoo.org.ini
@@ -1,9 +1,9 @@
-[bugs.sabayon.org]
+[bugs.gentoo.org]
 # template
 template=bugzilla-template
 
 # rhbz url
-bugzilla_host=bugs.sabayon.org
+bugzilla_host=bugs.gentoo.org
 
 # rhbz login, a password is always asked.
 # username=user@example.com
diff --git a/dev-python/python-report/files/python-report-0.23-disable-rpm.patch b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch
index 501bb70..464b8fb 100644
--- a/dev-python/python-report/files/python-report-0.23-disable-rpm.patch
+++ b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch
@@ -1,4 +1,4 @@
-diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py
+diff -Nurp python-report-0.23.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.23/python/report/templates/bugzilla-template/__init__.py
 --- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py	2010-04-02 19:32:19.729109477 +0200
 +++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py	2010-04-02 19:32:54.640917830 +0200
 @@ -106,7 +106,6 @@ import filer
diff --git a/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch b/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch
index d8f9b95..c83d842 100644
--- a/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch
+++ b/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch
@@ -1,4 +1,4 @@
-diff -Nurp python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py python-report-0.10/python/report/templates/bugzilla-template/filer.py
+diff -Nurp python-report-0.23.orig//python/report/templates/bugzilla-template/filer.py python-report-0.23/python/report/templates/bugzilla-template/filer.py
 --- python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py	2010-04-13 23:08:08.849090647 +0200
 +++ python-report-0.10/python/report/templates/bugzilla-template/filer.py	2010-04-13 23:09:20.799052132 +0200
 @@ -61,15 +61,11 @@ def getVersion():
diff --git a/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch b/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch
deleted file mode 100644
index 4af6ec6..0000000
--- a/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py
---- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py	2010-04-02 18:46:19.862030189 +0200
-+++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py	2010-04-02 18:56:47.102924468 +0200
-@@ -55,10 +55,10 @@ def displayURL(optionsDict):
- def bugURL(optionsDict):
-     if 'bugURL' in optionsDict:
-         return optionsDict["bugURL"]
--    host = "bugzilla.redhat.com"
-+    host = "bugs.sabayon.org"
-     if 'bugzilla_host' in optionsDict:
-         host = optionsDict["bugzilla_host"]
--    return "https://" + host + "/xmlrpc.cgi"
-+    return "http://" + host + "/xmlrpc.cgi"
- 
- def report(signature, io, optionsDict):
-     if not io:
-@@ -130,8 +130,8 @@ def sendToBugzilla(component, signature,
- 
-     try:
-         if not bzfiler:
--            bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi",
--                                          "http://bugzilla.redhat.com",
-+            bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi",
-+                                          "http://bugs.sabayon.org",
-                                           filer.getVersion(), filer.getProduct())
- 
-         if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl:
-diff -Nurp python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py python-report-0.10/python/report/templates/RHEL-template/__init__.py
---- python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py	2010-04-02 18:46:19.862030189 +0200
-+++ python-report-0.10/python/report/templates/RHEL-template/__init__.py	2010-04-02 18:56:33.214921519 +0200
-@@ -55,10 +55,10 @@ def displayURL(optionsDict):
- def bugURL(optionsDict):
-     if optionsDict.has_key("bugURL"):
-         return optionsDict["bugURL"]
--    host = "bugzilla.redhat.com"
-+    host = "bugs.sabayon.org"
-     if optionsDict.has_key("bugzilla_host"):
-         host = optionsDict["bugzilla_host"]
--    return "https://" + host + "/xmlrpc.cgi"
-+    return "http://" + host + "/xmlrpc.cgi"
- 
- def report(signature, io, optionsDict):
-     if not io:
-@@ -131,8 +131,8 @@ def sendToBugzilla( component, hashmarke
- 
-     try:
-         if not bzfiler:
--            bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi",
--                                          "http://bugzilla.redhat.com",
-+            bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi",
-+                                          "http://bugs.sabayon.org",
-                                           filer.getVersion(), filer.getProduct())
- 
-         if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl:
diff --git a/dev-python/python-report/python-report-0.23.ebuild b/dev-python/python-report/python-report-0.23.ebuild
index 7bbd08b..ac236de 100644
--- a/dev-python/python-report/python-report-0.23.ebuild
+++ b/dev-python/python-report/python-report-0.23.ebuild
@@ -25,7 +25,6 @@ RDEPEND="dev-libs/openssl
 
 src_prepare() {
 
-	epatch "${FILESDIR}"/${P}-sabayon-defaults.patch
 	epatch "${FILESDIR}"/${P}-disable-rpm.patch
 	epatch "${FILESDIR}"/${P}-fix-version-detection.patch