summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-12-03 09:49:09 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-12-03 09:49:09 +0000
commita22dee3b42556378244f9b26a02d9b871efce65a (patch)
tree24f0d797b67117c0d7f05e5027e7703e183be718 /dev-libs
parentUse virtual/udev instead of sys-fs/udev wrt #444398 (diff)
downloadgentoo-2-a22dee3b42556378244f9b26a02d9b871efce65a.tar.gz
gentoo-2-a22dee3b42556378244f9b26a02d9b871efce65a.tar.bz2
gentoo-2-a22dee3b42556378244f9b26a02d9b871efce65a.zip
Use virtual/udev instead of sys-fs/udev wrt #444398
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/cyberjack/ChangeLog6
-rw-r--r--dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild19
-rw-r--r--dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild4
3 files changed, 13 insertions, 16 deletions
diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index 44f0935a8f21..6453bac35f2d 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/cyberjack
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.31 2012/08/12 11:26:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.32 2012/12/03 09:49:09 ssuominen Exp $
+
+ 03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+ cyberjack-3.99.5_p03.ebuild, cyberjack-3.99.5_p03-r1.ebuild:
+ Use virtual/udev instead of sys-fs/udev wrt #444398
*cyberjack-3.99.5_p03-r1 (12 Aug 2012)
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
index 75adf843ca1c..8eb5689c9b1f 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild,v 1.1 2012/08/12 11:26:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild,v 1.2 2012/12/03 09:49:08 ssuominen Exp $
-EAPI=4
-inherit eutils linux-info toolchain-funcs
+EAPI=5
+inherit eutils linux-info toolchain-funcs udev
MY_P=pcsc-${PN}_${PV/_p/final.SP}
@@ -21,7 +21,7 @@ COMMON_DEPEND="sys-apps/pcsc-lite
fox? ( >=x11-libs/fox-1.6 )
xml? ( dev-libs/libxml2 )"
RDEPEND="${COMMON_DEPEND}
- kernel_linux? ( sys-fs/udev )"
+ kernel_linux? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
@@ -54,17 +54,10 @@ src_configure() {
src_install() {
default
- rm -f "${ED}"usr/lib*/cyberjack/pcscd_init.diff
-
+ rm -f "${ED}"/usr/lib*/${PN}/pcscd_init.diff
prune_libtool_files --all
- # http://bugs.gentoo.org/388329
- if use kernel_linux; then
- local udevdir=/lib/udev
- has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
- insinto "${udevdir}"/rules.d
- newins "${FILESDIR}"/${PN}.rules 92-${PN}.rules
- fi
+ use kernel_linux && udev_newrules "${FILESDIR}"/${PN}.rules 92-${PN}.rules #388329
}
pkg_postinst() {
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild
index 2fccc998b83b..38f1b5facd00 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild,v 1.5 2012/05/04 18:35:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild,v 1.6 2012/12/03 09:49:08 ssuominen Exp $
EAPI=4
inherit linux-info toolchain-funcs
@@ -21,7 +21,7 @@ COMMON_DEPEND="sys-apps/pcsc-lite
fox? ( >=x11-libs/fox-1.6 )
xml? ( dev-libs/libxml2 )"
RDEPEND="${COMMON_DEPEND}
- kernel_linux? ( sys-fs/udev )"
+ kernel_linux? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"