Use udev_newrules function to install udev rules into correct path.

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

4 files changed, 15 insertions, 16 deletions

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index 7a9009133f2e..3d251f855e8b 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/ccid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.88 2012/12/11 13:59:47 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.89 2012/12/11 14:53:14 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> ccid-1.4.2.ebuild,
+  ccid-1.4.5.ebuild, ccid-1.4.8.ebuild:
+  Use udev_newrules function to install udev rules into correct path.
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> ccid-1.4.8.ebuild:
   virtualized references to sys-fs/udev
diff --git a/app-crypt/ccid/ccid-1.4.2.ebuild b/app-crypt/ccid/ccid-1.4.2.ebuild
index 2445727c5359..e970614600d3 100644
--- a/app-crypt/ccid/ccid-1.4.2.ebuild
+++ b/app-crypt/ccid/ccid-1.4.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.2.ebuild,v 1.7 2012/02/12 00:46:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.2.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $
 
 EAPI="3"
 
 STUPID_NUM="3518"
 
-inherit eutils
+inherit eutils udev
 
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@@ -35,8 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc README AUTHORS || die
-	insinto /lib/udev/rules.d
-	doins src/92_pcscd_ccid.rules || die
+	udev_newrules src/92_pcscd_ccid.rules
 }
diff --git a/app-crypt/ccid/ccid-1.4.5.ebuild b/app-crypt/ccid/ccid-1.4.5.ebuild
index 7f19591e9f63..975d4dab2875 100644
--- a/app-crypt/ccid/ccid-1.4.5.ebuild
+++ b/app-crypt/ccid/ccid-1.4.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.5.ebuild,v 1.7 2012/11/13 15:46:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.5.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $
 
 EAPI="4"
 
 STUPID_NUM="3672"
 
-inherit eutils
+inherit eutils udev
 
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@@ -39,6 +39,5 @@ src_configure() {
 src_install() {
 	default
 
-	insinto /lib/udev/rules.d
-	doins src/92_pcscd_ccid.rules
+	udev_newrules src/92_pcscd_ccid.rules
 }
diff --git a/app-crypt/ccid/ccid-1.4.8.ebuild b/app-crypt/ccid/ccid-1.4.8.ebuild
index 8c908598bad5..e0254446413c 100644
--- a/app-crypt/ccid/ccid-1.4.8.ebuild
+++ b/app-crypt/ccid/ccid-1.4.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.8.ebuild,v 1.8 2012/12/11 13:59:47 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.8.ebuild,v 1.9 2012/12/11 14:53:14 ssuominen Exp $
 
 EAPI="4"
 
 STUPID_NUM="3768"
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs udev
 
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@@ -42,9 +42,6 @@ src_install() {
 
 	if use kernel_linux; then
 		# note: for eudev support, rules probably will always need to be installed to /usr
-		local udevdir=/lib/udev
-		has_version virtual/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		insinto "${udevdir}"/rules.d
-		newins src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+		udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
 	fi
 }