Added the full elimination of sabayon-version

5 files changed, 27 insertions, 18 deletions

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-sabayon-defaults.patch b/dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch
index 4af6ec65..cc158652 100644
--- a/dev-python/python-report/files/python-report-0.10-sabayon-defaults.patch
+++ b/dev-python/python-report/files/python-report-0.10-kogaion-defaults.patch
@@ -6,7 +6,7 @@ diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__i
      if 'bugURL' in optionsDict:
          return optionsDict["bugURL"]
 -    host = "bugzilla.redhat.com"
-+    host = "bugs.sabayon.org"
++    host = "bugs.rogentos.ro"
      if 'bugzilla_host' in optionsDict:
          host = optionsDict["bugzilla_host"]
 -    return "https://" + host + "/xmlrpc.cgi"
@@ -20,8 +20,8 @@ diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__i
          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",
++            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:
@@ -33,7 +33,7 @@ diff -Nurp python-report-0.10.orig/python/report/templates/RHEL-template/__init_
      if optionsDict.has_key("bugURL"):
          return optionsDict["bugURL"]
 -    host = "bugzilla.redhat.com"
-+    host = "bugs.sabayon.org"
++    host = "bugs.rogentos.ro"
      if optionsDict.has_key("bugzilla_host"):
          host = optionsDict["bugzilla_host"]
 -    return "https://" + host + "/xmlrpc.cgi"
@@ -47,8 +47,8 @@ diff -Nurp python-report-0.10.orig/python/report/templates/RHEL-template/__init_
          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",
++            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.23-sabayon-config.patch b/dev-python/python-report/files/python-report-0.23-kogaion-config.patch
index 32879703..dcc99773 100644
--- a/dev-python/python-report/files/python-report-0.23-sabayon-config.patch
+++ b/dev-python/python-report/files/python-report-0.23-kogaion-config.patch
@@ -4,7 +4,7 @@
  nobase_dist_sysconf_DATA = \
 -report.d/bugzilla.redhat.com.conf \
 -report.d/RHEL-bugzilla.redhat.com.conf \
-+report.d/bugs.sabayon.org.conf \
++report.d/bugs.rogentos.ro.conf \
  report.conf \
  report.d/ftp.conf \
  report.d/scp.conf \
@@ -14,22 +14,22 @@
 +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
+--- a/etc/report.d/bugs.rogentos.ro.conf
++++ b/etc/report.d/bugs.rogentos.ro.conf
 @@ -0,0 +1,7 @@
-+[bugs.sabayon.org]
++[bugs.rogentos.ro]
 +# plugin
 +plugin=bugzilla
 +
 +# rhbz url
-+bugzilla_host=bugs.sabayon.org
++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.sabayon.org.
++    A Report plugin to send a report to bugs.rogentos.ro.
      Copyright (C) 2009 Red Hat, Inc
  
      Author(s): Gavin Romig-Koch <gavin@redhat.com>
@@ -38,7 +38,7 @@
      if 'bugURL' in optionsDict:
          return optionsDict["bugURL"]
 -    host = "bugzilla.redhat.com"
-+    host = "bugs.sabayon.org"
++    host = "bugs.rogentos.ro"
      if 'bugzilla_host' in optionsDict:
          host = optionsDict["bugzilla_host"]
      return "https://" + host + "/xmlrpc.cgi"
@@ -48,8 +48,8 @@
  
 -            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",
++            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/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