Use get_udevdir instead of the deprecated udev_get_udevdir. Use virtual/libgudev with := instead of virtual/udev.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 25 insertions, 20 deletions

diff --git a/dev-libs/libwacom/ChangeLog b/dev-libs/libwacom/ChangeLog
index 50f0504e9892..04f1df59e88b 100644
--- a/dev-libs/libwacom/ChangeLog
+++ b/dev-libs/libwacom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libwacom
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/ChangeLog,v 1.21 2013/09/26 17:31:25 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/ChangeLog,v 1.22 2014/07/24 17:21:34 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> libwacom-0.5.ebuild,
+  libwacom-0.6.ebuild, libwacom-0.7.1.ebuild, libwacom-0.7.ebuild:
+  Use get_udevdir instead of the deprecated udev_get_udevdir. Use
+  virtual/libgudev with := instead of virtual/udev.
 
   26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> libwacom-0.7.1.ebuild:
   Stable for arm, wrt bug #481906
diff --git a/dev-libs/libwacom/libwacom-0.5.ebuild b/dev-libs/libwacom/libwacom-0.5.ebuild
index c9d172b67318..5fd87d5533bc 100644
--- a/dev-libs/libwacom/libwacom-0.5.ebuild
+++ b/dev-libs/libwacom/libwacom-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.5.ebuild,v 1.2 2012/11/28 22:28:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.5.ebuild,v 1.3 2014/07/24 17:21:34 ssuominen Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="dev-libs/glib:2
-	virtual/udev[gudev]"
+	virtual/libgudev"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -37,7 +37,7 @@ src_configure() {
 
 src_install() {
 	default
-	local udevdir="$(udev_get_udevdir)"
+	local udevdir="$(get_udevdir)"
 	dodir "${udevdir}/rules.d"
 	# generate-udev-rules must be run from inside tools directory
 	pushd tools > /dev/null
diff --git a/dev-libs/libwacom/libwacom-0.6.ebuild b/dev-libs/libwacom/libwacom-0.6.ebuild
index a42ab6dd8cd8..1f320895b2b9 100644
--- a/dev-libs/libwacom/libwacom-0.6.ebuild
+++ b/dev-libs/libwacom/libwacom-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.6.ebuild,v 1.8 2013/01/06 09:25:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.6.ebuild,v 1.9 2014/07/24 17:21:34 ssuominen Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="dev-libs/glib:2
-	virtual/udev[gudev]"
+	virtual/libgudev"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -33,7 +33,7 @@ src_configure() {
 
 src_install() {
 	default
-	local udevdir="$(udev_get_udevdir)"
+	local udevdir="$(get_udevdir)"
 	dodir "${udevdir}/rules.d"
 	# generate-udev-rules must be run from inside tools directory
 	pushd tools > /dev/null
diff --git a/dev-libs/libwacom/libwacom-0.7.1.ebuild b/dev-libs/libwacom/libwacom-0.7.1.ebuild
index ddf6f619cce9..68b9ba08c722 100644
--- a/dev-libs/libwacom/libwacom-0.7.1.ebuild
+++ b/dev-libs/libwacom/libwacom-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.1.ebuild,v 1.9 2013/09/26 17:31:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.1.ebuild,v 1.10 2014/07/24 17:21:34 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils udev
 
@@ -16,14 +16,14 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="dev-libs/glib:2
-	virtual/udev[gudev]"
+	virtual/libgudev:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	if ! use doc; then
-		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die "sed failed"
+		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
 	fi
 }
 
@@ -33,7 +33,7 @@ src_configure() {
 
 src_install() {
 	default
-	local udevdir="$(udev_get_udevdir)"
+	local udevdir="$(get_udevdir)"
 	dodir "${udevdir}/rules.d"
 	# generate-udev-rules must be run from inside tools directory
 	pushd tools > /dev/null
diff --git a/dev-libs/libwacom/libwacom-0.7.ebuild b/dev-libs/libwacom/libwacom-0.7.ebuild
index 4c5cbc026aba..b0057ae8c9fb 100644
--- a/dev-libs/libwacom/libwacom-0.7.ebuild
+++ b/dev-libs/libwacom/libwacom-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.ebuild,v 1.1 2013/03/28 16:50:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.ebuild,v 1.2 2014/07/24 17:21:34 ssuominen Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="dev-libs/glib:2
-	virtual/udev[gudev]"
+	virtual/libgudev"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -33,7 +33,7 @@ src_configure() {
 
 src_install() {
 	default
-	local udevdir="$(udev_get_udevdir)"
+	local udevdir="$(get_udevdir)"
 	dodir "${udevdir}/rules.d"
 	# generate-udev-rules must be run from inside tools directory
 	pushd tools > /dev/null