Version bump, fix gd detection (#510934 by mgorny), drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

10 files changed, 31 insertions, 582 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 224f9f86b4fb..8c167277c509 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,18 @@
 # 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.256 2014/05/17 15:31:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.257 2014/05/21 18:28:44 pacho Exp $
+
+*libgphoto2-2.5.4 (21 May 2014)
+
+  21 May 2014; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.5.4.ebuild,
+  -files/libgphoto2-2.4.7-no-test-build.patch,
+  -files/libgphoto2-2.4.8-increase_max_entries.patch,
+  -files/libgphoto2-2.4.9-dnl.patch, -files/libgphoto2-2.5.2-canon-s100.patch,
+  -files/libgphoto2-2.5.2-libxml2-detection.patch,
+  -files/libgphoto2-2.5.2-libxml2-detection2.patch,
+  -libgphoto2-2.4.14-r1.ebuild, -libgphoto2-2.5.2-r1.ebuild,
+  -libgphoto2-2.5.2-r3.ebuild:
+  Version bump, fix gd detection (#510934 by mgorny), drop old
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> libgphoto2-2.5.3.1.ebuild:
   Stable for alpha, wrt bug #508862
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch
deleted file mode 100644
index 9fcabd9e8b0a..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not build tests if not running make check
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241
---- a/libgphoto2_port/test/Makefile.am	2010-01-07 01:04:40.000000000 +0100
-+++ b/libgphoto2_port/test/Makefile.am	2010-01-07 01:04:57.000000000 +0100
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = test-gp-port
-+check_PROGRAMS = test-gp-port
- 
- test_gp_port_CPPFLAGS = \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) \
---- a/tests/Makefile.am	2010-01-07 00:56:14.000000000 +0100
-+++ b/tests/Makefile.am	2010-01-07 00:56:40.000000000 +0100
-@@ -2,7 +2,9 @@
- 
- check_PROGRAMS = \
- 	test-camera-list \
--	test-pedantic-c
-+	test-pedantic-c \
-+	test-gphoto2	\
-+	test-filesys
- 
- if HAVE_CXX
- check_PROGRAMS += test-pedantic-cxx
-@@ -22,10 +24,6 @@
- 
- CLEANFILES = $(check_SCRIPTS)
- 
--noinst_PROGRAMS =	\
--	test-gphoto2	\
--	test-filesys
--
- test_gphoto2_SOURCE = test-gphoto2.c
- test_gphoto2_LDADD = \
- 	$(top_builddir)/libgphoto2/libgphoto2.la \
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch
deleted file mode 100644
index 16aadd117528..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Increase max entries from 1024 to 8192 until 
-http://sourceforge.net/tracker/index.php?func=detail&aid=1515453&group_id=8874&atid=108874
-fix is backported to 2.4 branch.
-This fixes http://bugs.gentoo.org/show_bug.cgi?id=291049
---- a/libgphoto2/gphoto2-list.c
-+++ b/libgphoto2/gphoto2-list.c
-@@ -72,7 +72,7 @@
- 
- #ifdef CAMERALIST_STRUCT_COMPATIBILITY
- 
--#define MAX_ENTRIES 1024
-+#define MAX_ENTRIES 8192
- #define MAX_LIST_STRING_LENGTH 128
- struct _CameraList {
- 	int  count;
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch
deleted file mode 100644
index 8ee30baf8f74..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/336598
-
---- libgphoto2_port/m4/gp-libltdl.m4
-+++ libgphoto2_port/m4/gp-libltdl.m4
-@@ -23,7 +23,7 @@
- 
- Please make sure that the proper development package is installed
- (libltdl-dev, libtool-ltdl-devel, etc.)
--])dnl
-+])[]dnl
- ])dnl
- ])
- else
---- m4m/gp-libltdl.m4
-+++ m4m/gp-libltdl.m4
-@@ -23,7 +23,7 @@
- 
- Please make sure that the proper development package is installed
- (libltdl-dev, libtool-ltdl-devel, etc.)
--])dnl
-+])[]dnl
- ])dnl
- ])
- else
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch
deleted file mode 100644
index 3e83213f2b3f..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.5.2-canon-s100.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgphoto2-2.5.2.orig/camlibs/canon/canon.c

-+++ libgphoto2-2.5.2/camlibs/canon/canon.c

-@@ -125,7 +125,7 @@ const struct canonCamModelData models[]

-         /* 3042 is a scanner, so it will never be added here. */

