Fix udev directory (bug #552784, thanks to Bertrand Jacquin and Mike Gilbert). Punt some old ebuilds.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 31 insertions, 112 deletions

diff --git a/dev-libs/libinput/ChangeLog b/dev-libs/libinput/ChangeLog
index 79702d51bf13..ceafd2fcd295 100644
--- a/dev-libs/libinput/ChangeLog
+++ b/dev-libs/libinput/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libinput
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/ChangeLog,v 1.17 2015/06/07 10:30:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/ChangeLog,v 1.18 2015/06/23 01:27:23 tetromino Exp $
+
+*libinput-0.13.0-r1 (23 Jun 2015)
+
+  23 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libinput-0.8.0.ebuild, -libinput-0.12.0.ebuild, -libinput-0.13.0.ebuild,
+  +libinput-0.13.0-r1.ebuild:
+  Fix udev directory (bug #552784, thanks to Bertrand Jacquin and Mike
+  Gilbert). Punt some old ebuilds.
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> libinput-0.7.0.ebuild:
   arm stable, bug #534012
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 59ed13301490..a5d0d0dcdaaa 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libinput-0.12.0.tar.xz 538364 SHA256 6e0ce9dd9ff04e9ac382dffb7fa332b94f093227a197a9c8189e87de6d88b55a SHA512 e2e069ef3489361a03bf1f031be0541d79ef6e42e6523c00a0b61a5ec480c53dc34139ed92ab4ffd5a9c7c1420a7c50aa157d3d58889beeffa02e7eed6d0c21f WHIRLPOOL f51b9f96e6926ab2f665b6d714e81c95bdb2d792830ef80eb3b623b5466f9464aeb2b5abd5454e319af795063576d959475dd0fbae20d59d3ae09480684a08ef
 DIST libinput-0.13.0.tar.xz 540300 SHA256 6cecaf7fde525f1d81474cbd495ce526d5e34c845d3e9d6f3e2565b7048cc61a SHA512 d07b35cec8d8cd3f75d7f8916fda4723e6a7b94bf457e249ee2b93e9a7c60b9999508d071b8959c7fb3676d13a3b5430c71f2bf579572cab87bcc4e655ab69ab WHIRLPOOL 944a1336d764d6359f65a4d3ac8d3150caf1b0db649a6dea2eaf52fae2b2e14a2ffac8b3de93280115d296c773bb7fc0d6c771e98514f76061fb8814bf0d56ff
 DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
-DIST libinput-0.8.0.tar.xz 504908 SHA256 57747436ac6a2ed9fe7745093acdd96fdce699bad6074c6e89450367d74192c7 SHA512 f913d48f1badf4fca98384382ab6d84d5b9e49d4130cdf1073fa89b49b8bcb1c313f82b2728513a77433e4020645a10dbcc0511f87e9d2e1316c5f1d1126e9ae WHIRLPOOL 2c92c9d1ff3cd9940390399b1abba40a953cbf6cb49c10df66e3d073f14905603ec98589d61d5ff74f613a6a67c678646ae724d12633b740bbe37340e4fa6568
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
-EBUILD libinput-0.12.0.ebuild 1249 SHA256 cd10662e4d2dbc845339db83d1d24b594c6723714dbc38e17f32eb068b14792f SHA512 a242d1baec3a2b975f262f741b4fa83bae5493e3a5d3c41fdbf35dfb3d9e476ea72b0b5e7ae9bf84d708ef0295f83e735416e001b3adfa867117a354a0390577 WHIRLPOOL 7c94118c588b5ef1586b19e061f1f6642937c3bbb783f97819a844bdf1639f83907c475a47a8e571a898a381713f7f0c24b720a4400508f8ec67a5859677530d
-EBUILD libinput-0.13.0.ebuild 1249 SHA256 900eb725203ca1c19bed6fffd71707f0747e071fa589ab19cb1d2d6c9d9d63b8 SHA512 1ed6d79c8770e08ab032e2dd9e56685397cd6ba530ee083b3a55ba69a9a7578f3225a9e5a864174b80fdcebe015c6e27d88a95561e3351005888461330e2245f WHIRLPOOL 26475e9096f3e8ad0974650efb1e71629ed2dc81ac1755215fc8a188dee1494566150d646c5320245d6e7fe1713b74555e55b39598eb5ef3a8cc12181c20db40
+EBUILD libinput-0.13.0-r1.ebuild 1295 SHA256 33fd7d7a10f494939933adb8f9107960936935de3c81fe5cf419bdec5172a4dc SHA512 9d36fa06e3a75127d728499d61281aa0e20b55cd9e348721f2005f60fbd0ecfe119fcc315899b1c0bf55beacd0a76e8b22aff216fde350837f5a1201f3dee3af WHIRLPOOL 798e590a91f4d273ff81c83b62fbd6e1edaf027522dbeb1176e23f973ca95ac7873a572187e94ec33d85994f1ba0124dd33b0fe660bd1fbd27ca3e27fa696e52
 EBUILD libinput-0.7.0.ebuild 1100 SHA256 73f1d090c6d1ef7b6a8c256437ccea76f26c70364930d2967534e3c9d34691a1 SHA512 1712f99b446b7424d635e07614d1a81095f7b8ebbacd80827e5dc0d1cde19c770059d48145e30b49d4fd922b8b85f086c23c46691e41c83987e960daf4c4674e WHIRLPOOL d75fc6e469de433863ce9846e05792b16455e54cd79f20ac091685947dab54523913165307850142dbdb8a4cee9739bca0545ba2886e35b120afa3cf576d7ad2
-EBUILD libinput-0.8.0.ebuild 1202 SHA256 5abd2fd862298e5d915484bee0e3d1e0a2f965c2f5340197751c69b126183f75 SHA512 44b55ca829bec6e8ce151e107a1dd4727622eb19476929102d4151c6e8a39e54e172c3a71d1c24415362d225a6ac6f7e04a865ae0bb83ddb25754ddea88a6c1c WHIRLPOOL e62b65da25393396360cd2d8cb5f458aeec0d4ddffe5e2de44759ccfcfc5a37ce75ef55b7bbd2818c1115ba96293189f9a4cca11d9940212a1da9d362eeefe90
 EBUILD libinput-0.9.0.ebuild 1245 SHA256 65956a9739bccf43cd418f61a7e3f87ecd7ac97516b857f00c7b40f47f322b13 SHA512 736acab986b710ac81036d061fc70d9349a2da6bc71498d8ff21a8a1168a7cbea66b574d352cdb74d7c1f37c508131271d3ca87acaaac72852f6444ccc9c499e WHIRLPOOL a37a7c870be8258399eb8a19d372fab8a3e221f23b9e4ca21c0969e576a164e9db858f499d8f779a1e63b984e316a23adae59ef7d447e5e8cd7217dd191ac7d8
-MISC ChangeLog 2525 SHA256 bc6347592bf81e54091514497d741d95dcfd634548b8cfde6c04d387baeeaabf SHA512 5300598a0cb0cc77552c7231397aa8de3138dd59c0e69c65d1a59fb08385c205db73a403c9489f0e9d33a0b3e1255209081fdf775b65d4b73f32b3b2a72b49e4 WHIRLPOOL f08a7d1fc5f4d818cb16de8702202f522318aa8d8e3110b0b08c3faf6b4e28cb080f781fb92e43e64f71c30181a027c1327bfa1926913180c5f0b80c9949a3e5
+MISC ChangeLog 2835 SHA256 14983d5a8392f78597f1cfb833de535d85bc13478ff8e39f971c9e0615ed39ae SHA512 a2adedb8899b4dd48460e9671e6c44b634e2fb8a96a5e9cf5d266b4496ee11a8df77781a80648a9412bb63f894168e1cf313f5836eb69728ecedffe577f5337b WHIRLPOOL 14ae8708847ca4544217f6b1fc39e06ec14926508b2994bea4354e97720e686d20b0a1ba0943eb8fb33802b25f90d06582a91b15c807f0da5c3a2a42bdb2f874
 MISC metadata.xml 175 SHA256 6922194947ab33efa21c47a06cdbf95117380c047121e54d25a0708327c5c078 SHA512 43152f2446e33611d557e09fef868d488b02dc790896ed303b18c680870f6f1f46ae3467a21d35be20dbabcddd99b3f593386eacc65550f0ec67772c73474b27 WHIRLPOOL c9563bc57117e08e1e8d6019db31f06be261fae6e5fc04d9a11dc31074d6c225d8fa6e6b62e88a9a1d1d552eeed6f3b29f0f49bd6fb872040a69e81962bcc58e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV0HVkACgkQkKaRLQcq0GIfywCeKGXbP6Q6iASmsJeWGCaqV+gk
-/h8AnRvmw6neebGtYJF5xeRetFpr5bFE
-=mTcP
+iQJ8BAEBCABmBQJViLYHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNxXwQAJqkP0rB08bQorRolTQbPDbe
+OpXZnVIVPfQOw9e9EtkIAMAVJ7htn1hIHMUPwaCPSKD4JTHbMo7G36VCNaN2dUcw
+4cyEQ9B7o1KT3HcybSioAiCrl1qBLSDqPGFacx9r0+Ka5ExAdbuctkgGhNoMsW5M
+slb+xx4vo2+ez4jLAJ482Vf+0RbuUEK7ppuAbGwl2tWOKajAHr8VrzI/Mjwsn4UD
+1kpXqSBPqVqbjmg+ex5xhBMnTjVylWGEdzA/0rXueBZtKMSX6Ei0hrbt/CLI5tuh
+sCl8EX+e9wkCN3ZVuPicd0JMS9sHwRGSbUUypQSSF1pYX3q/HJm8kuzpAE7uLgeK
+1Dgb1c+KPiJG7zhEAGh8mNNOhzaJ6bTE1Q0g1B5Jfb7d6HPt4qB61xcjUCKnmZ1O
+WP84pkJ8Eg2C4iApEr0my5i0rTrGQD5vnUFoGB4Mk3Ltj28AhTjq4flwHCeIvXh9
+FncWPr1VQp7uy686/XhekZPyIeBjZIhW7/v+2MsLI9IgoN1iiVaP8MZC7o7TzM8a
+DvtA2IIWzyexpuukyNNpKsmakInx1GsYA6IMgUvpg5zsv+1uSnlYS/xWxMR3CTmt
+VazbCWoClDBF551DrJBdJmOIcKOrO9/+8oL5PVjfbqlwzeWM5ANGgszrv6DYo3N4
+jlG1PDHfLhGOmgp5shia
+=+DZR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libinput/libinput-0.12.0.ebuild b/dev-libs/libinput/libinput-0.13.0-r1.ebuild
index 998edb95ada8..d5467ee915a6 100644
--- a/dev-libs/libinput/libinput-0.12.0.ebuild
+++ b/dev-libs/libinput/libinput-0.13.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.12.0.ebuild,v 1.1 2015/03/17 18:09:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.13.0-r1.ebuild,v 1.1 2015/06/23 01:27:23 tetromino Exp $
 
 EAPI="5"
 
-inherit eutils
+inherit eutils udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
@@ -39,7 +39,8 @@ src_configure() {
 	econf \
 		--disable-documentation \
 		--disable-event-gui \
-		--disable-tests
+		--disable-tests \
+		--with-udev-dir="$(get_udevdir)"
 }
 
 src_install() {
diff --git a/dev-libs/libinput/libinput-0.13.0.ebuild b/dev-libs/libinput/libinput-0.13.0.ebuild
deleted file mode 100644
index 2fbb8c56318f..000000000000
--- a/dev-libs/libinput/libinput-0.13.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.13.0.ebuild,v 1.1 2015/03/24 12:12:38 chithanh Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		--disable-tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.8.0.ebuild b/dev-libs/libinput/libinput-0.8.0.ebuild
deleted file mode 100644
index 3cc0ddf4de59..000000000000
--- a/dev-libs/libinput/libinput-0.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.8.0.ebuild,v 1.5 2015/02/23 11:42:22 pacho Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		--disable-tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc -r doc/html
-	prune_libtool_files
-}