Use udev.eclass for determining correct udevdir. Use virtual/udev instead of sys-fs/udev.

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

4 files changed, 26 insertions, 25 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 36e7af828e3c..1d01d6a389ff 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.148 2012/11/17 10:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.149 2012/11/28 22:50:01 ssuominen Exp $
+
+  28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  pcsc-lite-1.6.6-r2.ebuild, pcsc-lite-1.8.2.ebuild, pcsc-lite-1.8.6.ebuild:
+  Use udev.eclass for determining correct udevdir. Use virtual/udev instead of
+  sys-fs/udev.
 
   17 Nov 2012; Ulrich Müller <ulm@gentoo.org> pcsc-lite-1.6.6-r2.ebuild,
   pcsc-lite-1.8.2.ebuild, pcsc-lite-1.8.6.ebuild:
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
index d52606266b5e..e9fd817e171b 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild,v 1.4 2012/11/17 10:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild,v 1.5 2012/11/28 22:50:01 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit multilib eutils user
+inherit multilib eutils user udev
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
 	!<app-crypt/ccid-1.4.1-r1
-	kernel_linux? ( sys-fs/udev )"
+	kernel_linux? ( virtual/udev )"
 
 pkg_setup() {
 	enewgroup pcscd
@@ -33,7 +33,6 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--disable-maintainer-mode \
-		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
 		$(use_enable usb libusb) \
@@ -41,14 +40,14 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
 
-	newinitd "${FILESDIR}/pcscd-init.3" pcscd || die
+	newinitd "${FILESDIR}"/pcscd-init.3 pcscd
 
 	if use kernel_linux; then
-		insinto /lib/udev/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules || die
+		insinto "$(udev_get_udevdir)"/rules.d
+		doins "${FILESDIR}"/99-pcscd-hotplug.rules
 	fi
 }
 
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild
index 6bdf260095d0..c967a8ce569a 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild,v 1.11 2012/11/17 10:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.2.ebuild,v 1.12 2012/11/28 22:50:01 ssuominen Exp $
 
 EAPI="4"
 
-inherit multilib eutils user
+inherit eutils multilib udev user
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
@@ -26,7 +26,7 @@ IUSE="libusb +udev"
 REQUIRED_USE="^^ ( udev libusb )"
 
 CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( sys-fs/udev )"
+	udev? ( virtual/udev )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -41,7 +41,6 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--disable-maintainer-mode \
-		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
 		--without-systemdsystemunitdir \
@@ -54,12 +53,12 @@ DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete
+	prune_libtool_files
 
-	newinitd "${FILESDIR}/pcscd-init.5" pcscd
+	newinitd "${FILESDIR}"/pcscd-init.5 pcscd
 
 	if use udev; then
-		insinto /lib/udev/rules.d
+		insinto "$(udev_get_udevdir)"/rules.d
 		doins "${FILESDIR}"/99-pcscd-hotplug.rules
 	fi
 }
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild
index 3fc1bfed3f90..1a284fc02ce3 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild,v 1.7 2012/11/17 10:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.6.ebuild,v 1.8 2012/11/28 22:50:01 ssuominen Exp $
 
 EAPI="4"
 
-inherit multilib eutils user toolchain-funcs
+inherit eutils multilib udev user
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
@@ -26,7 +26,7 @@ IUSE="libusb +udev"
 REQUIRED_USE="^^ ( udev libusb )"
 
 CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( sys-fs/udev )"
+	udev? ( virtual/udev )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -41,7 +41,6 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--disable-maintainer-mode \
-		--disable-dependency-tracking \
 		--disable-silent-rules \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
@@ -57,11 +56,10 @@ src_install() {
 	default
 	prune_libtool_files
 
-	newinitd "${FILESDIR}/pcscd-init.5" pcscd
+	newinitd "${FILESDIR}"/pcscd-init.5 pcscd
 
 	if use udev; then
-		local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		insinto "${udevdir}"/rules.d
+		insinto "$(udev_get_udevdir)"/rules.d
 		doins "${FILESDIR}"/99-pcscd-hotplug.rules
 	fi
 }