x11-misc/driconf: Remove last-rited package

Closes: https://bugs.gentoo.org/708134
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/profiles/package.mask b/profiles/package.mask
index 0d364a60b3f78ee1a589d27f6838951fe9b4778c..db0f2ce52a5f3df2eb16f7f4ff670fbe268d3aff 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -496,11 +496,6 @@ media-gfx/mirage
 # See bugs #546024, #706486. Masked for removal in 30 days.
 gnome-extra/nautilus-dropbox
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-19)
-# Last release in 2006, py2-only, blocks dev-python/pygtk removal, bug #708134
-# Masked for removal in 30 days.
-x11-misc/driconf
-
 # Michał Górny <mgorny@gentoo.org> (2020-02-18)
 # Dead and unmaintained.  Last release in 2015.  Broken with newer
 # versions of Python 3.  No reverse dependencies left.

diff --git a/x11-misc/driconf/Manifest b/x11-misc/driconf/Manifest
deleted file mode 100644 (file)
index e9c21e9..0000000
--- a/x11-misc/driconf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST driconf-0.9.1.tar.gz 112529 BLAKE2B 05adc545bdc584c8569e7e139703c1c6726157cb00aa5c61355bdd8dabf49e3f7c4e1982ee34482259934d4593b86d66ae60d28238114a72bd7021abecdd3e6c SHA512 659c857fd490384cb807d6f909fcf6a0e64b9245597c43b14a793a65934f3df6ab30770b45a4180279ff9ef4b74bf7d5253a6560fcd8b15df35a76b795b6c369

diff --git a/x11-misc/driconf/driconf-0.9.1-r2.ebuild b/x11-misc/driconf/driconf-0.9.1-r2.ebuild
deleted file mode 100644 (file)
index dd0e152..0000000
--- a/x11-misc/driconf/driconf-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="driconf is a GTK+2 GUI configurator for DRI"
-HOMEPAGE="https://dri.freedesktop.org/wiki/DriConf"
-SRC_URI="https://freedesktop.org/~fxkuehl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-       dev-python/pygtk:2[${PYTHON_USEDEP}]
-       x11-apps/xdriinfo"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG COPYING PKG-INFO README TODO )
-PATCHES=(
-       "${FILESDIR}"/${P}-glxinfo-unicode.patch
-       "${FILESDIR}"/${P}-update-toolbar-methods.patch
-       "${FILESDIR}"/${P}-driconf_simpleui.py.patch
-       "${FILESDIR}"/${P}-desktop-menu.patch
-       "${FILESDIR}"/${P}-drop-old-tooltips.patch
-)
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       # Fix install locations which breaks location policy - Josh_B
-       sed -i \
-               -e 's:/usr/local:/usr:g' \
-               driconf \
-               driconf.desktop \
-               driconf.py \
-               setup.cfg \
-               setup.py \
-               || die "Sed failed!"
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       domenu driconf.desktop
-}

diff --git a/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch b/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch
deleted file mode 100644 (file)
index a8ca984..0000000
--- a/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/driconf.desktop  2006-09-18 04:41:45.000000000 +0300
-+++ b/driconf.desktop  2017-02-05 13:14:11.319444931 +0200
-@@ -5,5 +5,5 @@
- Exec=driconf
- Icon=/usr/local/share/driconf/driconf-icon.png
- Type=Application
--Categories=GNOME;Application;Settings;AdvancedSettings;
-+Categories=GNOME;Settings;HardwareSettings;
- StartupNotify=true

diff --git a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
deleted file mode 100644 (file)
index 71403cd..0000000
--- a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_simpleui.py
-+++ b/driconf_simpleui.py
-@@ -266,8 +266,8 @@
-                     j = i
-                     break
-                 i = i - 1
--            if i < chars/3:
--                i = chars
-+            else:
-+                i = j = chars
-             head, tail = head + tail[:i] + '\n', tail[j:]
-     return head
- 
-

