Moved udev rules file to 70-libgphoto2.rules.

Package-Manager: portage-2.1.3.9

3 files changed, 26 insertions, 15 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/Manifest b/media-libs/libgphoto2/Manifest
index 5637c3e40bac..b35b300a005a 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -72,18 +72,18 @@ EBUILD libgphoto2-2.3.1-r5.ebuild 5314 RMD160 1904f96dacfb257e2ba8c1e48381c45d13
 MD5 ee4c7af7f0ef38863bf594967da5c10f libgphoto2-2.3.1-r5.ebuild 5314
 RMD160 1904f96dacfb257e2ba8c1e48381c45d1345ad58 libgphoto2-2.3.1-r5.ebuild 5314
 SHA256 529626d427a24e3d0e62471c9545ddc00a1e6308dbc212424491972a96fa324f libgphoto2-2.3.1-r5.ebuild 5314
-EBUILD libgphoto2-2.4.0-r1.ebuild 5642 RMD160 f9fb9f03d63f0c4ec0b77279068eddf5c8fdb883 SHA1 bded7d395d5ceab540b3c5b3beaed0f4c3cf893e SHA256 ee2a2cf2172b5b341c88c94dfb22fa18219b043ac7b5edaca4780cf8525e5eb4
-MD5 e073d3657a3420d570216a2c81188e71 libgphoto2-2.4.0-r1.ebuild 5642
-RMD160 f9fb9f03d63f0c4ec0b77279068eddf5c8fdb883 libgphoto2-2.4.0-r1.ebuild 5642
-SHA256 ee2a2cf2172b5b341c88c94dfb22fa18219b043ac7b5edaca4780cf8525e5eb4 libgphoto2-2.4.0-r1.ebuild 5642
+EBUILD libgphoto2-2.4.0-r1.ebuild 5885 RMD160 78df8571e01ba795cd563a2ee0d646ec463589fe SHA1 f4a5fc51dadbbeecbeda81fd1d81476d2e8fbdea SHA256 af29ed1ccd5a7043863cb3f9c22f87ac1f278675e68cab4cfe96f132f6c9661c
+MD5 ded0dd30c315f291da13393a0354052c libgphoto2-2.4.0-r1.ebuild 5885
+RMD160 78df8571e01ba795cd563a2ee0d646ec463589fe libgphoto2-2.4.0-r1.ebuild 5885
+SHA256 af29ed1ccd5a7043863cb3f9c22f87ac1f278675e68cab4cfe96f132f6c9661c libgphoto2-2.4.0-r1.ebuild 5885
 EBUILD libgphoto2-2.4.0.ebuild 5540 RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 SHA1 35bb55560b6467195b4de396208028ad20305a98 SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66
 MD5 31cad3168ae7c255f82c2dae2d57367c libgphoto2-2.4.0.ebuild 5540
 RMD160 80330c2a9fa718e0261ad558d31d784038b0e269 libgphoto2-2.4.0.ebuild 5540
 SHA256 f02806934e99d6756a907dc65a6155b33f05231422121811f91b3fdbb41c2f66 libgphoto2-2.4.0.ebuild 5540
-MISC ChangeLog 18147 RMD160 8092561b267576487d7148eb83662eb0138518aa SHA1 2f2ab09aaa61c1e0ba7c19e05b418a958af1eb8e SHA256 f0b5c19667b73dfe817507ba7eb0ffe401f7d3d6839ea164d15c8f6a71819120
-MD5 854a499126d6136f165ae012868a636b ChangeLog 18147
-RMD160 8092561b267576487d7148eb83662eb0138518aa ChangeLog 18147
-SHA256 f0b5c19667b73dfe817507ba7eb0ffe401f7d3d6839ea164d15c8f6a71819120 ChangeLog 18147
+MISC ChangeLog 18279 RMD160 aaa8d64ba7812b6ed4da69ca25b5138fb8cb139a SHA1 b33eb773e882c0c5c4a373ed6d6d5002cb2ee460 SHA256 cf04856652c2c07af1b1de0a0145d5a4f72330205f9745a6efc0676f4dd3f91a
+MD5 98ac28aaf0c9bff69e4f9cf1f7936d51 ChangeLog 18279
+RMD160 aaa8d64ba7812b6ed4da69ca25b5138fb8cb139a ChangeLog 18279
+SHA256 cf04856652c2c07af1b1de0a0145d5a4f72330205f9745a6efc0676f4dd3f91a ChangeLog 18279
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 MD5 7f9a9f03e32d907819c6891242037f7c metadata.xml 182
 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 metadata.xml 182
@@ -112,7 +112,7 @@ SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+l2Ot2vP6XvVdOcRAqZ1AKDk0qrainXq70wTL25Ancbt2SVwYgCg14dN
-ZL8wTC0kCDHv/VCP57QyEg0=
-=EoPD
+iD8DBQFG+m8Kt2vP6XvVdOcRAjw7AJ4pliyeK2f4weLw4gtG8yvSjZ9jUwCdFx8f
+rEaUiXBcAmCgF7mZVUCLMTU=
+=Q0pt
 -----END PGP SIGNATURE-----
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
 }