Fix USE=bonjour behavior, bug #283332. Do not build tests if not needed, bug #226241. Add examples USE flag. Remove unwanted files for /usr/share/doc. Clean up old revisions.

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

8 files changed, 131 insertions, 225 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 1252f76fd4b0..045439e93df1 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/libgphoto2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.159 2009/12/27 02:37:02 nirbheek Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.160 2010/01/07 00:28:42 eva Exp $
+
+*libgphoto2-2.4.7-r2 (07 Jan 2010)
+
+  07 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  libgphoto2-2.4.3.ebuild, -libgphoto2-2.4.4.ebuild,
+  -libgphoto2-2.4.5.ebuild, +libgphoto2-2.4.7-r2.ebuild,
+  +files/libgphoto2-2.4.7-extra-dist.patch,
+  +files/libgphoto2-2.4.7-no-test-build.patch,
+  +files/libgphoto2-2.4.7-respect-bonjour.patch:
+  Fix USE=bonjour behavior, bug #283332. Do not build tests if not needed,
+  bug #226241. Add examples USE flag. Remove unwanted files for
+  /usr/share/doc. Clean up old revisions.
 
 *libgphoto2-2.4.7-r1 (27 Dec 2009)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 6d6ed29da22f..f6e81edd432b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,17 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+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.4.tar.bz2 5252280 RMD160 bdb26313f1b5b2b425a7ed13bfe10a3f04488209 SHA1 a1d881e27231037bb860b952560cec36ce6a8988 SHA256 2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
-DIST libgphoto2-2.4.5.tar.bz2 5251180 RMD160 b5add1b9d13079578c113f45a11eafa8372c1c84 SHA1 b1f51f0587afbe454db411f9005bd6ce5138156b SHA256 d32df1ba44ade8aace11258c2e8d5a1ec7182fc5e6375a6cf2e7c9d5256f37de
 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 6380 RMD160 d3ecf7fafff8a2cbdeffed437e7f552310c02bc1 SHA1 cf403be4f9ab39c54482e73844682ca7d5c30f5d SHA256 03bfc032a5f6a7fea89627eec9ac471b44f056b43952827f85c3ae070d41d252
-EBUILD libgphoto2-2.4.4.ebuild 6263 RMD160 3380f810f6429ef1ecd11642a5eef4ccfcb80f9e SHA1 d4e8b96a9f855dffe3a0c314a89770a72fcbb22b SHA256 22434bbef93f9923e0de6d96986617f77df65be95ab579a1ae9089dcfa1156d6
-EBUILD libgphoto2-2.4.5.ebuild 6069 RMD160 7dd58ba9772312f751d00b3b296673c9569695c5 SHA1 e44a9e9a7a362bccc47c3cdd1a5b96a12954403e SHA256 4f562f73e182d53f0003ff3d98146cdde0b6f22498cf3a3b139eff21d24bb60a
+EBUILD libgphoto2-2.4.3.ebuild 6340 RMD160 78a79b0ad195d01a9036412b347724015cfdabcd SHA1 8b7170ede08744b265d574be998d0aa3108c50b9 SHA256 2be701aeca1fe3a264550e2ad14837eee6f460840e2e9fdf1cc9618355858b4a
 EBUILD libgphoto2-2.4.6.ebuild 5866 RMD160 30e4ee0610ead753c93594342063d08c9b56765a SHA1 651199efc137a41581b9c08b6e038cdb31d6d75b SHA256 80b6ef708ee93a6f58c0a35f0167179eeb2060fbec98202174a6197779c47f56
 EBUILD libgphoto2-2.4.7-r1.ebuild 5875 RMD160 2a26a8d17f7d32235438aad9d483d91489adec45 SHA1 b7ddef36bc63f8048ea5407625069b92a8307604 SHA256 b089c794aadad686cb0df390b148a065d34a282f17344c41594d2e153ad3a97a
+EBUILD libgphoto2-2.4.7-r2.ebuild 6760 RMD160 0ba6f49a0d2c09d79b3dad0f351e232480938d63 SHA1 d927eb3d47790153bf36d85b203621eb5880bf07 SHA256 1a8773737207a5d19bcd52ce1cc0a9dd49f3947dab20ce8e7e06c10c00a3d810
 EBUILD libgphoto2-2.4.7.ebuild 5859 RMD160 a4cc54f7ee8c306252e6affaab5a356a94f5883b SHA1 242e8edaeb6efbecaf6cfdaf8d267fc776602667 SHA256 0ae3c9f7ba2e502ff58903597c77070a0e0baf87d1f1e2ba4714ac80c9200d02
-MISC ChangeLog 26341 RMD160 2d1fa965a6a21de34affc52611be0565a1743f01 SHA1 5b291f5b131bd355484e5859360b66e2f3d6513c SHA256 db1237dfdbda8acf3905477042a6df8d98ebcf91101a2d532694ae5c3778a863
+MISC ChangeLog 26858 RMD160 b48b30e642e953dd99ca2346d621ff9de50b13f0 SHA1 85881444b8527128373a0b1135fe319026aa5ca6 SHA256 021902dbd4466dee9b0062758122b5da1b9162e2af8353e64f5a2400b5483582
 MISC metadata.xml 255 RMD160 182d44452574b19b29c12dc7e757a2a4aa9cbc20 SHA1 7e912f6a5b9a294509849512ba044bd88b59065f SHA256 d2cc84bd8e8d171980c022b0af42cf2f2d829e37c05183988a211fccafcf363b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAktFKssACgkQ1fmVwcYIWAYG4QCg0SkCcDnVkQWP411bePKxjnwR
