fix g-c-c and gsd, libwacom needs to actually be written

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

6 files changed, 25 insertions, 5 deletions

diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
new file mode 100644
index 00000000..e79172fc
--- /dev/null
+++ b/dev-libs/libwacom/Manifest
@@ -0,0 +1,2 @@
+DIST libwacom-0.3.tar.bz2 334467 RMD160 08d65df361513c76198003deb56d0406d4987fcf SHA1 dffd2e65183e0cf8c0987ea38d1fa873782db4d3 SHA256 3ef0abae9996ad31e77b64be6796eca15a738e5d40c045dbb1a5360e84935ff8
+EBUILD libwacom-0.3.ebuild 332 RMD160 97427ea1d59a9e0fcb378d908caaf1297689e1b5 SHA1 6e569eb8d463082b78172ca41de271d824f53ded SHA256 ce7ebcbb6ebff0b3b1629adf2d38eb7201b1c9826749135c2afa784fd38ef6b1
diff --git a/dev-libs/libwacom/libwacom-0.3.ebuild b/dev-libs/libwacom/libwacom-0.3.ebuild
new file mode 100644
index 00000000..fe38c2c5
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION=""
+HOMEPAGE=""
+SRC_URI="http://downloads.sourceforge.net/project/linuxwacom/libwacom/libwacom-0.3.tar.bz2"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 8137e416..8f9583ae 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,2 @@
 AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
-EBUILD gnome-control-center-9999-r1.ebuild 2871 RMD160 4308e8c19f04384498706a6845e8d2112995a8d5 SHA1 ba3e81848786ce2bffa412cdfdd08c545bd66ec1 SHA256 12a702dcdc9850b4806d2a5b5ad6077fe2ecaddea99b23525dad4b3c05b6792d
+EBUILD gnome-control-center-9999-r1.ebuild 2890 RMD160 bcd2201789e3cef6f628e2167db2b5cba8b0b505 SHA1 8cc2439446bffcdcab23b2a0d34e2e83f7ace133 SHA256 622ecda1b4ffbab918e89905df80069dd39d314505396aec2872fa5b7b043e50
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild
index 32030c22..01e46418 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	>=gnome-base/gnome-desktop-3.1.0:3
 	>=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?]
 	>=gnome-base/libgnomekbd-2.91.91
+	dev-libs/libwacom
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 16c7e95f..3bcb418e 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,3 @@
 AUX 0001-Make-colord-optional.patch 4495 RMD160 0f2b9b49db8722515f673b0fb329de4fb921d0cd SHA1 3831173c79ccebb7d1c3cba7dd6f099061db914d SHA256 362fa496dbb137695b25d26da25b6c45858058f05bc698b9397b528a60ed7ef0
-AUX 0002-Disable-wacom.patch 1472 RMD160 cd373d1f2467daf6c87cfbbe1fc417a169410e74 SHA1 5d1063695905109612a1f1139907265a5229d7af SHA256 dae077b44e9caea32a93ab9c89c09ed7fb934cf824891125536c35c9bac38b2a
 AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133
-EBUILD gnome-settings-daemon-9999-r1.ebuild 3512 RMD160 23d8205e06151842af123c496592cd5c346d8d0c SHA1 d5638f1f60f54b94194adc4c8fa4a31f9ee9aee8 SHA256 736aa9f4e28b94a69e4f1748da2bb26b6cc099aaa1bf753bc836653d8b1cc68e
+EBUILD gnome-settings-daemon-9999-r1.ebuild 3484 RMD160 4752e7660b58be3dae3dbd20128e82a76acf7a11 SHA1 a84247a58d4be214755fd68c5e57a405fd689ac6 SHA256 5cd200cedb8edab37899dc180734f70df9922f5dc29df21255554d0dbec59e95
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
index 39fcca4d..3fc2cef0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
@@ -52,7 +52,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 		>=sys-apps/dbus-1.1.2[X] )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
 	udev? ( || ( sys-fs/udev[gudev]
-		sys-fs/udev[extras] ) )"
+		sys-fs/udev[extras] ) )
+	dev-libs/libwacom"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -103,7 +104,6 @@ src_prepare() {
 
 	# Make colord optional; requires eautoreconf
 	epatch "${FILESDIR}/0001-Make-colord-optional.patch"
-	epatch "${FILESDIR}/0002-Disable-wacom.patch"
 
 	gnome2_src_prepare
 }