diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-12-11 16:25:46 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-12-11 16:25:46 +0000 |
| commit | 1e27d51febaaa71773361a82e7b6d4de8bf67db9 (patch) | |
| tree | 9c7052a4fc2ac06693fb81249001e614a8d8136b /media-libs | |
| parent | whitespace (diff) | |
| download | gentoo-2-1e27d51febaaa71773361a82e7b6d4de8bf67db9.tar.gz gentoo-2-1e27d51febaaa71773361a82e7b6d4de8bf67db9.tar.bz2 gentoo-2-1e27d51febaaa71773361a82e7b6d4de8bf67db9.zip | |
virtualize udev by using udev.eclass to determine udevdir
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index e09366ec36ae..d2a619c00ef1 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.223 2012/11/22 08:49:46 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.224 2012/12/11 16:25:46 axs Exp $ + + 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> libgphoto2-2.4.14-r1.ebuild: + virtualize udev by using udev.eclass to determine udevdir 22 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org> libgphoto2-2.5.0.ebuild: Drop the now unused toolchain-func inherit. diff --git a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild index 3d0ebd9e1f67..68569325c8de 100644 --- a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.4.14-r1.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/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild,v 1.1 2012/09/04 15:40:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild,v 1.2 2012/12/11 16:25:46 axs Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -8,7 +8,7 @@ EAPI="4" -inherit autotools eutils multilib user toolchain-funcs +inherit autotools eutils multilib udev user toolchain-funcs DESCRIPTION="Library that implements support for numerous digital cameras" HOMEPAGE="http://www.gphoto.org/" @@ -122,9 +122,6 @@ src_configure() { einfo "Enabled camera drivers: all" fi - local udevdir=/lib/udev - has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" - local myconf use doc || myconf="ac_cv_path_DOXYGEN=false" econf \ @@ -141,7 +138,7 @@ src_configure() { --with-html-dir=/usr/share/doc/${PF}/html \ --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \ --with-rpmbuild=$(type -P true) \ - udevscriptdir="${udevdir}" \ + udevscriptdir="$(udev_get_udevdir)" \ ${myconf} # FIXME: gtk-doc is currently broken @@ -177,10 +174,7 @@ src_install() { fi # end fixup - local udevdir=/lib/udev - has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" - - UDEV_RULES="${udevdir}/rules.d/70-libgphoto2.rules" + UDEV_RULES="$(udev_get_udevdir)/rules.d/70-libgphoto2.rules" CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list" if [ -x "${D}"${CAM_LIST} ]; then |