summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-09-26 14:38:57 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-09-26 14:38:57 +0000
commitbc1ae27646393d278de6cccc28348bea24c7c385 (patch)
tree032e22da6b1ce690c38b5bbf2b9976158ac5f80a /media-libs
parentpam_mount bump (diff)
downloadgentoo-2-bc1ae27646393d278de6cccc28348bea24c7c385.tar.gz
gentoo-2-bc1ae27646393d278de6cccc28348bea24c7c385.tar.bz2
gentoo-2-bc1ae27646393d278de6cccc28348bea24c7c385.zip
Moved udev rules file to 70-libgphoto2.rules.
(Portage version: 2.1.3.9)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libgphoto2/ChangeLog6
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild13
2 files changed, 15 insertions, 4 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 48dbb3defd17..017a1a8f6255 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libgphoto2
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.108 2007/09/26 13:24:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.109 2007/09/26 14:38:57 zzam Exp $
+
+ 26 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+ libgphoto2-2.4.0-r1.ebuild:
+ Moved udev rules file to 70-libgphoto2.rules.
*libgphoto2-2.4.0-r1 (26 Sep 2007)
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
index 4e136f92ab7a..831924d701a1 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.1 2007/09/26 13:24:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.2 2007/09/26 14:38:57 zzam Exp $
# TODO
# 1. Track upstream bug --disable-docs does not work.
@@ -130,7 +130,7 @@ src_install() {
dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING
HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
- UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules"
+ UDEV_RULES="/etc/udev/rules.d/70-libgphoto2.rules"
if [ -x "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then
# Let print-camera-list find libgphoto2.so
@@ -147,8 +147,11 @@ src_install() {
einfo "Generating UDEV-rules ..."
mkdir -p "${D}"/${UDEV_RULES%/*}
+ echo -e "# do not edit this file, it will be overwritten on update\n#" \
+ > "${D}"/${UDEV_RULES}
"${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list \
- udev-rules version 0.98 group plugdev mode 0660 >> "${D}"/${UDEV_RULES} \
+ udev-rules version 0.98 group plugdev mode 0660 \
+ >> "${D}"/${UDEV_RULES} \
|| die "failed to create udev-rules"
else
eerror "Unable to find print-camera-list"
@@ -163,4 +166,8 @@ src_install() {
pkg_postinst() {
elog "Don't forget to add yourself to the plugdev group "
elog "if you want to be able to access your camera."
+ local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
+ if [[ -f ${OLD_UDEV_RULES} ]]; then
+ rm -f "${OLD_UDEV_RULES}"
+ fi
}