From 5a01792340999d37435f5000a3f6b8e0f2d11815 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 7 Nov 2014 12:54:17 +0200 Subject: Added the full elimination of sabayon-version --- .../python-report/files/bugs.rogentos.ro.ini | 9 ++++ .../python-report-0.10-kogaion-defaults.patch | 54 +++++++++++++++++++++ .../python-report-0.10-sabayon-defaults.patch | 54 --------------------- .../files/python-report-0.23-kogaion-config.patch | 55 ++++++++++++++++++++++ .../files/python-report-0.23-sabayon-config.patch | 55 ---------------------- .../python-report/python-report-0.10-r1.ebuild | 2 +- dev-python/python-report/python-report-0.23.ebuild | 4 +- 7 files changed, 121 insertions(+), 112 deletions(-) create mode 100644 dev-python/python-report/files/bugs.rogentos.ro.ini create mode 100644 dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch delete mode 100644 dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch create mode 100644 dev-python/python-report/files/python-report-0.23-kogaion-config.patch delete mode 100644 dev-python/python-report/files/python-report-0.23-sabayon-config.patch (limited to 'dev-python') diff --git a/dev-python/python-report/files/bugs.rogentos.ro.ini b/dev-python/python-report/files/bugs.rogentos.ro.ini new file mode 100644 index 00000000..2bb98c9c --- /dev/null +++ b/dev-python/python-report/files/bugs.rogentos.ro.ini @@ -0,0 +1,9 @@ +[bugs.rogentos.ro] +# template +template=bugzilla-template + +# rhbz url +bugzilla_host=bugs.rogentos.ro + +# rhbz login, a password is always asked. +# username=user@example.com diff --git a/dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch b/dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch new file mode 100644 index 00000000..cc158652 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch @@ -0,0 +1,54 @@ +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.rogentos.ro" + 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.rogentos.ro/xmlrpc.cgi", ++ "http://bugs.rogentos.ro", + 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.rogentos.ro" + 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.rogentos.ro/xmlrpc.cgi", ++ "http://bugs.rogentos.ro", + filer.getVersion(), filer.getProduct()) + + if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: diff --git a/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch b/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch deleted file mode 100644 index 4af6ec65..00000000 --- a/dev-python/python-report/files/python-report-0.10-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/files/python-report-0.23-kogaion-config.patch b/dev-python/python-report/files/python-report-0.23-kogaion-config.patch new file mode 100644 index 00000000..dcc99773 --- /dev/null +++ b/dev-python/python-report/files/python-report-0.23-kogaion-config.patch @@ -0,0 +1,55 @@ +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -1,11 +1,9 @@ + nobase_dist_sysconf_DATA = \ +-report.d/bugzilla.redhat.com.conf \ +-report.d/RHEL-bugzilla.redhat.com.conf \ ++report.d/bugs.rogentos.ro.conf \ + report.conf \ + report.d/ftp.conf \ + report.d/scp.conf \ + report.d/localsave.conf \ +-report.d/strata-test.conf \ +-report.d/RHEL.conf ++report.d/strata-test.conf + + dist_man_MANS = report.conf.5 +--- a/etc/report.d/bugs.rogentos.ro.conf ++++ b/etc/report.d/bugs.rogentos.ro.conf +@@ -0,0 +1,7 @@ ++[bugs.rogentos.ro] ++# plugin ++plugin=bugzilla ++ ++# rhbz url ++bugzilla_host=bugs.rogentos.ro ++ +--- a/python/report/plugins/bugzilla/__init__.py ++++ b/python/report/plugins/bugzilla/__init__.py +@@ -1,5 +1,5 @@ + """ +- A Report plugin to send a report to bugzilla.redhat.com. ++ A Report plugin to send a report to bugs.rogentos.ro. + Copyright (C) 2009 Red Hat, Inc + + Author(s): Gavin Romig-Koch +@@ -54,7 +54,7 @@ def displayURL(optionsDict): + def bugURL(optionsDict): + if 'bugURL' in optionsDict: + return optionsDict["bugURL"] +- host = "bugzilla.redhat.com" ++ host = "bugs.rogentos.ro" + if 'bugzilla_host' in optionsDict: + host = optionsDict["bugzilla_host"] + return "https://" + host + "/xmlrpc.cgi" +@@ -149,8 +149,8 @@ def sendToBugzilla(component, signature, + else: + version = filer.getVersion() + +- bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", +- "http://bugzilla.redhat.com", ++ bzfiler = filer.BugzillaFiler("https://bugs.rogentos.ro/xmlrpc.cgi", ++ "http://bugs.rogentos.ro", + version, product) + + if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: diff --git a/dev-python/python-report/files/python-report-0.23-sabayon-config.patch b/dev-python/python-report/files/python-report-0.23-sabayon-config.patch deleted file mode 100644 index 32879703..00000000 --- a/dev-python/python-report/files/python-report-0.23-sabayon-config.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/etc/Makefile.am -+++ b/etc/Makefile.am -@@ -1,11 +1,9 @@ - nobase_dist_sysconf_DATA = \ --report.d/bugzilla.redhat.com.conf \ --report.d/RHEL-bugzilla.redhat.com.conf \ -+report.d/bugs.sabayon.org.conf \ - report.conf \ - report.d/ftp.conf \ - report.d/scp.conf \ - report.d/localsave.conf \ --report.d/strata-test.conf \ --report.d/RHEL.conf -+report.d/strata-test.conf - - dist_man_MANS = report.conf.5 ---- a/etc/report.d/bugs.sabayon.org.conf -+++ b/etc/report.d/bugs.sabayon.org.conf -@@ -0,0 +1,7 @@ -+[bugs.sabayon.org] -+# plugin -+plugin=bugzilla -+ -+# rhbz url -+bugzilla_host=bugs.sabayon.org -+ ---- a/python/report/plugins/bugzilla/__init__.py -+++ b/python/report/plugins/bugzilla/__init__.py -@@ -1,5 +1,5 @@ - """ -- A Report plugin to send a report to bugzilla.redhat.com. -+ A Report plugin to send a report to bugs.sabayon.org. - Copyright (C) 2009 Red Hat, Inc - - Author(s): Gavin Romig-Koch -@@ -54,7 +54,7 @@ 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" -@@ -149,8 +149,8 @@ def sendToBugzilla(component, signature, - else: - version = filer.getVersion() - -- bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", -- "http://bugzilla.redhat.com", -+ bzfiler = filer.BugzillaFiler("https://bugs.sabayon.org/xmlrpc.cgi", -+ "http://bugs.sabayon.org", - version, product) - - if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: diff --git a/dev-python/python-report/python-report-0.10-r1.ebuild b/dev-python/python-report/python-report-0.10-r1.ebuild index 52260467..b2c37da1 100644 --- a/dev-python/python-report/python-report-0.10-r1.ebuild +++ b/dev-python/python-report/python-report-0.10-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND="dev-libs/openssl src_prepare() { - epatch "${FILESDIR}"/${P}-sabayon-defaults.patch + epatch "${FILESDIR}"/${P}-kogaion-defaults.patch epatch "${FILESDIR}"/${P}-disable-rpm.patch epatch "${FILESDIR}"/${P}-fix-version-detection.patch diff --git a/dev-python/python-report/python-report-0.23.ebuild b/dev-python/python-report/python-report-0.23.ebuild index 537701dd..071d301a 100644 --- a/dev-python/python-report/python-report-0.23.ebuild +++ b/dev-python/python-report/python-report-0.23.ebuild @@ -22,11 +22,11 @@ DEPEND="app-arch/rpm RDEPEND="dev-libs/openssl net-misc/curl dev-libs/libxml2 - >=app-misc/rogentos-version-1" + >=app-misc/kogaion-version-14.05-r1" src_prepare() { - epatch "${FILESDIR}"/${P}-sabayon-config.patch + epatch "${FILESDIR}"/${P}-kogaion-config.patch epatch "${FILESDIR}"/${P}-disable-rpm.patch epatch "${FILESDIR}"/${P}-disable-Werror.patch -- cgit v1.2.3