reinit the tree, so we can have metadata

8 files changed, 285 insertions, 0 deletions

diff --git a/x11-misc/driconf/Manifest b/x11-misc/driconf/Manifest
new file mode 100644
index 000000000000..6946d0b743c3
--- /dev/null
+++ b/x11-misc/driconf/Manifest
@@ -0,0 +1,10 @@
+AUX driconf-0.9.1-desktop-menu.patch 334 SHA256 92d1d3af2189feecea5c4b1c16e978a24c7be388cd9e092fad83aa0b659ba1ec SHA512 e5a752ea15a998b0a862a8db96008633d7fa23cbd51051b824bde4165c0258eabc9ab3ddde306596821dad7aba619219736e6f6c87e5b904eaea30dbddfa5bfc WHIRLPOOL 28216f7fd0c24766ad63884f4cd31714da93a0a4d8cdb2f57ca3585842359dd14ce30bdbd738cc1459ad06d0916107ecddbf0083094909b92447cc4886feb330
+AUX driconf-0.9.1-driconf_simpleui.py.patch 395 SHA256 454ea3eb9448de7a0aed9c96d234db18e7e5ff4509733b5333d52934f49f22a3 SHA512 e1301471e5b2173b0bc55ad93b0df753ca74f0074afff8bf44a6da74e7060bbcfb53b9d294991bfcd81658f5594d1242ac61f0fde0d844729c1505991a1054c8 WHIRLPOOL 6bff51f4893c7884aecce1ed9ade88f2009cf107860da94e8e60bbd7272dcf9c5007026c7c428cd957f83e543eca7f6afc991995180ca6864011dbf7a02d0b71
+AUX driconf-0.9.1-drop-old-tooltips.patch 2986 SHA256 c032845631b83e71b4b828d626e19b47be3f4764620636ebb11c56c14f1bc760 SHA512 c2ac22f7c3ffffb07f2c996f8f2c88d4f4807d28334ff0992b40e2f8f13e22e902805852f996045474d3488e359bac49a97f10f970e8d1e5952e882a604d0847 WHIRLPOOL 5719f7e603b552802e34fab96b33d5e220ff6aca988e2f7e20025c9f2d37e6f3883a522b75b4f392035670738d5032b8af2b496948e3312a6acfc6d5160f9844
+AUX driconf-0.9.1-glxinfo-unicode.patch 982 SHA256 fb4736a4e9067214dc9110737d6edf4c62020ca5827cfba13a3bd461190a5072 SHA512 b7e5711562cfe1bdc52f615dfab16e4861687c8861f1a3052f4279294cae5e14caea051b6db84142a2b182f5722d01d40592ea9b3e09240143f2d82866947560 WHIRLPOOL 31842c59151b20c4935b2129b955b8ea3188c82d44d2a3aed326d613b7e9b0ab212be8909979554495b0e99878ecd7755b6e8d8ba5a513122b73ca0b229a3bbf
+AUX driconf-0.9.1-update-toolbar-methods.patch 5337 SHA256 f7b8728d413fcd206a8608c0a923a3ebb00db85232656260793b1c5fba7b5382 SHA512 76edf7d171d11aba68ad0cc9114d90ea9637134288494729aefcfb09f7af4292aa7174df8551c3ed6d04e8cb8a04afca5ed2e0ebef117c24a540f2c7e7fa60c4 WHIRLPOOL 45ce6adbec96ebeed800e3deaf546ec33a289b0632ecd53c8b202359c29fa36618f82813d15119ab8546290904f6eef374eed08800a604745077608930039faa
+DIST driconf-0.9.1.tar.gz 112529 SHA256 4849a43f6324498e943c03777bce571229b5446985b1cec596b365505e76f73f SHA512 659c857fd490384cb807d6f909fcf6a0e64b9245597c43b14a793a65934f3df6ab30770b45a4180279ff9ef4b74bf7d5253a6560fcd8b15df35a76b795b6c369 WHIRLPOOL f3ca59cfad78a6e80c037f34fcfb75034f730e8973810af855762d50275de8d746e8197b1341100a9a59c872b4e1ae05a5bbb63f491746ef52fe0c58529c5abb
+EBUILD driconf-0.9.1-r2.ebuild 1165 SHA256 bb3c8b0e532397b6a1d5e930b34cc4e08f24c69471e414d82c53ca279d745b6e SHA512 b8c451a60137f8faaaef43b284c0bbf7ec0c06e14e533c88e5558a5f13bdbb9e3b40ec535d7daa48d2dd2e74ca3122ac2890e69dbb1b90dc56e7680019c66696 WHIRLPOOL f08ef8e06cd6b42c57afd82edc45386a3b6632e8bdf1006e13b8b792a7fef51712e00437a5bee1174add74e20b7cd1c69b3e3ccbb51983d38306e5623b129e79
+MISC ChangeLog 3372 SHA256 b1235fd4df9b4950249719ec1ec559c96d4b30dbdc9f93fb9f12ca58e7f42752 SHA512 994436b0105d0707d85f33d9729f7f40f332377d67aa0f63191003cb841152a2ef5459f69248f32bea8c43cdfaa9865dadcf4f376f7ae82b40d4cf9b9818252b WHIRLPOOL 34671ca59e47a4636a276b143990f31069981aa1b1136d8f425b94fbdc1905988c107344e5af3c2043a6bddd5d8a3dfecf7dc11643c56db4b001876ab41c4254
+MISC ChangeLog-2015 3945 SHA256 5303c3ac92fa7b3c44ab013e0944e47a2082b29eb91fe3675e42540917a9bf86 SHA512 440049d81e87f219023ba965133b4b1b53503a65241a7d99b9b0288d3f5040d8a21bc644e7dbbeec80c655acb178af3f0ef8aa5f2c93c097002f6772ee0c2303 WHIRLPOOL 70232aadfe8fbae3130d6ef3029cdc694dfcc528c744717bf244ca53b3e584c84f550e3ad5eb5181c95edb93982b29c73e8f6d93980851a1dd3443857031ee64
+MISC metadata.xml 234 SHA256 900f23c261ef4bbc25ef3d591263a70142c3c6f1cf833d1e66301936532399e7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b WHIRLPOOL 362d1afca87746963dbde2f7b3a6d4cfdf0948f9347fef9eca5510c04e2c6c9b9e6f5f9a934ba0939e261f472a1a74111d70a4cc87a8590f38ceff7692fdca79
diff --git a/x11-misc/driconf/driconf-0.9.1-r2.ebuild b/x11-misc/driconf/driconf-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..dd0e15240e8f
--- /dev/null
+++ b/x11-misc/driconf/driconf-0.9.1-r2.ebuild
@@ -0,0 +1,51 @@
+# 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
new file mode 100644
index 000000000000..a8ca98412740
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-desktop-menu.patch
@@ -0,0 +1,9 @@
+--- 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
new file mode 100644
index 000000000000..71403cd7162e
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..65291defb988
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-drop-old-tooltips.patch
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 000000000000..2df25d5ecc23
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..294c262d465c
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
@@ -0,0 +1,108 @@
+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
new file mode 100644
index 000000000000..7a7bbf810544
--- /dev/null
+++ b/x11-misc/driconf/metadata.xml
@@ -0,0 +1,8 @@
+<?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>