-         {"Canon:PowerShot S20",         CANON_CLASS_0,  0x04A9, 0x3043, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S20"},

-         {"Canon:EOS D30",               CANON_CLASS_4,  0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

--        {"Canon:PowerShot S100",        CANON_CLASS_0,  0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

-+        {"Canon:PowerShot S100 (2000)", CANON_CLASS_0,  0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

-         {"Canon:IXY DIGITAL",           CANON_CLASS_0,  0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

-         {"Canon:Digital IXUS",          CANON_CLASS_0,  0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},

-         {"Canon:PowerShot G1",          CANON_CLASS_0,  0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot G1"},
\ No newline at end of file
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch
deleted file mode 100644
index 54f539f58f2a..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/trunk/libgphoto2/configure.ac
-+++ b/trunk/libgphoto2/configure.ac
-@@ -273,22 +273,14 @@
- GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}])
- 
- dnl ---------------------------------------------------------------------------
--dnl check for libxml22
--dnl ---------------------------------------------------------------------------
--LIBXML2=""
--libxml2_msg="no"
--AC_SUBST(LIBXML2)
--AC_ARG_WITH([libxml2], AS_HELP_STRING([--without-libxml2], [Build without libxml2 library (default: no)]))
--AS_IF([test "x$with_libxml2" != "xno"], [
--	AC_CHECK_LIB(xml2,xmlFirstElementChild,[
--		AC_CHECK_HEADER(libxml/parser.h,[
--			AC_DEFINE(HAVE_LIBXML2,1,[define if we found LIBXML2 and its headers])
--			LIBXML2="-lxml2"
--			libxml2_msg="yes"
--		])
--	])
--])
--GP_CONFIG_MSG([LIBXML2 to support Olympus E remote control],[${libxml2_msg}])
-+dnl check for libxml2
-+dnl ---------------------------------------------------------------------------
-+GP_CONFIG_MSG([libxml2 support])
-+GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0],
-+                [libxml/parser.h],[xmlFirstElementChild],[],[],
-+                [default-on],
-+                [http://xmlsoft.org]
-+)
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch
deleted file mode 100644
index a2d326bcd495..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/trunk/libgphoto2/camlibs/ptp2/Makefile-files
-+++ b/trunk/libgphoto2/camlibs/ptp2/Makefile-files
-@@ -4,6 +4,7 @@
- 
- EXTRA_LTLIBRARIES += ptp2.la
- 
-+ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS)
- ptp2_la_SOURCES = \
- 	ptp2/ptp.c ptp2/ptp.h \
- 	ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \
-@@ -12,4 +13,4 @@
- 	ptp2/olympus-wrap.c ptp2/olympus-wrap.h
- ptp2_la_LDFLAGS = $(camlib_ldflags)
- ptp2_la_DEPENDENCIES = $(camlib_dependencies)
--ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2)
-+ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS)
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild
deleted file mode 100644
index a39f565158da..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.4.14-r1.ebuild,v 1.12 2014/02/06 12:22:37 kensington 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 udev user toolchain-funcs
-
-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:0 )
-	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="$(udev_get_udevdir)" \
-		${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="$(udev_get_udevdir)/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() {
-	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}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild
deleted file mode 100644
index 3bc85af896b9..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.2-r1.ebuild,v 1.5 2014/02/06 12:22:37 kensington 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 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:0
-	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 )
-	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
-
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure.ac libgphoto2_port/configure.ac || die
-
-	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"
-
-	# Fix libxml2 detection, bug #491782
-	epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.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
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with zeroconf bonjour) \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		--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
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild
index b05c6a2ac5ca..a995bdcd518e 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.2-r3.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r3.ebuild,v 1.2 2014/02/06 12:22:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild,v 1.1 2014/05/21 18:28:44 pacho Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -52,7 +52,7 @@ done
 RDEPEND="
 	dev-libs/libxml2:2
 	sys-devel/libtool
-	virtual/libusb:0
+	virtual/libusb:1
 	cameras_ax203? ( media-libs/gd:= )
 	cameras_st2205? ( media-libs/gd:= )
 	exif? ( >=media-libs/libexif-0.5.9:= )
@@ -60,18 +60,15 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	serial? ( dev-libs/lockdev )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	!<sys-fs/udev-175
 "
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	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
@@ -89,25 +86,17 @@ src_prepare() {
 		|| die "examples sed failed"
 
 	# Fix pkgconfig file when USE="-exif"
+	# https://sourceforge.net/p/gphoto/bugs/980/
 	if ! use exif; then
 		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
 	fi
 
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure.ac libgphoto2_port/configure.ac || die
-
 	sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
 
 	# Fix USE=zeroconf, bug #283332
+	# https://sourceforge.net/p/gphoto/bugs/981/
 	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
 
-	# Fix libxml2 detection, bug #491782
-	epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.patch
-
-	# Fix Canon S100 detection, bug #496754 (fixed in 2.5.3)
-	epatch "${FILESDIR}"/${P}-canon-s100.patch
-
 	eautoreconf
 }
 
@@ -135,6 +124,12 @@ src_configure() {
 	local myconf
 	use doc || myconf="ac_cv_path_DOXYGEN=false"
 
+	# gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/
+	if use gd; then
+		export LIBGD_CFLAGS=" "
+		export LIBGD_LIBS="-lgd"
+	fi
+
 	# Upstream doesn't default to --enable-option-checking due having another
 	# configure in libgphoto2_port/ that also needs to be checked on every bump
 	#
@@ -149,6 +144,8 @@ src_configure() {
 		$(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} \
@@ -157,9 +154,6 @@ src_configure() {
 		--with-rpmbuild=$(type -P true) \
 		udevscriptdir="$(udev_get_udevdir)" \
 		${myconf}
-
-# FIXME: gtk-doc is currently broken
-#		$(use_enable doc docs)
 }
 
 src_compile() {
@@ -176,6 +170,10 @@ src_install() {
 	# Empty dependency_libs in .la files, bug #386665
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 
+	# Remove recursive symlink
+	# https://sourceforge.net/p/gphoto/bugs/983/
+	rm "${ED}/usr/include/gphoto2/gphoto2" || die
+
 	# Clean up unwanted files
 	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
 	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING