Version bump.

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

3 files changed, 221 insertions, 6 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 7bf829569b2f..a9bb6d344329 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.209 2012/06/09 00:00:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.210 2012/06/30 12:33:43 pacho Exp $
+
+*libgphoto2-2.4.14 (30 Jun 2012)
+
+  30 Jun 2012; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.4.14.ebuild:
+  Version bump.
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> libgphoto2-2.4.11-r1.ebuild,
   libgphoto2-2.4.12.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 5af454104066..196a58df9d7b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -8,14 +8,16 @@ AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b57
 AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b1517 SHA1 9dfbe07ccb18b57e545cdbd35f8654832727a62d SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5
 DIST libgphoto2-2.4.11.tar.bz2 4396949 RMD160 f4978edecd0869f91d15b0c9805dd856b856f14c SHA1 615776c8c0201e98bfe158ae8c2cec35f93236f0 SHA256 5116bbacea57dfe22585e8e939ea30b5fb99fe08de526002788c84e37105c423
 DIST libgphoto2-2.4.12.tar.bz2 4430444 RMD160 be75a0d0bd29b11b611bc62331120d71ef2997af SHA1 b199e926424b7544d8877a9cf94b91686b7824ea SHA256 5b6c5d25e9f610e6b2d9e2b35ee77258b15f6ecb67de344395eddddc0345f322
+DIST libgphoto2-2.4.14.tar.bz2 4481384 RMD160 b9fb62e218e9a4a4ab009ada031c3d7c6362ee3d SHA1 c932f44d51e820245ff3394ee01a5e9df429dfef SHA256 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 EBUILD libgphoto2-2.4.11-r1.ebuild 6240 RMD160 8181de5d52172d05ff1b0816ea2f29d5550f2df3 SHA1 6262bdaf34a6d297c4c0a4b7eac8a0b47b5e6396 SHA256 d1fd989a56a7276ff7b12d5cbf05be5b852ad4615f2e1392119c8c814ce22dd3
 EBUILD libgphoto2-2.4.12.ebuild 6134 RMD160 e99a75ff3677060bb0f0c86823f0214daf44033f SHA1 b5923d1cd64d1f39f12075cf948be95a28170401 SHA256 4ce41b3c5fd3bef267b784c8e81b6b9b31ea3478470cef891b3c3cc6815cb937
-MISC ChangeLog 34330 RMD160 bea9e51259e8d15d87e17986c66816dfa4527d09 SHA1 56d741b78f17d8095684ce3a788560d344862352 SHA256 9f48cd5bff194c25a4f0e876903f3b687a511cd24298a3da55280a47821436d4
+EBUILD libgphoto2-2.4.14.ebuild 6136 RMD160 7b3c3603392068469cf8180fd04d529134e8f2be SHA1 7d8a4a61d3a712263d147c287db3a724537bbc72 SHA256 6676438d9347e5ef5124a271780dd88913b56c70896c6e5871e8d5505d916986
+MISC ChangeLog 34452 RMD160 e921f12075b9d0033a5401371e6c49834fd1948e SHA1 4ae3d9b5f3cae1b6442cb72b090fb12420b0d139 SHA256 24a5fb9e45452b1832c372f21c0a0bd7a828131bd021df8f83edbd0e99b9675c
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/SkkAACgkQ/ejvha5XGaPPRgCgnAmzuzch068rDbTLMzSJUXEn
-fr0AoKaI6ApQ581jlS+B364mH0AxYCWM
-=Yq/f
+iEYEARECAAYFAk/u8iwACgkQCaWpQKGI+9Q+dwCeJU8Pdbmv8BN/dGCCK8NRkcwP
+0b8AnA5JhnmGvd/uIdrpzayBgMnVktmD
+=w6Mj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.14.ebuild
new file mode 100644
index 000000000000..122dc411efd4
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.4.14.ebuild
@@ -0,0 +1,208 @@
+# 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.ebuild,v 1.1 2012/06/30 12:33:43 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="4"
+
+inherit autotools eutils multilib 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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.18.1
+	doc? ( app-doc/doxygen )"
+# FIXME: gtk-doc is broken
+#		>=dev-util/gtk-doc-1.10 )"
+
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-136"
+
+pkg_setup() {
+	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
+
+	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"
+
+	# Do not build test if not running make check, bug #226241
+	epatch "${FILESDIR}/${PN}-2.4.7-no-test-build.patch"
+
+	# Increase max entries from 1024 to 8192 to fix bug #291049
+	epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.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=/usr/share/doc/${PF} \
+		--with-html-dir=/usr/share/doc/${PF}/html \
+		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir=/lib/udev \
+		${myconf}
+
+# FIXME: gtk-doc is currently broken
+#		$(use_enable doc docs)
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Empty dependency_libs in .la files, bug #386665
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	# Clean up unwanted files
+	rm "${D}/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 "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	UDEV_RULES="/lib/udev/rules.d/70-libgphoto2.rules"
+	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${D}"${CAM_LIST} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		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}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${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() {
+	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
+}