Move from KDE overlay. Revision bump, add patch to remove support for deprecated synaptics features wrt bug 461364. EAPI bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 292 insertions, 9 deletions

diff --git a/kde-misc/synaptiks/ChangeLog b/kde-misc/synaptiks/ChangeLog
index 32abb72407f3..0e7d4cf6d01e 100644
--- a/kde-misc/synaptiks/ChangeLog
+++ b/kde-misc/synaptiks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-misc/synaptiks
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.35 2012/10/29 16:38:10 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.36 2013/03/11 14:32:24 creffett Exp $
+
+*synaptiks-0.8.1-r2 (11 Mar 2013)
+
+  11 Mar 2013; Chris Reffett <creffett@gentoo.org>
+  +files/synaptiks-0.8.1-removedfeatures.patch, +synaptiks-0.8.1-r2.ebuild,
+  files/synaptiks-0.8.1-templatesfix.patch:
+  Move from KDE overlay. Revision bump, add patch to remove support for
+  deprecated synaptics features wrt bug 461364. EAPI bump.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> synaptiks-0.8.1.ebuild:
   Use virtual for argparse.
diff --git a/kde-misc/synaptiks/Manifest b/kde-misc/synaptiks/Manifest
index d6e0b0b71ddf..1eea7d9f8a0f 100644
--- a/kde-misc/synaptiks/Manifest
+++ b/kde-misc/synaptiks/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX synaptiks-0.8.1-removedfeatures.patch 7271 SHA256 1a5481512ed37f268d31c803dece6370c2a4f8652243340573514780f42c1821 SHA512 cdb1798c4122d2a060ee39bafbe3a7d19a30e76dd1d82b3e6ef1ce06f4f30c187b4c0896c8ffbbb2d979cefc69bb13f7610a293abe5de43d2ee29eed0c405cbf WHIRLPOOL 93ea2a7a8558a24c0db7d5d8c9969b4cceccd58d3529cd842bded3d4ea5143c4d8735c27eb4fb7b6f57f8b179ce71eb2ce701139011cf61b0815abe2d680b317
 AUX synaptiks-0.8.1-templatesfix.patch 1705 SHA256 f7e670522de4ab56b1a3fcf1d3ce1f142db1d708b5fd99d32efc9d0d4c108dbe SHA512 767dace1dede65bd2913e4c14bbffba3ec40f2583cb73dc5fa7a761b573c1e5ca8fd6523c9cf6b7e660a1fd665ab8dfdc0e1320d8897b96161f9c47b6462a947 WHIRLPOOL 5857fe858734d220f4f868df81f308808d7421dc474c295da8d4b35871ae52f5de15faaeb886c5674b4b0df956bb20f48ecbdbfae28dc34fd04ca9018ac3d390
-DIST synaptiks-0.8.1.tar.bz2 463495 SHA256 39bbafa6abd63903ba6f9ffd020ec754250ab7800ea9efcdeeebd69c0fcd5707
+DIST synaptiks-0.8.1.tar.bz2 463495 SHA256 39bbafa6abd63903ba6f9ffd020ec754250ab7800ea9efcdeeebd69c0fcd5707 SHA512 a01b9833b2fb7af699eba015517ac652e4d0df9f46154097a26e57f0c4dc4467db1ceeea52c5f5ee5794b821870356d1d16e9da6aeaa845fc3d7bde10b85d053 WHIRLPOOL da9891f1b29ab174759efae779f08dea31e9a6b266b0d10ee60fa460e588c8620e2fa91a7eafddbd4ead3f9db7e365580bd34db66ea611b2c448590d09c47efd
+EBUILD synaptiks-0.8.1-r2.ebuild 1566 SHA256 e7ddc0dfa700a2ad3be247d0670dc4073b990ce27f66c20b75f464d0b6091892 SHA512 a554fc6baf3632e9a8197e72ad04c99ca01374455170f57d93c7d96818cbbc370c172b9274f29eda6f2d79b603fd83d7a1297fbeb7263e9c15ea9094b381e096 WHIRLPOOL 7d95c5b24abbb3aeb9d45482e37ba4134aea528a28fdf54c370ead701ab45810562b87339ea3a5bd5271111d84bc4ba81af8a7d7ef7cf2ab0028fdc99be0c8aa
 EBUILD synaptiks-0.8.1.ebuild 1446 SHA256 613c0de56ab2bc1e8a2afaacf74924f89a7f65bf1e79ac4607e886666d4f4161 SHA512 44e40f25d1862607534131fff0caa1ab5ce0ed6ae97876f58f07e2eb3dbc658ae9f19d47e1346b35e222bbaf2b7b0dc361e4ebe4e95b6c8bc757185eb2e40700 WHIRLPOOL 433df56e1bfbbe89e9d821246d613123d420dbbddc78a0a3cf19585fb8cb54788026134893c395f7b5bff8ec83ec174eb988907e92cb1032aa5739c6b8abe4e0