diff --git a/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch b/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch
deleted file mode 100644 (file)
index 65291de..0000000
--- a/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ur driconf-0.9.1-old/driconf_commonui.py driconf-0.9.1/driconf_commonui.py
---- a/driconf_commonui.py      2006-09-18 04:03:43.000000000 +0200
-+++ b/driconf_commonui.py      2011-01-09 21:09:43.000000000 +0100
-@@ -299,8 +299,7 @@
-             self.label.set_active (page.app.options.has_key (opt.name))
-             self.label.set_sensitive (page.app.device.config.writable)
-             self.label.connect ("clicked", self.checkOpt)
--        tooltipString = str(opt)
--        page.tooltips.set_tip (self.label, tooltipString)
-+        self.label.set_tooltip_text (str(opt))
-         self.label.show()
-         page.table.attach (self.label, 0, 1, i, i+1,
-                            gtk.EXPAND|gtk.FILL, 0, 5, 5)
-@@ -316,10 +315,10 @@
-         self.resetButton.set_relief (gtk.RELIEF_NONE)
-         self.resetButton.set_sensitive (sensitive)
-         if removable:
--            page.tooltips.set_tip(self.resetButton, _("Remove"))
-+            self.resetButton.set_tooltip_text(_("Remove"))
-             self.resetButton.connect ("clicked", self.removeOpt)
-         else:
--            page.tooltips.set_tip(self.resetButton, _("Reset to default value"))
-+            self.resetButton.set_tooltip_text(_("Reset to default value"))
-             self.resetButton.connect ("clicked", self.resetOpt)
-         self.resetButton.show()
-         page.table.attach (self.resetButton, 2, 3, i, i+1, 0, 0, 5, 5)
-@@ -510,7 +509,6 @@
-         self.optSection = optSection
-         self.app = app
-         self.simple = simple
--        self.tooltips = gtk.Tooltips()
-         self.table = gtk.Table (len(optSection.optList), 3)
-         self.optLines = []
-         for i in range (len(optSection.optList)):
-diff -ur driconf-0.9.1-old/driconf_complexui.py driconf-0.9.1/driconf_complexui.py
---- a/driconf_complexui.py     2006-09-18 02:53:44.000000000 +0200
-+++ b/driconf_complexui.py     2011-01-09 21:10:29.000000000 +0100
-@@ -41,11 +41,10 @@
-         self.set_label_widget (frameLabel)
-         self.driver = driver
-         self.app = app
--        tooltips = gtk.Tooltips()
-         table = gtk.Table(2, 2)
-         self.execCheck = WrappingCheckButton (_("Apply only to this executable"))
-         self.execCheck.set_sensitive (app.device.config.writable)
--        tooltips.set_tip (self.execCheck, _(
-+        self.execCheck.set_tooltip_text (_(
-             "Leave this disabled to configure all applications.\n"
-             "Beware that some applications or games are just a shell script "
-             "that starts a real executable with a different name."))
-diff -ur driconf-0.9.1-old/driconf_simpleui.py driconf-0.9.1/driconf_simpleui.py
---- a/driconf_simpleui.py      2006-09-18 02:49:54.000000000 +0200
-+++ b/driconf_simpleui.py      2011-01-09 21:10:51.000000000 +0100
-@@ -342,7 +342,6 @@
-         self.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-         self.driver = driver
-         self.app = app
--        self.tooltips = gtk.Tooltips()
-         self.table = None
-         self.refreshOptions()
- 

diff --git a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
deleted file mode 100644 (file)
index 2df25d5..0000000
--- a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_simpleui.py
-+++ b/driconf_simpleui.py
-@@ -450,11 +450,13 @@ class MainWindow (gtk.Window):
-         else:
-             screen = self.screens[0]
-             if screen.glxInfo:
--                text = "%s (%s)" % (
--                    screen.glxInfo.renderer, screen.glxInfo.vendor)
-+                text = u"%s (%s)" % (
-+                    unicode(screen.glxInfo.renderer, "utf-8", "replace"),
-+                    unicode(screen.glxInfo.vendor, "utf-8", "replace"))
-             else:
--                text = _("Screen") + " %d: %s" % (
--                    screen.num, screen.driver.name.capitalize())
-+                text = _(u"Screen") + u" %d: %s" % (screen.num,
-+                    unicode(screen.driver.name, "utf-8",
-+                        "replace").capitalize())
-             deviceHBox = gtk.HBox()
-             deviceLabel = gtk.Label()
-             deviceLabel.set_justify(gtk.JUSTIFY_LEFT)

diff --git a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
deleted file mode 100644 (file)
index 294c262..0000000
--- a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
-
---- a/driconf_complexui.py
-+++ b/driconf_complexui.py
-@@ -838,42 +838,73 @@ class MainWindow (gtk.Window):
-         self.paned.show()
-         self.toolbar = gtk.Toolbar ()
-         iconSize = self.toolbar.get_icon_size()
--        self.saveButton = self.toolbar.insert_stock (
--            "gtk-save", _("Save selected configuration file"),
--            "priv", self.configTree.saveConfig, None, -1)
--        self.reloadButton = self.toolbar.insert_stock (
--            "gtk-revert-to-saved", _("Reload selected configuration file"),
--            "priv", self.configTree.reloadConfig, None, -1)
--        self.toolbar.append_space()
--        self.newButton = self.toolbar.insert_stock (
--            "gtk-new", _("Create a new device or application"),
--            "priv", self.configTree.newItem, None, -1)
--        self.removeButton = self.toolbar.insert_stock (
--            "gtk-delete", _("Remove selected device or application"),
--            "priv", self.configTree.removeItem, None, -1)
--        self.upButton = self.toolbar.insert_stock (
--            "gtk-go-up", _("Move selected item up"),
--            "priv", self.configTree.moveUp, None, -1)
--        self.downButton = self.toolbar.insert_stock (
--            "gtk-go-down", _("Move selected item down"),
--            "priv", self.configTree.moveDown, None, -1)
--        self.propertiesButton = self.toolbar.insert_stock (
--            "gtk-properties", _("Properties of selected device or application"),
--            "priv", self.configTree.properties, None, -1)
--        self.toolbar.append_space()
-+
-+        self.saveButton = gtk.ToolButton("gtk-save")
-+        self.saveButton.set_tooltip_text(_("Save selected configuration file"))
-+        self.saveButton.connect("clicked", self.configTree.saveConfig)
-+        self.saveButton.show()
-+        self.toolbar.insert(self.saveButton, -1)
-+        self.reloadButton = gtk.ToolButton("gtk-revert-to-saved")
-+        self.reloadButton.set_tooltip_text(_("Reload selected configuration file"))
-+        self.reloadButton.connect("clicked", self.configTree.reloadConfig)
-+        self.reloadButton.show()
-+        self.toolbar.insert(self.reloadButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-+        self.newButton = gtk.ToolButton("gtk-new")
-+        self.newButton.set_tooltip_text(_("Create a new device or application"))
-+        self.newButton.connect("clicked", self.configTree.newItem)
-+        self.newButton.show()
-+        self.toolbar.insert(self.newButton, -1)
-+        self.removeButton = gtk.ToolButton("gtk-delete")
-+        self.removeButton.set_tooltip_text(_("Remove selected device or application"))
-+        self.removeButton.connect("clicked", self.configTree.removeItem)
-+        self.removeButton.show()
-+        self.toolbar.insert(self.removeButton, -1)
-+        self.upButton = gtk.ToolButton("gtk-go-up")
-+        self.upButton.set_tooltip_text(_("Move selected item up"))
-+        self.upButton.connect("clicked", self.configTree.moveUp)
-+        self.upButton.show()
-+        self.toolbar.insert(self.upButton, -1)
-+        self.downButton = gtk.ToolButton("gtk-go-down")
-+        self.downButton.set_tooltip_text(_("Move selected item down"))
-+        self.downButton.connect("clicked", self.configTree.moveDown)
-+        self.downButton.show()
-+        self.toolbar.insert(self.downButton, -1)
-+        self.propertiesButton = gtk.ToolButton("gtk-properties")
-+        self.propertiesButton.set_tooltip_text(_("Properties of selected device or application"))
-+        self.propertiesButton.connect("clicked", self.configTree.properties)
-+        self.propertiesButton.show()
-+        self.toolbar.insert(self.propertiesButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-         # The gtk-about stock item is available with gtk >= 2.6.
-         # It's definitely not available with gtk 2.2. Not sure about 2.4.
-         if gtk.gtk_version[0] == 2 and gtk.gtk_version[1] < 6:
-             aboutStock = "gtk-dialog-info"
-         else:
-             aboutStock = "gtk-about"
--        self.aboutButton = self.toolbar.insert_stock (
--            aboutStock, _("About DRIconf"), "priv",
--            self.aboutHandler, None, -1)
--        self.toolbar.append_space()
--        self.exitButton = self.toolbar.insert_stock (
--            "gtk-quit", _("Exit DRIconf"), "priv",
--            self.exitHandler, None, -1)
-+        self.aboutButton = gtk.ToolButton(aboutStock)
-+        self.aboutButton.set_tooltip_text(_("About DRIconf"))
-+        self.aboutButton.connect("clicked", self.aboutHandler)
-+        self.aboutButton.show()
-+        self.toolbar.insert(self.aboutButton, -1)
-+
-+        separator = gtk.SeparatorToolItem()
-+        separator.show()
-+        self.toolbar.insert(separator, -1)
-+
-+        self.exitButton = gtk.ToolButton("gtk-quit")
-+        self.exitButton.set_tooltip_text(_("Exit DRIconf"))
-+        self.exitButton.connect("clicked", self.exitHandler)
-+        self.exitButton.show()
-+        self.toolbar.insert(self.exitButton, -1)
-         if len(configList) != 0:
-             self.activateConfigButtons (configList[0])
-         self.toolbar.show()

diff --git a/x11-misc/driconf/metadata.xml b/x11-misc/driconf/metadata.xml
deleted file mode 100644 (file)
index 7a7bbf8..0000000
--- a/x11-misc/driconf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>x11@gentoo.org</email>
-               <name>X11</name>
-       </maintainer>
-</pkgmetadata>