Version bump. Updated translations, usb/mtp ids, bug fixes. Clean up old revisions.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

9 files changed, 52 insertions, 507 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 648485bf69f1..8e0b4af7470f 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.162 2010/01/14 16:44:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.163 2010/01/24 19:35:30 eva Exp $
+
+*libgphoto2-2.4.8 (24 Jan 2010)
+
+  24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gphoto2-ixany.patch, -files/libgphoto2-2.4.0-rpm.patch,
+  -libgphoto2-2.4.3.ebuild, -files/libgphoto2-2.4.3-automagic.patch,
+  -files/libgphoto2-2.4.3-gcc43.patch, -libgphoto2-2.4.7.ebuild,
+  -libgphoto2-2.4.7-r1.ebuild, +libgphoto2-2.4.8.ebuild:
+  Version bump. Updated translations, usb/mtp ids, bug fixes. Clean up old
+  revisions.
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> libgphoto2-2.4.6.ebuild:
   Stable for HPPA (bug #282849).
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index d9f0415c3b8f..8dd041729b79 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,17 +1,21 @@
-AUX gphoto2-ixany.patch 533 RMD160 84c48af39a8e843765816060656132a4dd467b22 SHA1 2021fdc650a29c0faef13d5feba91ba635fc3d00 SHA256 abaffc4911b4cc60b0df55ad7055a0a71b2b1d79390ba21a20dd9c911954ffca
-AUX libgphoto2-2.4.0-rpm.patch 452 RMD160 694c3f602a6b20fbcd135586d69551e335328f84 SHA1 ebbee5e9c4a6c1659e6fe7278733ce9b1702d430 SHA256 39501ccdfc6c780b3aa6a105584b32e9e4a6ad7195a14a341210be9f2e871149
-AUX libgphoto2-2.4.3-automagic.patch 2111 RMD160 6cf8795ebfde7f20815979fa0a37152966ba768b SHA1 24d0e1278640918dbc182df38b2955fe5fab370c SHA256 5e259e288924cb1183c7953367e6f8933f99f358e4d43a1967b3273769725a90
-AUX libgphoto2-2.4.3-gcc43.patch 518 RMD160 d7e97ebe24b021ec6cdf8e9cc6372349ca233da2 SHA1 5617c07b8667313151d0a0f0c04b7fbcad21f91b SHA256 72f955095498e4ae53f02ec68f2e0c433240340ebd542e7cfbd5c7921472453e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgphoto2-2.4.7-extra-dist.patch 451 RMD160 c908aafa0946e41cb43c2891ecca42859f219207 SHA1 ed0089c85ca129eb515412d2493475409147f0dc SHA256 d447cdc4fcfde5e28ef50e6d6bf3a0a01440473fbecedca99ecd105ed43d2866
 AUX libgphoto2-2.4.7-no-test-build.patch 910 RMD160 fbc59f08c752874df09f63beca0c89fc5e6a2e96 SHA1 4518c19cc1e21eac86cbbaf8ca3d33193ee6adc8 SHA256 a5d7ab59c51bb9751ade660828447d4767ab6266192345dbb22c820232e9291e
 AUX libgphoto2-2.4.7-respect-bonjour.patch 643 RMD160 09724f2d7ad94938785709548ca7d246aa3bfac4 SHA1 49334840e851f3ab0c632df5031acbbae7335c57 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055
-DIST libgphoto2-2.4.3.tar.bz2 5172531 RMD160 9ab2af4c8fb2cd1ed2ff6c58b32a5529285bbb69 SHA1 4fd95a933baec20ef1264b841dde5864fd00d982 SHA256 d4c1c7e7f4b35ffe4104161fdd8fe8ca9f0723c525a65b8685d808fdf833db42
 DIST libgphoto2-2.4.6.tar.bz2 5268340 RMD160 cca194a6db6658887b1b997838c7d6a5af9e2609 SHA1 f9fd10495ababce3cf992b36f3a29359e598aea7 SHA256 cbfad37afb6a65f93ce16fbe1e8a1201ef3586c614deca5cc51afc8011245606
 DIST libgphoto2-2.4.7.tar.bz2 5279581 RMD160 f5773f3b194f4dcc4a82ddbbf7ecad12e11dae93 SHA1 f91aef06204f3b1b0f3e07facba452881bedc2e1 SHA256 9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f
-EBUILD libgphoto2-2.4.3.ebuild 6340 RMD160 78a79b0ad195d01a9036412b347724015cfdabcd SHA1 8b7170ede08744b265d574be998d0aa3108c50b9 SHA256 2be701aeca1fe3a264550e2ad14837eee6f460840e2e9fdf1cc9618355858b4a
+DIST libgphoto2-2.4.8.tar.bz2 5371128 RMD160 0edc03231e1c646e45621b9adb09e268582b4437 SHA1 6ad0d9ffcafe2e9eba0cae958a4455ebb4cf2037 SHA256 69d7e0723b40e8a0c4fa897b96f6aecb5ae5548c3cce98c48e37b70623d9ffc3
 EBUILD libgphoto2-2.4.6.ebuild 5861 RMD160 ec31b2783dcea0687b2495f930af02b0482ef703 SHA1 55cc824df0c14b09cbe191247651cf04b5db1aeb SHA256 ece5b746417de446029a3b1a87902370b57298e4df5a605e565eec2da2f8975d
-EBUILD libgphoto2-2.4.7-r1.ebuild 5875 RMD160 2a26a8d17f7d32235438aad9d483d91489adec45 SHA1 b7ddef36bc63f8048ea5407625069b92a8307604 SHA256 b089c794aadad686cb0df390b148a065d34a282f17344c41594d2e153ad3a97a
 EBUILD libgphoto2-2.4.7-r2.ebuild 6588 RMD160 02bf29cdf40405f586232cb21fe35f9faf67b4d4 SHA1 921cd1b2625815875b580f034cbf433601bc91f7 SHA256 c3c4e2ec8e41a0e0410d459f37433690a891f9a60ed32575f5be1fde12279805
-EBUILD libgphoto2-2.4.7.ebuild 5859 RMD160 a4cc54f7ee8c306252e6affaab5a356a94f5883b SHA1 242e8edaeb6efbecaf6cfdaf8d267fc776602667 SHA256 0ae3c9f7ba2e502ff58903597c77070a0e0baf87d1f1e2ba4714ac80c9200d02
-MISC ChangeLog 27106 RMD160 cd4115754a573b09a86b3a60fb49611ed45719b5 SHA1 4399cc1213dd8f2f57e7c0de356eea3c0e104018 SHA256 4170b0ceb46f3df7f06e59e1449e54470f590866ca753a476afcdecb87c762c7
+EBUILD libgphoto2-2.4.8.ebuild 6502 RMD160 69162270562f4f1d0c87007e11a15cfd26c134e3 SHA1 c1d1071eb3416ee21c3708f94977f17a68948807 SHA256 c0df41acfc984a6edd75a166dc779e95d7d92cd2c00cad3945daaa63dfbfa8b9
+MISC ChangeLog 27538 RMD160 3b1006c2f2833262571536e8c743bda06480a419 SHA1 8585a716319fd3c13d3ad55e6e6a679e931b55cc SHA256 edc837bd4851c49e713c93133876278167a3bb877e2608199bbe0f1bcfb83c51
 MISC metadata.xml 255 RMD160 182d44452574b19b29c12dc7e757a2a4aa9cbc20 SHA1 7e912f6a5b9a294509849512ba044bd88b59065f SHA256 d2cc84bd8e8d171980c022b0af42cf2f2d829e37c05183988a211fccafcf363b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktcoQgACgkQ1fmVwcYIWAafrgCg1ZaC0STh/XeuN15ENORz0b/9
+xhIAn3NZ+p0D+XMrSW5fKwJuuNcn4WMU
+=3zd1
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/gphoto2-ixany.patch b/media-libs/libgphoto2/files/gphoto2-ixany.patch
deleted file mode 100644
index 09d9d904b3eb..000000000000
--- a/media-libs/libgphoto2/files/gphoto2-ixany.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c
---- libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany	2007-07-27 02:36:13.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/serial/unix.c	2008-02-25 06:40:40.000000000 +0100
-@@ -98,6 +98,10 @@
- 
- #define CHECK(result) {int r=(result); if (r<0) return (r);}
- 
-+#ifndef IXANY
-+#define IXANY	0004000
-+#endif
-+
- /* Linux */
- #ifdef __linux__
- /* devfs is accounted for in the implementation */
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch
deleted file mode 100644
index c34e995ae54f..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2007-09-24 22:21:16.000000000 +0200
-+++ configure	2007-09-24 22:21:27.000000000 +0200
-@@ -26609,7 +26609,7 @@
- # whether libusb-devel is installed or not defines whether the RPM
- # packages we're going to build will depend on libusb and libusb-devel
- # RPM packages or not.
-- if rpm -q libusb-devel > /dev/null 2>&1; then
-+ if false -q libusb-devel > /dev/null 2>&1; then
-   RPM_LIBUSB_DEVEL_TRUE=
-   RPM_LIBUSB_DEVEL_FALSE='#'
- else
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch
deleted file mode 100644
index 4764e1d72b20..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/libgphoto2_port/configure.ac	2008-11-29 22:04:31.000000000 +0100
-+++ b/libgphoto2_port/configure.ac	2008-11-29 22:10:50.000000000 +0100
-@@ -161,14 +161,25 @@
- ])
- ])
- 
-+dnl ---------------------------------------------------------------------------
- dnl Apple Bonjour / mDNSResponder multicast DNS queries.
-+dnl ---------------------------------------------------------------------------
-+
- MDNS_LIBS=
--AC_CHECK_HEADER([dns_sd.h],[
--		AC_CHECK_LIB(dns_sd,DNSServiceResolve,[
--			MDNS_LIBS="-ldns_sd"
--			AC_DEFINE(HAVE_MDNS_BONJOUR,1,[Define if you have Bonjour/mDNSResponder.])
--		])
--])
-+have_bonjour=false
-+
-+AC_ARG_ENABLE([bonjour],
-+	AS_HELP_STRING([--disable-bonjour], [disable Bonjour support]),
-+	,enable_bonjour=yes)
-+
-+if test "x$enable_bonjour" = "xyes"; then
-+   AC_CHECK_HEADER([dns_sd.h],[
-+      AC_CHECK_LIB(dns_sd,DNSServiceResolve,[
-+         MDNS_LIBS="-ldns_sd"
-+	 AC_DEFINE(HAVE_MDNS_BONJOUR,1,[Define if you have Bonjour/mDNSResponder.])
-+      ])
-+   ])
-+fi
- 
- dnl Check for mnt_mountp in struct mnttab
- AC_MSG_CHECKING([for mnt_mountp in struct mnttab])
-@@ -347,15 +358,24 @@
- dnl ---------------------------------------------------------------------------
- dnl disk - hal and various stuff
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(HAL, [dbus-1 >= 0.31 hal >= 0.5.0], 
-+have_hal=false
-+
-+AC_ARG_ENABLE([hal],
-+	AS_HELP_STRING([--disable-hal], [disable HAL support]),
-+	,enable_hal=yes)
-+
-+if test "x$enable_hal" = "xyes"; then
-+   PKG_CHECK_MODULES(HAL, [dbus-1 >= 0.31 hal >= 0.5.0], 
- 		       [have_hal=true], 
- 		       [have_hal=false])
--if test "x$have_hal" = "xtrue"; then
--   AC_SUBST(HAL_CFLAGS)
--   AC_SUBST(HAL_LIBS)
--   AC_DEFINE(HAVE_HAL,1,[defined if HAL is available])
-+   if test "x$have_hal" = "xtrue"; then
-+      AC_SUBST(HAL_CFLAGS)
-+      AC_SUBST(HAL_LIBS)
-+      AC_DEFINE(HAVE_HAL,1,[defined if HAL is available])
-+      IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk"
-+   fi
- fi
--IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk"
-+
- 
- dnl ptpip - works 'everywhere' with TCP/IP stack.
- IOLIB_SUBDIRS="$IOLIB_SUBDIRS ptpip"
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch
deleted file mode 100644
index cec7b0f1b973..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.3-gcc43.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=249677
-#
-diff -Naur libgphoto2-2.4.3-orig/camlibs/smal/ultrapocket.c libgphoto2-2.4.3/camlibs/smal/ultrapocket.c
---- libgphoto2-2.4.3-orig/camlibs/smal/ultrapocket.c	2008-10-18 11:55:46.000000000 -0600
-+++ libgphoto2-2.4.3/camlibs/smal/ultrapocket.c	2008-12-02 20:41:07.000000000 -0600
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #include <gphoto2/gphoto2-port-log.h>
- #include <gphoto2/gphoto2-library.h>
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild
deleted file mode 100644
index 685feb7b3991..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild,v 1.10 2010/01/07 00:28:42 eva 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
-# 3. Track upstream bug regarding rpm usage.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874
-
-EAPI="2"
-
-inherit autotools eutils multilib
-
-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="hppa"
-
-IUSE="bonjour doc exif hal nls kernel_linux"
-RESTRICT="test"
-
-# 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 barbie canon casio_qv clicksmart310
-digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
-jamcam jd11 jl2005a kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
-konica konica_qm150 largan lg_gsm mars dimagev 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 stv0674 stv0680 sx330z template toshiba_pdrm11
-topfield"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libtool
-RDEPEND="=virtual/libusb-0*
-	bonjour? ( || (
-		net-dns/avahi[mdnsresponder-compat]
-		net-misc/mDNSResponder ) )
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? (
-		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-1 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/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-114"
-
-pkg_setup() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
-		einfo "All camera drivers will be built since you did not specify"
-		einfo "via the CAMERAS variable what camera you use."
-		ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
-	fi
-
-	if use cameras_template || use cameras_sipix_blink; then
-		einfo "Upstream considers sipix_blink & template driver as obsolete"
-	fi
-
-	enewgroup plugdev
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
-
-	# Fix pkgconfig file when USE="-exif"
-	use exif || sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-
-	# Fix bug #216206, libusb detection
-	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
-
-	# Fix building on alpha, bug #221853 comment #6
-	epatch "${FILESDIR}/gphoto2-ixany.patch"
-
-	# Fix compilation with gcc 4.3, bug #249677
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	# Fix automagic dependencies, bug #242470
-	epatch "${FILESDIR}/${P}-automagic.patch"
-
-	cd "${S}/libgphoto2_port"
-	eautoreconf
-}
-
-src_configure() {
-	local cameras
-	local cam
-	for cam in ${IUSE_CAMERAS} ; do
-		use "cameras_${cam}" && cameras="${cameras},${cam}"
-	done
-
-	[ -z "${cameras}" ] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-
-	einfo "Enabled camera drivers: ${cameras}"
-	[ "${cameras}" != "all" ] && \
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-
-	local myconf
-
-	use exif \
-		&& myconf="${myconf} --with-libexif=/usr" \
-		|| myconf="${myconf} --with-libexif=no"
-
-	econf \
-		${myconf} \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_enable bonjour) \
-		$(use_enable hal) \
-		$(use_enable nls) \
-		--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=/bin/true \
-		udevscriptdir=/$(get_libdir)/udev
-
-# FIXME: gtk-doc is currently broken
-#		$(use_enable doc docs)
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	if use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# 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
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING
-
-	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
-	UDEV_RULES="/etc/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}"
-
-		if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then
-				einfo "Generating HAL FDI files ..."
-				mkdir -p "${D}"/${HAL_FDI%/*}
-				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
-					|| die "failed to create hal-fdi"
-		else
-			ewarn "No HAL FDI file generated because no real camera driver enabled"
-		fi
-
-		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 0.98 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 or HAL FDI files."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${CAM_LIST} udev-rules version 0.98 group plugdev > ${UDEV_RULES}"
-		eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}"
-	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
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.7.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.7.ebuild
deleted file mode 100644
index f58ab3c57a3e..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.7.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.7.ebuild,v 1.2 2009/08/31 12:43:54 mrpouet 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="2"
-
-inherit multilib eutils
-
-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"
-
-IUSE="bonjour doc exif hal nls kernel_linux"
-RESTRICT="test"
-
-# 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 barbie canon casio_qv clicksmart310
-digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
-jamcam jd11 jl2005a kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
-konica konica_qm150 largan lg_gsm mars dimagev 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 stv0674 stv0680 sx330z template toshiba_pdrm11
-topfield"
-
-# jl2005c is still experimental -> not enabled
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libtool
-RDEPEND="virtual/libusb:0
-	bonjour? ( || (
-		net-dns/avahi[mdnsresponder-compat]
-		net-misc/mDNSResponder ) )
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? (
-		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-1 )"
-DEPEND="${RDEPEND}
-	dev-util/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-114"
-
-pkg_setup() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
-		einfo "All camera drivers will be built since you did not specify"
-		einfo "via the CAMERAS variable what camera you use."
-		ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
-	fi
-
-	if use cameras_template || use cameras_sipix_blink; then
-		einfo "Upstream considers sipix_blink & template driver as obsolete"
-	fi
-
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# 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 bug #216206, libusb detection
-	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
-}
-
-src_configure() {
-	local cameras
-	local cam
-	for cam in ${IUSE_CAMERAS} ; do
-		use "cameras_${cam}" && cameras="${cameras},${cam}"
-	done
-
-	[ -z "${cameras}" ] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-
-	einfo "Enabled camera drivers: ${cameras}"
-	[ "${cameras}" != "all" ] && \
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with bonjour) \
-		$(use_with hal) \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		--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=/$(get_libdir)/udev
-
-# FIXME: gtk-doc is currently broken
-#		$(use_enable doc docs)
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	if use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# 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
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed"
-
-	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
-	UDEV_RULES="/etc/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}"
-
-		if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then
-				einfo "Generating HAL FDI files ..."
-				mkdir -p "${D}"/${HAL_FDI%/*}
-				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
-					|| die "failed to create hal-fdi"
-		else
-			ewarn "No HAL FDI file generated because no real camera driver enabled"
-		fi
-
-		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 0.98 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 or HAL FDI files."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${CAM_LIST} udev-rules version 0.98 group plugdev > ${UDEV_RULES}"
-		eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}"
-	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
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.7-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
index d63fab98895f..37fb198603bf 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.7-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.7-r1.ebuild,v 1.1 2009/12/27 02:37:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild,v 1.1 2010/01/24 19:35:30 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -8,7 +8,7 @@
 
 EAPI="2"
 
-inherit multilib eutils
+inherit autotools eutils multilib
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -17,9 +17,10 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bonjour doc examples exif hal nls kernel_linux"
 
-IUSE="bonjour doc exif hal nls kernel_linux"
-RESTRICT="test"
+# ???
+#RESTRICT="test"
 
 # By default, drivers for all supported cameras will be compiled.
 # If you want to only compile for specific camera(s), set CAMERAS
@@ -66,7 +67,7 @@ pkg_setup() {
 		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
 		einfo "All camera drivers will be built since you did not specify"
 		einfo "via the CAMERAS variable what camera you use."
-		ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
+		einfo "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
 	fi
 
 	if use cameras_template || use cameras_sipix_blink; then
@@ -77,11 +78,23 @@ pkg_setup() {
 }
 
 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=bonjour, 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"
+
+	eautoreconf
+
 	# Fix bug #216206, libusb detection
 	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
 }
@@ -130,14 +143,21 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
+	# Clean up unwanted files
+	rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
+	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/README examples/*.c examples/*.h || die "examples installation failed"
+	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
 
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed"
-
 	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
 	UDEV_RULES="/etc/udev/rules.d/70-libgphoto2.rules"
 	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"