From 704a74809c3dc131949cdafc91ef51d53ee4408f Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 14 Dec 2006 10:36:30 +0000 Subject: [PATCH] Unconditionally installing udev-rules due to Bug #158114. Package-Manager: portage-2.1.2_rc3-r4 --- media-libs/libgphoto2/ChangeLog | 6 ++++- media-libs/libgphoto2/Manifest | 22 +++++++++---------- .../libgphoto2/libgphoto2-2.2.1-r1.ebuild | 18 +++++++-------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index f4e5500e4b1d..6d0d865d4df7 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.74 2006/12/11 16:20:03 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.75 2006/12/14 10:36:30 zzam Exp $ + + 14 Dec 2006; Matthias Schwarzott + libgphoto2-2.2.1-r1.ebuild: + Unconditionally installing udev-rules due to Bug #158114. 11 Dec 2006; Matthias Schwarzott +files/libgphoto2-2.2.1-backported-udev-fixes.diff, diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 578b617d11d4..c92fe7d9f273 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -35,14 +35,14 @@ EBUILD libgphoto2-2.1.6-r1.ebuild 4524 RMD160 a5235fcd950a6d330c179f503a59aa9601 MD5 79ede0c0b2257dfac58b8e403045736c libgphoto2-2.1.6-r1.ebuild 4524 RMD160 a5235fcd950a6d330c179f503a59aa9601c99b7a libgphoto2-2.1.6-r1.ebuild 4524 SHA256 953770195b493cd9835982922d71613c7bf8048b96be7c5c67fa9f6c5f72dd9a libgphoto2-2.1.6-r1.ebuild 4524 -EBUILD libgphoto2-2.2.1-r1.ebuild 5604 RMD160 c75224e634aad18dfc8a31f310a44d32b54e3284 SHA1 1deef0c2da0785fc8563565bdeeb2dbf1dd7aa2e SHA256 4fd564fd2450d7694f2f5b1f79b7b991edcd60f055a3d561946a6258352eeef1 -MD5 bc4f351f3d0eb9c44ab8257ddb2db9d9 libgphoto2-2.2.1-r1.ebuild 5604 -RMD160 c75224e634aad18dfc8a31f310a44d32b54e3284 libgphoto2-2.2.1-r1.ebuild 5604 -SHA256 4fd564fd2450d7694f2f5b1f79b7b991edcd60f055a3d561946a6258352eeef1 libgphoto2-2.2.1-r1.ebuild 5604 -MISC ChangeLog 12336 RMD160 c9d72096eb30cc3f4c0211d9e413d12d97c9319c SHA1 7a48bc13264f7c851ea2d1c437f39d59f4795802 SHA256 c233d03990dc9604a2e718c0bf10177c15f29826d2b9a05c280d7438f03187e3 -MD5 d315bd40b3dea0b8ba5ac37d1b39a0fd ChangeLog 12336 -RMD160 c9d72096eb30cc3f4c0211d9e413d12d97c9319c ChangeLog 12336 -SHA256 c233d03990dc9604a2e718c0bf10177c15f29826d2b9a05c280d7438f03187e3 ChangeLog 12336 +EBUILD libgphoto2-2.2.1-r1.ebuild 5568 RMD160 738a0d807a593f167bbf475efe1005d92d65eff8 SHA1 8e319eb3e5f68d8380d9572df550a91cc1fdd49d SHA256 ce59e032b5608c9b4a528878176afe0d5d288d8adf9e69158d848964d1c5d049 +MD5 9e0d79dd6df7f9868db9bf7e59a3ac70 libgphoto2-2.2.1-r1.ebuild 5568 +RMD160 738a0d807a593f167bbf475efe1005d92d65eff8 libgphoto2-2.2.1-r1.ebuild 5568 +SHA256 ce59e032b5608c9b4a528878176afe0d5d288d8adf9e69158d848964d1c5d049 libgphoto2-2.2.1-r1.ebuild 5568 +MISC ChangeLog 12480 RMD160 d769e8ae9772b3195c4bb673d3f92eee72fe6544 SHA1 d937402cc76883e9ac383c5e6570fcdf7c6bd228 SHA256 0ad40f41840f1aea8bc852c14da2635e97da7f23f668697cb45f8be2704369a0 +MD5 dababdfe4ec0171d623d434d71218a74 ChangeLog 12480 +RMD160 d769e8ae9772b3195c4bb673d3f92eee72fe6544 ChangeLog 12480 +SHA256 0ad40f41840f1aea8bc852c14da2635e97da7f23f668697cb45f8be2704369a0 ChangeLog 12480 MISC metadata.xml 217 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 SHA1 4e896159ae71f6294c983df1e31772404536478d SHA256 8d9b308751481891a748c6b43b222ef52999140d5c587ba5e7464d1a8414d30a MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 metadata.xml 217 @@ -56,7 +56,7 @@ SHA256 bce3c4c7a08f9d9a3e8627e4bab1d096c6736d7e96b3cfa4c5e8d3886d312724 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFfYVAt2vP6XvVdOcRAlraAKDCfbQDqlkd+C0Xqsl1g2U/nAwlPgCfStFk -eiZhhD9IoiW2ckweRoCtxKc= -=3CmP +iD8DBQFFgSk3t2vP6XvVdOcRAsBZAJ9u5YhvvpFsm5fE6BU2IuaiVOkJEQCfSLjO +eVhDd3Uc8ojmAefxfRHvFDY= +=VA3z -----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild index 3db8443a167f..d40b02d28ca2 100644 --- a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.7 2006/12/11 16:20:03 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.8 2006/12/14 10:36:30 zzam Exp $ inherit libtool eutils autotools @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="nls doc exif usb hal udev" +IUSE="nls doc exif usb hal" RESTRICT="test confcache" # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* @@ -145,14 +145,12 @@ src_install() { || die "failed to create hal-fdi" fi - if use udev; then - einfo "Generating UDEV-rules ..." - mkdir -p ${D}/${UDEV_RULES%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 >> ${D}/${UDEV_RULES} \ - || die "failed to create udev-rules" - exeinto /lib/udev - doexe ${S}/packaging/generic/check_ptp_camera - fi + einfo "Generating UDEV-rules ..." + mkdir -p ${D}/${UDEV_RULES%/*} + ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 >> ${D}/${UDEV_RULES} \ + || die "failed to create udev-rules" + exeinto /lib/udev + doexe ${S}/packaging/generic/check_ptp_camera else eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list" eerror "and therefore unable to generate hotplug usermap or HAL FDI files." -- 2.26.2