Clean up old revisions. Avoid automagic dependency for ax203 and st2205 drivers, bug #345149. Re-add libtool to RDEPEND.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 24 insertions, 396 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 407d9ebe4a2f..68ebd491f0b8 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.180 2010/11/13 19:31:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.181 2010/11/14 23:06:06 eva Exp $
+
+  14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgphoto2-2.4.6.ebuild, -libgphoto2-2.4.8.ebuild,
+  libgphoto2-2.4.9.ebuild:
+  Clean up old revisions. Avoid automagic dependency for ax203 and st2205
+  drivers, bug #345149. Re-add libtool to RDEPEND.
 
   13 Nov 2010; Raúl Porcel <armin76@gentoo.org> libgphoto2-2.4.9.ebuild:
   alpha/ia64/sparc stable wrt #339475
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index c90ba1a44dc7..07c229580fa6 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,12 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b577226f70e0c220b869ae SHA1 2b6cd2967b6d16ab13ef7826781a93b852be69a1 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8
 AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b1517 SHA1 9dfbe07ccb18b57e545cdbd35f8654832727a62d SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5
-DIST libgphoto2-2.4.6.tar.bz2 5268340 RMD160 cca194a6db6658887b1b997838c7d6a5af9e2609 SHA1 f9fd10495ababce3cf992b36f3a29359e598aea7 SHA256 cbfad37afb6a65f93ce16fbe1e8a1201ef3586c614deca5cc51afc8011245606
-DIST libgphoto2-2.4.8.tar.bz2 5371128 RMD160 0edc03231e1c646e45621b9adb09e268582b4437 SHA1 6ad0d9ffcafe2e9eba0cae958a4455ebb4cf2037 SHA256 69d7e0723b40e8a0c4fa897b96f6aecb5ae5548c3cce98c48e37b70623d9ffc3
 DIST libgphoto2-2.4.9.tar.bz2 5643227 RMD160 1af4e817281d6bfac1650a0b427a2903c997a9bb SHA1 7d876fd650430e4f52fe10e53f378688e6026387 SHA256 d4bd7da50f073c121ebca2832a7eeb23d2f7a493e902d80a0ab7f7f0f4eb110a
-EBUILD libgphoto2-2.4.6.ebuild 5873 RMD160 b9abe896b6d38b466210bee375474f09b51dd9c4 SHA1 eef5312950feeba68d75ec61589afe750a43c990 SHA256 fd9210fbc3886f3dfbb53f6189661a723b17a86edad1229ea27b06a4eb5c115c
-EBUILD libgphoto2-2.4.8.ebuild 6507 RMD160 7ffd82a3b9ffaa660f5e918abfb5ed61990135f1 SHA1 6ed915dc67a7e503094556078a797997ad5b1dee SHA256 7c8449537ae0acab23f936f2be486f78f5cad68179d3e4f3272bed115c70fdc1
-EBUILD libgphoto2-2.4.9.ebuild 6693 RMD160 66bbaf6f4cdbd2255ed9ef81a71b070f428c1dbe SHA1 d25657a5b848525d818a8b94ddb8b05571f31ad1 SHA256 ccd2ccd6661e735320672951d8c6cb2e2955c7b6069bfda015323979fa3951bd
-MISC ChangeLog 30090 RMD160 1028a24fa4dcf5e88ba58e336f14a00fa21c7fab SHA1 08b08b60ade5a14464938b2b277f5c30504c1c2f SHA256 82ec7483d1f0c8c11fe767dbee6947521796604c61b75f8ac9826b6f280ee416
+EBUILD libgphoto2-2.4.9.ebuild 6777 RMD160 922043592f299876c449c70eb7fe224d8c59028a SHA1 fdcd2459f3b52cc83bca35d56f2c6a0e91b24be6 SHA256 9a989bc254cfabca81a212f8c3b61e83e92fe50f1e5f76cb41d1a3b3424296e5
+MISC ChangeLog 30347 RMD160 3ed0acdff9c6872d6b68fc1490f9efd3464b6a53 SHA1 a69dd320a0bc590e3dae82782da7c87b0df03eb2 SHA256 331f7bea7b77a023b66bb23b5782a99fe6f611536b99e7260292f1ad5a8367b7
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzga2cACgkQ1fmVwcYIWAaO2ACfUOd6wo/sdkSZz6EIacqN2Reu
+NXEAn2v19Lwlc6K/ew9IgHHJkfh8SWeO
+=PwBQ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild
deleted file mode 100644
index 3fa46dd805d9..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild
+++ /dev/null
@@ -1,184 +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.6.ebuild,v 1.10 2010/10/02 14:16:28 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
-
-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="doc exif hal nls kernel_linux zeroconf"
-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
-	zeroconf? ( || (
-		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() {
-	# 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 zeroconf bonjour) \
-		$(use_with 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 || 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.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
deleted file mode 100644
index 07c1a191549a..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
+++ /dev/null
@@ -1,203 +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.8.ebuild,v 1.7 2010/10/02 14:16:28 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
-
-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="doc examples exif hal nls kernel_linux zeroconf"
-
-# ???
-#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
-	zeroconf? ( || (
-		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-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."
-		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
-		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"
-
-	eautoreconf
-
-	# 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 zeroconf 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"
-
-	# 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
-
-	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"
-		elif use hal; then
-			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 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 136 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.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
index ca873fe47413..42e2dec5600a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.10 2010/11/13 19:31:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.11 2010/11/14 23:06:06 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -44,13 +44,16 @@ 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]
 		net-misc/mDNSResponder ) )
 	exif? ( >=media-libs/libexif-0.5.9 )
 	hal? (
 		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-1 )"
+		>=sys-apps/dbus-1 )
+	sys-devel/libtool"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/flex