Hide plugdev message when it is not needed, bug #440450.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 23 insertions, 13 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index d2a619c00ef1..c15ccb973fa4 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.224 2012/12/11 16:25:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.225 2012/12/16 12:38:14 eva Exp $
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  libgphoto2-2.4.14-r1.ebuild, libgphoto2-2.5.0.ebuild:
+  Hide plugdev message when it is not needed, bug #440450.
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> libgphoto2-2.4.14-r1.ebuild:
   virtualize udev by using udev.eclass to determine udevdir
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 8e4e21023b47..1f247b3c3a15 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -8,15 +8,15 @@ AUX libgphoto2-2.4.8-increase_max_entries.patch 477 SHA256 596ab7c4edc7573044e89
 AUX libgphoto2-2.4.9-dnl.patch 471 SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5 SHA512 85d6dd60c81f4b0c76894576483afa851fc3d4c7ff3644853a1db3147395ba5980b19dc4452094387a41fe26d3ab09a342f24acabcbf9d23e07c0f32e895327c WHIRLPOOL 168f23c3e2b720e2b4a1b9459ab5c10ace825d6f312a1bbcc93e139df0cb51759acaf3341d64cc51e39a4aecadbe5382f2f1b2f44a572ca8bea4e2c28a6e0ea2
 DIST libgphoto2-2.4.14.tar.bz2 4481384 SHA256 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292 SHA512 4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73 WHIRLPOOL 0b9674c93f62cd060fc2134816b8dfd809e9276b8ffd943b9856ca57fac319dc4201aeab71a267a1d547bfcc7c4e80cd97d8a9d37528e16703adb57084630faf
 DIST libgphoto2-2.5.0.tar.bz2 4635612 SHA256 e7df389f1b034be021066227c0908b8f21d3be0cd0c6ed56979c04c3a9f75b31 SHA512 160ca4efba3d3fecf9b9f53234169121c9910b15736b6bd9b813763ae80b50632243f6dc5b5ef8bc9bae4450bf1d17fd9c1fe1eadd682e2d0c48b813fe97998c WHIRLPOOL 9ae97dc37efd5fea380477a5077cfb9b595d5aafac9c7966dd41b224f77847a1011fba0e4a12db39975e3397f394f557c6a45700e0b083b8f84f530ed32cdd07
-EBUILD libgphoto2-2.4.14-r1.ebuild 6180 SHA256 504e1348f232ae4f8373ac2f00c59486d623aee87d654c69c057a59a8ae09354 SHA512 4474771ae481caab3541910b58cba541e0e2c92ed5e9ac74a13d3e333a067dcaf72c93cfa85f0e4430b0d447902b7c81225698a5f673308f0499785d7abb5175 WHIRLPOOL d3c8f7b3da4f247d77d9dda95b37639a9cf590b3100f0bb36e3f8503ad48fbc2a2387c1bcc4e4453e449b7ab67bdcdd110eba6b53638773a0e8a5acd5895f342
+EBUILD libgphoto2-2.4.14-r1.ebuild 6239 SHA256 25d4f9f47ee116b3ceb189caf6db4af3e67aa8fa67e9350c793b24d00a951132 SHA512 55708ae3244e9561021f8fb3b1399b49cdf535e99c766fe66552791acf33a1ffc1db75dd9812aa6aea30fe077fee526220f15cbe33ae7a8e755565265722f81a WHIRLPOOL 243f15ed243a235f24578d4c88def5549acb3235d83a786c3ff8c15ec723360f5ae39165a1e6344cbb4eea788730d8a1f039267b4183418053eeca78e179ef3a
 EBUILD libgphoto2-2.4.14.ebuild 6130 SHA256 0c1065216d0d29d42e7d57d49fe0eb98527db3d1bdad9b9a32e4a66ba3c90b5d SHA512 7afc102bd331e977d8922b1d6bca8c4f142ef5cd0254e1ea29d201c18ec5a4a41956d602072a4601624288d5518dabffc67c0a53739e7a351155edbbd4635a7b WHIRLPOOL 32addc7bddbda8e4ca6363407f1af5cd72f0b18a83f3bbfc2f3792b077e8fc5c3c248deb6cd5cd6c2a0fc47d0ba43ff3a392fe02b5d5b930e8e96895ad75b07c
