Adapt elog message to systemd, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 13 insertions, 220 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 96067366b8ae..fe5c3da91d63 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.237 2013/08/03 18:00:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.238 2013/10/10 18:40:36 pacho Exp $
+
+  10 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libgphoto2-2.5.1.1.ebuild,
+  libgphoto2-2.5.2.ebuild:
+  Adapt elog message to systemd, drop old
 
 *libgphoto2-2.5.2 (03 Aug 2013)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index cfef4d8621bf..eb4d0bf4e753 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -6,17 +6,15 @@ AUX libgphoto2-2.4.7-respect-bonjour.patch 643 SHA256 00b09825d9b6493a2a65577c6b
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8 SHA512 9a23b5b1787e1582a984dc096be3365c2a372ece8dfefa42d1ef05e5ce92ff26fc3562ff04da06766df69b0d587fdece5252c706abd4c57a556e6fb2257c8614 WHIRLPOOL b354a40426e6f731e57adf85ae11e1f9c87154dc48d6149e3e33887df60427e06bb907a8878d56427b7eb8211b7f5b1228b9d758ac4230fd47f214f82546d721
 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.1.1.tar.bz2 3363878 SHA256 b4a3a9eeb89bc90d1d10f291e792d7744f415ebc4c4347f4177e83dcb3b7ed14 SHA512 a24f37ea077d3eea731799dafe107787f6a8a4e27aa214e03973bdd897a5ef4d934b5fe04aad23191141bedbfe8d40c320b2bcb15e5c1d242af9dcc8ce3a4418 WHIRLPOOL 1403ef8c51fb84538784b9335e64a3cadc6e974d24a519e5978fc6090fd7cba05ad1a6d5ebd93536a5683fb4513d1136ca744ea5ad7334576ed773bc7a4d2cfc
 DIST libgphoto2-2.5.2.tar.bz2 6446235 SHA256 a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838 SHA512 f572fc6bdcb6a6363ad3ad7ac86fdd401c1d86ce82497d36c2b3c6ca6242b880e72246d8fe3e9624ecb813b3c0b123bd14adf2d1bf69a2bee3a0e837b0a4a527 WHIRLPOOL 23db9e272f3d6038c1c7eb019996eceb67a1afbbda54d7101bcc3ccb44d3bebccdd836430aac5d6c7757f55fb544256ee3cf029304b9a9a493832b0fe11979a8
 EBUILD libgphoto2-2.4.14-r1.ebuild 6232 SHA256 bcc43b9153506a6ec3f11dc61fd995c8e19a0c4cd743d2163ea99610c6faa7bc SHA512 c2d49f6143076ce6acc3ddeca0acbc5af0f436f0dc5ca410f68d75f9739557ac718eb9b88beff384139c9da94f12ef34f7875490eb5ceab7f852cf232837f074 WHIRLPOOL c8d843b8ad3f7cd0d54e6f10357f578801eb2145a746b72847cd062370e4c9dd30011bd813a952b3d13af2afe1b5b2d60a9383f05513a5cae38cd2512245f832
