diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-16 12:38:14 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-16 12:38:14 +0000 |
commit | 9d2c92a60e712a049040dc6b62fb6fbaf8e72314 (patch) | |
tree | 1f2f3b9f8f0430cee4b84e719d02db103f4b6c6a /media-libs | |
parent | New package (a depend for new git-annex). Much safer replacement for QSemN, Q... (diff) | |
download | gentoo-2-9d2c92a60e712a049040dc6b62fb6fbaf8e72314.tar.gz gentoo-2-9d2c92a60e712a049040dc6b62fb6fbaf8e72314.tar.bz2 gentoo-2-9d2c92a60e712a049040dc6b62fb6fbaf8e72314.zip |
Hide plugdev message when it is not needed, bug #440450.
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild | 9 | ||||
-rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.5.0.ebuild | 9 |
3 files changed, 17 insertions, 7 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/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}" |