Version bump

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

3 files changed, 222 insertions, 6 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index fd0d8f2d380a..66a903e00b69 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.226 2012/12/23 19:11:17 maekke Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.227 2013/02/04 20:10:55 pacho Exp $
+
+*libgphoto2-2.5.1.1 (04 Feb 2013)
+
+  04 Feb 2013; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.5.1.1.ebuild:
+  Version bump
 
   23 Dec 2012; Markus Meier <maekke@gentoo.org> libgphoto2-2.5.0.ebuild:
   add ~arm
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index e0e62564e123..bf2fa52f0450 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -8,15 +8,17 @@ 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
+DIST libgphoto2-2.5.1.1.tar.bz2 3363878 SHA256 b4a3a9eeb89bc90d1d10f291e792d7744f415ebc4c4347f4177e83dcb3b7ed14 SHA512 a24f37ea077d3eea731799dafe107787f6a8a4e27aa214e03973bdd897a5ef4d934b5fe04aad23191141bedbfe8d40c320b2bcb15e5c1d242af9dcc8ce3a4418 WHIRLPOOL 1403ef8c51fb84538784b9335e64a3cadc6e974d24a519e5978fc6090fd7cba05ad1a6d5ebd93536a5683fb4513d1136ca744ea5ad7334576ed773bc7a4d2cfc
 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 6343 SHA256 22fa3825428728b9e052da103ad3573ac4d9b3cba1efd3d7b893d42c29c83382 SHA512 8c449b8cc9e287da620e582ca67fa92392729ebde1c06b62ca96be3df4095df9453cfeff6662c1bb21cb8a071702871c09f7aefe85132134aa55ddf3d8bdb337 WHIRLPOOL 8a88fc17cf80dc1a454a669d3ac074042c489a18514f936317b4dc327a7c221bba37f13dfb7e1a70f36c38097a7a8c9e7d8b2e3cff15d886a8eac7b5140bb297
-MISC ChangeLog 36601 SHA256 bea24af6e1170e40039cfe0b183a27bdd3739a2a83d2d61a677adf5a129d7e66 SHA512 2aff6e472570de9e6d7ac78969f7e833bf1128843e7efeb99be9f52bbafe174334b0bf1c9cd821b882b23b1f4a05062b5c7abc51b9f371369a173d8432812ee9 WHIRLPOOL 2d6bb3eba947a51097773d93ffd5b74526b01ea3b600a77c2ae8ff163cd9ea34586fb7505aeaa6c273ab93af0fd7615fc828f605c8664daaa4f293112b6dcf07
+EBUILD libgphoto2-2.5.1.1.ebuild 6139 SHA256 117ba22b649de82bb42aa9bb616c9312dd3dde7aa5e88c7eb7cc5dd1e81e4470 SHA512 b07b4de44d1215aae84beb627833bc0a5d2a8cfe7261cebcf3ca4d4aa60514963c9e49279d55233be5ee1d16b4df9d78958f1faae98f1ffc5046d40a254c0e87 WHIRLPOOL 953ab92a77c94e70021fe106ee55743578556aa0536161b3d72eb5aa4b1acc2000be5f995b092ede60567db79a867927fccb26d093fa35d421c71e6b29a4cec8
+MISC ChangeLog 36725 SHA256 fdb8792c0053d1d7092c39553894a7e63bc1eb9a24be3d449a400bb0f008cb0c SHA512 26f113f8b203ccc6681014a051d789aa3e75cceee99a92afecbf2a5b0176f7565bda282c9711c94f011fc39f53980b455c5f29834d7a3e462b759e1ab541aa82 WHIRLPOOL fc8215585a771a82903d3d42fae8c51d3a72fa27f127a41ffd1c1b0d723586d4d8ac4b82a5789a8692517af019f413721e6246096aea14d873ec1a6d583feac8
 MISC metadata.xml 182 SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b SHA512 6b61b8de171da5556ddf719a13a0053fdf6d26c891f6c7ffedebe51c3f88f6d2b15451e43819705841c6818d3a5cf4d2466c92b5a1ee654ca6e5de7436570859 WHIRLPOOL 5487cc56cd31c1326162f3b15018e1d43a0e42086480ee53f6893e8eeee63a27bbec99844f3de3d40ea8e6ab6721087831f398b761ea0c827ce56e4e1473b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDXWFgACgkQkKaRLQcq0GJkcACdENZnM/9u7JOxN6EFXR5ELcsg
-xbsAoJK4aEZ5k5YHs+/JBSVIi3haVLSS
-=vy/k
+iEYEAREIAAYFAlEQFdEACgkQCaWpQKGI+9QbQwCeLKv1BWcgq5/2I41I0R4TySh0
+MfoAnAi50u3wa7IqO5S96ilEfREq5lCK
+=e07V
 -----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
new file mode 100644
index 000000000000..7458ceb3492a
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.1.1.ebuild
@@ -0,0 +1,209 @@
+# 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
+}