+anAAnRFLh0x/3ghWc/KysknHULJ1/F7y
+=+vHy
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch
new file mode 100644
index 000000000000..7407630ea864
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch
@@ -0,0 +1,12 @@
+# Fix re-definition of EXTRA_DIST
+--- a/libgphoto2_port/usb/Makefile.am	2010-01-07 00:25:35.000000000 +0100
++++ b/libgphoto2_port/usb/Makefile.am	2010-01-07 00:25:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ check_mtp_device_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS)
+ check_mtp_device_LDADD = $(LIBUSB_LIBS)
+ else
+-EXTRA_DIST = check-mtp-device.c
++EXTRA_DIST += check-mtp-device.c
+ endif
+ 
+ usb_la_LDFLAGS = -module -no-undefined -avoid-version \
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
new file mode 100644
index 000000000000..9fcabd9e8b0a
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch
@@ -0,0 +1,34 @@
+# 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.7-respect-bonjour.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch
new file mode 100644
index 000000000000..fc10aec0c9fe
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch
@@ -0,0 +1,12 @@
+# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332
+--- a/libgphoto2_port/configure.ac	2010-01-07 00:25:53.000000000 +0100
++++ b/libgphoto2_port/configure.ac	2010-01-07 00:25:43.000000000 +0100
+@@ -161,7 +161,6 @@
+ dnl ---------------------------------------------------------------------------
+ dnl Apple Bonjour / mDNSResponder multicast DNS queries.
+ dnl ---------------------------------------------------------------------------
+-with_bonjour=no
+ AC_ARG_WITH([bonjour],
+ 	AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]),
+ 	,
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild
index 0fbe29fc3af9..685feb7b3991 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.3.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.3.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.3.ebuild,v 1.9 2009/05/16 08:03:02 robbat2 Exp $
+# $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.
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="hppa"
 
 IUSE="bonjour doc exif hal nls kernel_linux"
 RESTRICT="test"
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild
deleted file mode 100644
index 3c0c645f6bcb..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild
+++ /dev/null
@@ -1,195 +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.4.ebuild,v 1.4 2009/05/16 08:03:02 robbat2 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="~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 )
-	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 automagic dependencies, bug #242470
-	epatch "${FILESDIR}/${PN}-2.4.3-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"
-
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_enable bonjour) \
-		$(use_enable hal) \
-		$(use_enable nls) \
-		$(use_with exif libexif) \
-		--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
-
-	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.5.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild
index e55ea8d527e9..6f5a0f945218 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.5.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild
@@ -1,12 +1,10 @@
-# 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.5.ebuild,v 1.1 2009/05/16 08:55:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild,v 1.1 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"
 
@@ -19,8 +17,9 @@ 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"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -51,8 +50,7 @@ RDEPEND="virtual/libusb:0
 	exif? ( >=media-libs/libexif-0.5.9 )
 	hal? (
 		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-1 )
-	sys-devel/libtool"
+		>=sys-apps/dbus-1 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/flex
@@ -62,14 +60,14 @@ DEPEND="${RDEPEND}
 #		>=dev-util/gtk-doc-1.10 )"
 
 RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
+	!<sys-fs/udev-136"
 
 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"
+		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
@@ -80,16 +78,32 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
 
 	# Fix pkgconfig file when USE="-exif"
-	use exif || sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
+	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"
+	# Fix USE=bonjour, bug #283332
+	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
+
+	# Fix a typo in automake rules
+	epatch "${FILESDIR}/${PN}-2.4.7-extra-dist.patch"
+
+	# Do not build test if not running make check, bug #226241
+	epatch "${FILESDIR}/${PN}-2.4.7-no-test-build.patch"
 
 	cd "${S}/libgphoto2_port"
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	cd "${S}"
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+
+	# Fix bug #216206, libusb detection
+	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
 }
 
 src_configure() {
@@ -113,7 +127,7 @@ src_configure() {
 		$(use_with bonjour) \
 		$(use_with hal) \
 		$(use_enable nls) \
-		$(use_with exif libexif) \
+		$(use_with exif libexif auto) \
 		--with-drivers=${cameras} \
 		--with-doc-dir=/usr/share/doc/${PF} \
 		--with-html-dir=/usr/share/doc/${PF}/html \
@@ -136,14 +150,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
-
 	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"
@@ -159,7 +180,7 @@ src_install() {
 				mkdir -p "${D}"/${HAL_FDI%/*}
 				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
 					|| die "failed to create hal-fdi"
-		else
+		elif use hal; then
 			ewarn "No HAL FDI file generated because no real camera driver enabled"
 		fi
 
@@ -167,13 +188,13 @@ src_install() {
 		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} \
+		"${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 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} udev-rules version 136 group plugdev > ${UDEV_RULES}"
 		eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}"
 	fi