Version bump, use libusb-1 (#498178 by Nikoli)

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

3 files changed, 233 insertions, 16 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 507b4313bbe4..aca7823b7a65 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.246 2014/02/06 12:22:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.247 2014/02/09 10:21:12 pacho Exp $
+
+*libgphoto2-2.5.3.1 (09 Feb 2014)
+
+  09 Feb 2014; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.5.3.1.ebuild:
+  Version bump, use libusb-1 (#498178 by Nikoli)
 
   06 Feb 2014; Michael Palimaka <kensington@gentoo.org>
   libgphoto2-2.4.14-r1.ebuild, libgphoto2-2.5.2-r1.ebuild,
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 3022830240d9..aeaa804add43 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -10,26 +10,17 @@ AUX libgphoto2-2.5.2-libxml2-detection.patch 1157 SHA256 cc99141f7467067325edeac
 AUX libgphoto2-2.5.2-libxml2-detection2.patch 579 SHA256 1f8270cd93e43cb5c55b6ba335a5b4d5f6ce3aad5d079e10001e727231322d03 SHA512 f1afb74da896def6ba16630bef187be405ebc91e87964bdd542632ef5a25afd7f2f2c9ee30914f0b811b74db7b29afaee23ed23d19ab4ee54d35d1bf6dfef50f WHIRLPOOL 6db454ffea7c4c7cab28b6a642f0b3188c18cab821fb867d5ff9b149d9145c04289e81a76cae5882fd2c3d532819c8e70747cb7479ee0a3197708cbb3022453f
 DIST libgphoto2-2.4.14.tar.bz2 4481384 SHA256 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292 SHA512 4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73 WHIRLPOOL 0b9674c93f62cd060fc2134816b8dfd809e9276b8ffd943b9856ca57fac319dc4201aeab71a267a1d547bfcc7c4e80cd97d8a9d37528e16703adb57084630faf
 DIST libgphoto2-2.5.2.tar.bz2 6446235 SHA256 a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838 SHA512 f572fc6bdcb6a6363ad3ad7ac86fdd401c1d86ce82497d36c2b3c6ca6242b880e72246d8fe3e9624ecb813b3c0b123bd14adf2d1bf69a2bee3a0e837b0a4a527 WHIRLPOOL 23db9e272f3d6038c1c7eb019996eceb67a1afbbda54d7101bcc3ccb44d3bebccdd836430aac5d6c7757f55fb544256ee3cf029304b9a9a493832b0fe11979a8
+DIST libgphoto2-2.5.3.1.tar.bz2 6676451 SHA256 29322d3b163d1d91501280259ca16d1ba966e7d11739d8dc7cf07ef5e617cda2 SHA512 86dc8848103ead23e950d9e3cfd19bec14acc3ee654431731f07c9518c439c8d7d24f832e623d23f3eef0fb554641fa3da9f8ac5b8db99ee00ccf3aa478f4a6f WHIRLPOOL 7da218fe99d1d359277041f539e75032f3926178590f7b8ffb0c908e06f3c8367f160ccf730a3aadb0fe45e3687c792a086d514f03c34f05e189e1c2091d7243
 EBUILD libgphoto2-2.4.14-r1.ebuild 6241 SHA256 b77b42dfd70b09c438014e2e4185540e341ccc503c571aba8bc0e2a81362392e SHA512 334f86802898ca1c9c2d22ea1b0f90dc669c1cebdce94cced338611e25e1de62e30cddb1a0ca4ccfc888fe1939a836b4e4ddb22e0a0f4cee0c460813fa8e2068 WHIRLPOOL 5f70c4467b687f0fee934bc6e39a132fc22c24478f8215d568e42058b9da00cb72767a360af52c1d82b8750b498321babc370890f20034978955e08775b8fc60
 EBUILD libgphoto2-2.5.2-r1.ebuild 6476 SHA256 d40ec3af20dcf1418132b1ee79d3cdd9510b717aa86e6253ed3440f72f5419f2 SHA512 b2668061cbda97604c54bb9c88822542714633ae91c673131753dc26ba6df7ca0c0692f6d79f0cd4d57629e14217867f3e38af6a8dc6ca297454db2113ee61eb WHIRLPOOL 8f2e8af252e1f45a594b00366e3375c9928e162cf58d6fe8b014a52f93a87b46776dff10d2379c4700c551a139b7957035c42759dc108bd108ca19bacb0a66df
 EBUILD libgphoto2-2.5.2-r3.ebuild 6775 SHA256 9fdd6ce19cb6a61841dd1076a6c98abdf11bba67b076d473431cb2bd599e79bf SHA512 d614af76f8c5db9ce20ff143c85ecbb59065c42a61479543e6db96e8843a5f683723f43c230c179e156dd20d45491b3b940f4d60626d6bb3e642c9f4fadbac67 WHIRLPOOL 4ac2b7461b8367ed681d01d1e54022dce9c4db4a8b706e377209dc8d6a052eef97c7c4fb8c1788872374ba59b891d494b77f63b282f607b5eba764c05f85f717
-MISC ChangeLog 39596 SHA256 fac8f04d5e317186dcc0f5e60fd45875aa8314e51651fee5b3deb4fa433579aa SHA512 0f9de8bfce391fae520d81c8a3f1c1847ea8427a71f274670f07df1603fc96b35e9d45c5741a987cafc9fe436103fd23f2b3bc05308195605eb48c26abdc575b WHIRLPOOL 1c9428befcf3d937d24b920673e0d4f8e1e7b294350fd76b4412adff090b4d98b9bd11834befdd1f6923ee2f93cd071568a804ae47d5ebad8cba5d06881b0ccd
+EBUILD libgphoto2-2.5.3.1.ebuild 6472 SHA256 dfad314fd8edfe89da66a9937a4c0d6bdf6fa326c0d891dbb1b23b51c4a42b4f SHA512 d46d14213fcdabe3e759195aa21d13439bd216484184c95af296f3333b8b379b0c552f50921b74f112e02de1817109997d7e38a0c3d20237771a237792e1bee5 WHIRLPOOL d577a2a632798378279882aca34876dd3bbeea8fc83933e49dc7093329c63099c9f5809deda32122834675d48af69d33010819ca4ad2d81407bc9ce0a5eaf498
+MISC ChangeLog 39750 SHA256 19aa899dfae13aea973c7455e848f0bbb306e4a412ca3c61d2692a5a94aad78c SHA512 472476d888b272c5774a0529c05a40a3689ca67504e57b92ea440690b3c5db54136829b5c7833ce10d873eabf11ae33d596f0511f7a7cf6a25a49568ae5611ee WHIRLPOOL ae1088a979c75a8e6020842f293c16cb213adf4f8f0fa7ecb8f4979ef75cf996531bff15b494c4c1263265b4fb364630788e5410ffed969b9aee020a1c0f8223
 MISC metadata.xml 253 SHA256 d588fba550907efea387719a7a12f54e6c0ec2ca03864f9f5cf828d26fdd0e4a SHA512 810bb24e1fadd707df227dc11b1a04f25e102364dc8a709e0a082a539081afef56beb2618e2e38ed5d0c7f34c8bda966035c6ad25598ced1ddd5202260cc8079 WHIRLPOOL 0773381f0be58cda0a2ecdca7cb89638cce7b1dc774e2c13500ff43d42f8c8c771e00cc91433ddc7e1213be6267f3ad02981dd20e11590371935d02a49247b2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJS836RRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7Eg6D/kBaaGFq1EOisLeCkvxnmKsQkuBaZiaI/ZkEFMav4Nwopw+EBbus5iQkOEE
-81x89ghqtTmQhDgtK9d8mGdomxq3qoSKioUj2gVR+Bx4g7iKjw6q0NRQprmeORhS
-qo5/ZWBvgRRmDT3qGUdmFvjSiJnV1pjWdo/u3n6DSBo04O6AVmrte7xvvI/V5vXA
-cSsbZBCrWvIw8zrdf3EaJaxY8h7atGkYCVaYDgkjFxVf6LETE0SjKmgXtRefYGON
-F/MDKWtSgBfWuyEOS8Z3eVdo3addsZwTt0yydDo5wZyWPCEqMmSWfIm2SXif+9z/
-YeRo5HXBfiokXwMEZST8+N8QujZpWsjzHN/OLU4qhDTmwD16F/mm7Cq92AvEnuvt
-GFQQyRYdDBtwaKdcfUrTzMkBNvF/lH+mPUpmEKyC2dwKkBeDc80vFSIhKwCyWRR2
-JjEFLw07iPpIWLEZ650y2TlTRQd552/IrjASD5tZrpRCATomZ8/bTbFhjsWAVUrh
-y9YasS+T3qZj55h8TP2Hbs6CY4CajO55bcXxD4YadqDW+HRRyBsG86VC5PZNE9sw
-QwvnZMgL+Cv6SknE64nU+knjM5AsuYNJz8fEVW0ooNFkiugauDeELfhHW9zyTi5F
-Vh40wsYYK+ISVbEwPrqbmxyad7DTRr/r/5/PG84FlX5Zq1qXmg==
-=XobF
+iEYEAREIAAYFAlL3VpkACgkQCaWpQKGI+9T3OACggCPASZK9/U4U1Yu/IamLh0+3
+6loAnjg/HT144JAB4tXV/Eq431orri5Z
+=eKgL
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild
new file mode 100644
index 000000000000..14a584726202
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild,v 1.1 2014/02/09 10:21:12 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 serial 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 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} cameras_${camera}"
+done
+
+# libgphoto2 actually links to libtool
+RDEPEND="
+	dev-libs/libxml2:2
+	sys-devel/libtool
+	virtual/libusb:1
+	cameras_ax203? ( media-libs/gd:= )
+	cameras_st2205? ( media-libs/gd:= )
+	exif? ( >=media-libs/libexif-0.5.9:= )
+	gd? ( media-libs/gd[jpeg=] )
+	jpeg? ( virtual/jpeg:0 )
+	serial? ( dev-libs/lockdev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# FIXME: gtk-doc is broken
+#		>=dev-util/gtk-doc-1.10 )"
+
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-175"
+
+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
+}
+
+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
+
+	sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
+
+	# 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"
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	econf \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_with zeroconf bonjour) \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${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 175 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 175 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	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
+
+	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+}