-MISC ChangeLog 5258 SHA256 dcd2f944b010b7579013fa434dee00994e59b30336939176eb32892f5cb42765 SHA512 80945fbfbe582f2186634cfaa02752f370accc65b99f5d81af8199436148a556affbda3afc92da1f057da49869e940deff9e51a3d904b408520e49219b463b23 WHIRLPOOL fe3a187bd8d57dac2dcea291b9070cb7de70410dcdfd23653ab2438900eead0ad336534e1ad07155ab4f970b2aa18a4d467ba802fea42f37d490f413830fdfe9
+MISC ChangeLog 5598 SHA256 90442fd98d29b4dcaeaf897b750e91e63361ddcd66b962399c60554ea374b751 SHA512 ddf510e0d7a0551d5fef44b6bb2b932597a5723d7a055ae6e699ea22df68ad67e04cac167f90f0878ee40445ae1d8b0f64c50855a4be4b28341723eeeacccfe9 WHIRLPOOL bb52126068ee45edeed4cb6d8061a885e73c0eb0470f81233a47966d1518b12fda8ffa522406390b1c256fef43d1617603a24bfaca2db84b39b29f99d7a16a55
 MISC metadata.xml 342 SHA256 e299145a7bacfc5298a28de947c88ca1489ae100d4b24180a5de5e64e28205b1 SHA512 f9bc72588e162e145f8e6c487974ff5f4da28630e6e0a31c715432455a5c85afec5896f5faeddfb10d5d53d32e14c15037d2dcdbee09b8a66fe35d86cf9f4eb7 WHIRLPOOL 4d3b7d1a21b0c098774b3bb547785c5cc9f28bc18c9f5ef5ce3578978fa68691e5afd31114b1ada8b797e04e028a4f59f329e5c32b11463f337a2659e1fda4ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlCOsS4ACgkQfXuS5UK5QB2ojwP/W3UI0/Pjl9Quuz+Xn5Irpv+j