-EBUILD libgphoto2-2.5.0.ebuild 6276 SHA256 9225246a9f0d6994f57e12fc61b041779b34cca324e4a338bc6766e979bbba9f SHA512 4df205d98ecdc0a6dbeb2403efcf73f2ac8435399df1b8f64a0ebba942b611b4ceccbbd989f4e212f8587aada973fca0fcc0466bd77a01dcf5d93e3a1306770b WHIRLPOOL 46babc68294c48ab6b324ddfcda0e073d1c2de19f1dd9962662f2761955f11edb0a8c1d4f8861bb75e1ac9a7768677ce48727f91057f345390ec26611e836101
-MISC ChangeLog 36343 SHA256 1ebd5f0c76bc4bdfeb27c93f314b9cad3107339f0d20d2d03973056ff28c71cf SHA512 bb92d553951972a7a6f93a0a22aac5286a22ede05f58abf53c62bf768ec88349573ca506eaa7dbbc9cf6a19503a3a9df8eba4afb0007e5415cce33ee0bfd7c29 WHIRLPOOL 1f1ed5b3bf98654eab05121dfa697230b43692c0f29bfd418bf08d06e98933a9bc92f94caea03bf5f9647a2ff7367a248d33bb0c90d20b2dbad0952aea1538a7
+EBUILD libgphoto2-2.5.0.ebuild 6335 SHA256 6a146cbafb733326dc15f697670a4e0c6973b060d4539ad12918f22bbae2a9da SHA512 2a97e04958a667f3c41221759afd46b68c187fdfb6101c861f83368aa082fe4830d414ff8d0ce4948e965624a589b339c2bc98b16c0857deb1e8b15b9b24290e WHIRLPOOL 20783aecc772b4e6496e840df5e5ab6e610130d4162b43fa7f02c96fea22e367d08a3fdd177d800c6b56043873f40b9dfca43c4b7693d7808f65f4f220a1a0f1
+MISC ChangeLog 36513 SHA256 5be02e71aa1c1091471f7f0e746e43e064cb44f9322a976db24300a65e998d88 SHA512 ca2df9f1f1765e7462175644e887c53a326009ae58667a9a117c98f311d0f810cf3ba129989c86acc110014b9dfbecbec3a69672cbdd8b6dfb15104448ab0d1b WHIRLPOOL b4eae4276135707d5faf703e23b2fcf8243b9356fe43dbb6783ec3f9b00018c5145be6ea592587dba50edea1e6fe6af1370cac8c534942d5512b9be12882c3c6
 MISC metadata.xml 182 SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b SHA512 6b61b8de171da5556ddf719a13a0053fdf6d26c891f6c7ffedebe51c3f88f6d2b15451e43819705841c6818d3a5cf4d2466c92b5a1ee654ca6e5de7436570859 WHIRLPOOL 5487cc56cd31c1326162f3b15018e1d43a0e42086480ee53f6893e8eeee63a27bbec99844f3de3d40ea8e6ab6721087831f398b761ea0c827ce56e4e1473b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHXpwACgkQ2ugaI38ACPAtswD+Mw5Wu+RbUKhdaJQWgBB364Ya
-+1IcuOMMjUn0H90OBaoA/1LKLMPFzaEef5HJ27w+ftOdUrBKoPrBUyD2vBHfGoyg
-=rVBp
+iEYEAREIAAYFAlDNwLcACgkQ1fmVwcYIWAYI6wCgwMd/HC53iU0bDr2GFwnDgi3K
+4c4AoI/ANr8LeFLod+h2fVu56VRf9Wyc
+=GvHt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild
index 68569325c8de..a781a19973df 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.2 2012/12/11 16:25:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild,v 1.3 2012/12/16 12:38:14 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -199,8 +199,11 @@ 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."
+	if ! has_version "sys-auth/consolekit[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
 	local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
 	if [[ -f ${OLD_UDEV_RULES} ]]; then
 		rm -f "${OLD_UDEV_RULES}"
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild
index 94c5c031876e..56fb83e95c3b 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.0.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.5.0.ebuild,v 1.6 2012/11/22 08:49:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.7 2012/12/16 12:38:14 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -202,8 +202,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "Don't forget to add yourself to the plugdev group "
-	elog "if you want to be able to access your camera."
+	if ! has_version "sys-auth/consolekit[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
 	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
 	if [[ -f ${old_udev_rules} ]]; then
 		rm -f "${old_udev_rules}"