-EBUILD libgphoto2-2.5.1.1.ebuild 6139 SHA256 117ba22b649de82bb42aa9bb616c9312dd3dde7aa5e88c7eb7cc5dd1e81e4470 SHA512 b07b4de44d1215aae84beb627833bc0a5d2a8cfe7261cebcf3ca4d4aa60514963c9e49279d55233be5ee1d16b4df9d78958f1faae98f1ffc5046d40a254c0e87 WHIRLPOOL 953ab92a77c94e70021fe106ee55743578556aa0536161b3d72eb5aa4b1acc2000be5f995b092ede60567db79a867927fccb26d093fa35d421c71e6b29a4cec8
-EBUILD libgphoto2-2.5.2.ebuild 6318 SHA256 8adefa5d5858b86ff5f0df9fe36e6636873b0983e30dd3ab8cbb14c788721b91 SHA512 c113192db33c5437322b8401f8f378a4f66c032ec963507926d258f5d83408acdc0dfa767a59948609eb5a361acd6590b9db5b5b23ac8b0ab95719724250cde0 WHIRLPOOL 9a3fcca0d2a5dd126ae190a8f5dcf8bae2f0e25e9f6bd2c425b5b38665494d835545a1bb8c7d1a304fd1272f59c0f681b712169ce240c686cf327034ce24eebd
-MISC ChangeLog 37969 SHA256 3049506df1fa33a4624ebd3ce2cf8ba019d503a2515e9f9527c60f068d37fa31 SHA512 001e5f349abef9d03269fa6c2303ef73586635dcf7b4f7968072dc35f69d10de0d4a56eedd9e68100a65ae5535b0545d8e9b08cf71afeda9dbf1ce2de29047c0 WHIRLPOOL a28d70b28831aaa889c705c3de97d688f03c9ce60644d682ff61d607720e867b617ea2cf739666841fe147045d1163bd9f48bc1a867e1dcaf84312c989818f75
+EBUILD libgphoto2-2.5.2.ebuild 6361 SHA256 fe274fc9fd7aef97bf86b90f28a3a1ad01efcc57a6f4b622dca4e1ac75b778bd SHA512 41cdee83d0f0b1c853fd79581888d0334b6b37001eea85df326c81689b94a19d5985ca240ee607eb2038a01fbd475c5a3146e74ef7f79930a742722145b33b00 WHIRLPOOL 5ae03cf7d3b0a0a5054c10f3b404ded149cc72176031282eb7403196edd57b49db7ff53fa77de14b45c3f7083576ae3bfb1383836acace92f8fc7b9775b3545f
+MISC ChangeLog 38115 SHA256 3d66e54c3242e4d69040a34a06dd858d8a88296535237520f0461ef7a5f7040a SHA512 b9afc05f68148d6075011916ec66693a142d79cbf1e9cbc5e46f3c3fe370bd8005addd8ddcfe6011c7388785d6b25c5b8906afc74f48c9bbe6fd43d97b4da25c WHIRLPOOL fd34bbdf7beb632a7304bf15d3f53cca4671f7269551f12d610e935e4d70464ea16dc81544d194338d75747eb1f0d47e8a5e7cb4a49a10dc93b1f1af9d098e0e
 MISC metadata.xml 182 SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b SHA512 6b61b8de171da5556ddf719a13a0053fdf6d26c891f6c7ffedebe51c3f88f6d2b15451e43819705841c6818d3a5cf4d2466c92b5a1ee654ca6e5de7436570859 WHIRLPOOL 5487cc56cd31c1326162f3b15018e1d43a0e42086480ee53f6893e8eeee63a27bbec99844f3de3d40ea8e6ab6721087831f398b761ea0c827ce56e4e1473b8f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlH9RUIACgkQ1fmVwcYIWAb9RwCgzWVGhqVDhdG0hU7zp/VPKObJ
-aMYAnR9QAyrJpO++GRIohemjYofoG8Uq
-=yndW
+iEYEAREIAAYFAlJW9KUACgkQCaWpQKGI+9S8TACdH9Dw1U5Cq8koqte1XvBEnxI9
+yeMAnRB4t9PbkRXYNz4BMLU0Fa8bDU2P
+=cnpa
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.1.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.1.1.ebuild
deleted file mode 100644
index 7458ceb3492a..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.1.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.1.1.ebuild,v 1.1 2013/02/04 20:10:55 pacho Exp $
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-
-EAPI="5"
-
-inherit autotools eutils multilib udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls kernel_linux zeroconf"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	template toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libtool
-RDEPEND="virtual/libusb:0
-	cameras_ax203? ( media-libs/gd:= )
-	cameras_st2205? ( media-libs/gd:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	exif? ( >=media-libs/libexif-0.5.9:= )
-	gd? ( media-libs/gd[jpeg=] )
-	jpeg? ( virtual/jpeg )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	doc? ( app-doc/doxygen )"
-# FIXME: gtk-doc is broken
-#		>=dev-util/gtk-doc-1.10 )"
-
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-136"
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-
-	if use cameras_template || use cameras_sipix_blink; then
-		einfo "Upstream considers sipix_blink & template driver as obsolete"
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	# Fix pkgconfig file when USE="-exif"
-	if ! use exif; then
-		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-	fi
-
-	# Fix USE=zeroconf, bug #283332
-	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	local myconf
-	use doc || myconf="ac_cv_path_DOXYGEN=false"
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with zeroconf bonjour) \
-		--without-hal \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		--with-drivers=${cameras} \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(udev_get_udevdir)" \
-		${myconf}
-
-# FIXME: gtk-doc is currently broken
-#		$(use_enable doc docs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	# Empty dependency_libs in .la files, bug #386665
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# Clean up unwanted files
-	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
-	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(udev_get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 136 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 136 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	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}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild
index ae7778653b69..596e222d0430 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild,v 1.1 2013/08/03 18:00:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild,v 1.2 2013/10/10 18:40:36 pacho Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -206,7 +206,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" ; then
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[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