-nl/NJ17Qeqb87wa+QENaPYy2TYUgTk9UbsJR6dBADZi9wSqE5QOJVaXTwqqeuoMW
-Uj1+CxKIwYqYkZbx355gxxjoWStS15NKXOgDg6ZYPtzL96/BRg/nyNtkyfFLPgQ+
-TMCTnQTEbhsatyU0XwE=
-=59pv
+iKYEAREIAGYFAlE96wFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TkcwCgps0wn+10Hp9uF7M2oAqV51Sb
+X3UAnAlW0OAFYisWPDQywXLuW2LqS27t
+=YHko
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/synaptiks/files/synaptiks-0.8.1-removedfeatures.patch b/kde-misc/synaptiks/files/synaptiks-0.8.1-removedfeatures.patch
new file mode 100644
index 000000000000..4f9fe7c0f094
--- /dev/null
+++ b/kde-misc/synaptiks/files/synaptiks-0.8.1-removedfeatures.patch
@@ -0,0 +1,200 @@
+--- a/doc/api/touchpad.rst
++++ b/doc/api/touchpad.rst
+@@ -27,8 +27,6 @@ The touchpad class
+ 
+    .. autoattribute:: acceleration_factor
+ 
+-   .. autoattribute:: edge_motion_always
+-
+    .. rubric:: scrolling properties
+ 
+    .. autoattribute:: vertical_edge_scrolling
+@@ -55,8 +53,6 @@ The touchpad class
+ 
+    .. rubric:: tapping properties
+ 
+-   .. autoattribute:: fast_taps
+-
+    .. autoattribute:: rt_tap_action
+ 
+    .. autoattribute:: rb_tap_action
+--- a/doc/handbook/reference.rst
++++ b/doc/handbook/reference.rst
+@@ -69,13 +69,6 @@ The touchpad configuration module is available in |systemsettings| under
+       The acceleration between :guilabel:`Minimum speed` and :guilabel:`Maximum
+       speed`
+ 
+-:guilabel:`Continue cursor motion when hitting the touchpad edge`
+-   Continue the cursor move while the finger stays in the touchpad edge
+-
+-   :guilabel:`For all movements, not only dragging`
+-      Always continue cursor movement, when hitting the touchpad edge, not only
+-      when dragging
+-
+ 
+ .. _commands-scrolling-configuration:
+ 
+@@ -152,13 +145,6 @@ The touchpad configuration module is available in |systemsettings| under
+ 
+    Screenshot of the tapping configuration page
+ 
+-:guilabel:`General tapping settings`
+-
+-   :guilabel:`Make single taps faster and double taps slower (fast taps)`
+-      Enable or disable fast taps.  If fast taps are enabled, the driver will
+-      react faster on single taps, but slower on double clicks caused by double
+-      taps.
+-
+ :guilabel:`Mouse clicks triggered by tapping`
+     :guilabel:`Top left corner`
+        Configure the mouse button, which is triggered by tapping the top left
+--- a/doc/handbook/usage.rst
++++ b/doc/handbook/usage.rst
+@@ -41,12 +41,6 @@ though the touchpad does not actually have one.  In this case, the middle mouse
+ button is triggered by pressing the left mouse button and the right mouse
+ button at the same time.
+ 
+-Some systems have a circular touchpad.  Unfortunately the touchpad driver does
+-not detect circular touchpad automatically, so if you have a circular touchpad,
+-please enable :guilabel:`The touchpad is circular` to let the driver know, that
+-your touchpad is circular.
+-
+-
+ .. _motion-configuration:
+ 
+ Motion configuration
+--- a/synaptiks/config.py
++++ b/synaptiks/config.py
+@@ -173,7 +173,6 @@ class TouchpadConfiguration(MutableMapping):
+ 
+     CONFIG_KEYS = frozenset([
+         'minimum_speed', 'maximum_speed', 'acceleration_factor',
+-        'edge_motion_always', 'fast_taps',
+         'rt_tap_action', 'rb_tap_action', 'lt_tap_action', 'lb_tap_action',
+         'f1_tap_action', 'f2_tap_action', 'f3_tap_action',
+         'tap_and_drag_gesture', 'locked_drags', 'locked_drags_timeout',
+@@ -182,7 +181,7 @@ class TouchpadConfiguration(MutableMapping):
+         'vertical_scrolling_distance', 'horizontal_scrolling_distance',
+         'vertical_two_finger_scrolling', 'horizontal_two_finger_scrolling',
+         'circular_scrolling', 'circular_scrolling_trigger',
+-        'circular_scrolling_distance', 'circular_touchpad'])
++        'circular_scrolling_distance'])
+ 
+     @classmethod
+     def load(cls, touchpad, filename=None):
+--- a/synaptiks/kde/widgets/ui/hardwarepage.ui
++++ b/synaptiks/kde/widgets/ui/hardwarepage.ui
+@@ -27,32 +27,6 @@
+     </widget>
+    </item>
+    <item>
+-    <widget class="QGroupBox" name="groupBox">
+-     <property name="title">
+-      <string>Hardware settings</string>
+-     </property>
+-     <layout class="QVBoxLayout" name="verticalLayout_2">
+-      <item>
+-       <widget class="QLabel" name="label_2">
+-        <property name="text">
+-         <string comment="@info">Please enable this setting, if your touchpad is circular.</string>
+-        </property>
+-        <property name="wordWrap">
+-         <bool>true</bool>
+-        </property>
+-       </widget>
+-      </item>
+-      <item>
+-       <widget class="QCheckBox" name="touchpad_circular_touchpad">
+-        <property name="text">
+-         <string comment="@option:check">The touchpad is circular</string>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-   <item>
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+--- a/synaptiks/kde/widgets/ui/motionpage.ui
++++ b/synaptiks/kde/widgets/ui/motionpage.ui
+@@ -81,22 +81,6 @@
+     </widget>
+    </item>
+    <item>
+-    <widget class="QGroupBox" name="edgeMotionGroup">
+-     <property name="title">
+-      <string comment="@title:group">Continue cursor motion when hitting the touchpad edge</string>
+-     </property>
+-     <layout class="QVBoxLayout" name="verticalLayout_3">
+-      <item>
+-       <widget class="QCheckBox" name="touchpad_edge_motion_always">
+-        <property name="text">
+-         <string comment="@option:radio">For all movements, not only dragging</string>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-   <item>
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+diff --git a/synaptiks/kde/widgets/ui/tappingpage.ui b/synaptiks/kde/widgets/ui/tappingpage.ui
+index 8d92c2c..89ca751 100644
+--- a/synaptiks/kde/widgets/ui/tappingpage.ui
++++ b/synaptiks/kde/widgets/ui/tappingpage.ui
+@@ -15,22 +15,6 @@
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <item>
+-    <widget class="QGroupBox" name="generalSettingsGroup">
+-     <property name="title">
+-      <string comment="@title:group">General tapping settings</string>
+-     </property>
+-     <layout class="QVBoxLayout" name="verticalLayout_4">
+-      <item>
+-       <widget class="QCheckBox" name="touchpad_fast_taps">
+-        <property name="text">
+-         <string comment="@option:check">Make single taps faster and double taps slower (fast taps)</string>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-   <item>
+     <widget class="QGroupBox" name="tappingButtonGroup">
+      <property name="title">
+       <string comment="@title:group">Mouse clicks triggered by tapping</string>
+--- a/synaptiks/touchpad.py
++++ b/synaptiks/touchpad.py
+@@ -196,14 +196,6 @@ Whether the touchpad is off or not.  Three valid values:
+     acceleration_factor = _move_speed_property(
+         2, 'The acceleration factor of cursor movement as float')
+ 
+-    edge_motion_always = device_property(
+-        'Synaptics Edge Motion Always', 'bool', 0,
+-        '``True`` if edge motion is enabled, ``False`` otherwise.')
+-
+-    fast_taps = device_property(
+-        'Synaptics Tap FastTap', 'bool', 0,
+-        '``True`` if edge taps are enabled, ``False`` otherwise.')
+-
+     _tap_action_property = partial(device_property,
+                                    'Synaptics Tap Action', 'byte')
+     rt_tap_action = _tap_action_property(
+@@ -291,11 +283,6 @@ generate a single scroll event.
+     circular_scrolling_distance.convert_from_property = math.degrees
+     circular_scrolling_distance.convert_to_property = math.radians
+ 
+-    circular_touchpad = device_property(
+-        'Synaptics Circular Pad', 'bool', 0,
+-        '``True``, if the touchpad is considered circular, ``False`` '
+-        'otherwise')
+-
+     @property
+     def coasting(self):
+         """
diff --git a/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild b/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..c73125171f62
--- /dev/null
+++ b/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild,v 1.1 2013/03/11 14:32:24 creffett Exp $
+
+EAPI=5
+PYTHON_DEPEND="2:2.6"
+DISTUTILS_SRC_TEST=setup.py
+KDE_HANDBOOK=optional
+inherit kde4-base distutils
+
+DESCRIPTION="Touchpad configuration and management tool for KDE"
+HOMEPAGE="http://synaptiks.readthedocs.org"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +upower"
+
+RDEPEND="
+	>=dev-python/PyQt4-4.7
+	>=dev-python/pyudev-0.8[pyqt4]
+	dev-python/setuptools
+	$(add_kdebase_dep pykde4)
+	|| (
+		( $(add_kdebase_dep kdesdk-scripts) )
+		( $(add_kdebase_dep kde-dev-scripts) )
+	)
+	virtual/python-argparse
+	>=x11-drivers/xf86-input-synaptics-1.3
+	>=x11-libs/libXi-1.4
+	x11-libs/libXtst
+	upower? ( dev-python/dbus-python sys-power/upower )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinxcontrib-issuetracker
+	)"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	if use doc; then
+		epatch "${FILESDIR}/${P}-templatesfix.patch"
+	fi
+	epatch "${FILESDIR}/${PN}-0.8.1-removedfeatures.patch"
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd doc > /dev/null
+		sphinx-build . _build
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r doc/_build/*
+	fi
+}