Stable on amd64 wrt bug #232202. clean up old revisions.

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64)

6 files changed, 13 insertions, 677 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index e0c60fcb01fa..29db59b61eac 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.133 2008/07/24 16:29:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.134 2008/08/03 22:10:38 eva Exp $
+
+  03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgphoto2-2.2.1-r1.ebuild, -libgphoto2-2.3.1-r5.ebuild,
+  -libgphoto2-2.4.0-r1.ebuild, -libgphoto2-2.4.1.ebuild:
+  clean up old revisions
+
+  03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  libgphoto2-2.4.1-r1.ebuild:
+  Stable on amd64 wrt bug #232202
 
   24 Jul 2008; Raúl Porcel <armin76@gentoo.org> libgphoto2-2.4.1-r1.ebuild:
   ia64/sparc/x86 stable wrt #232202
diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild
deleted file mode 100644
index 115ecea19459..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1-r1.ebuild,v 1.28 2008/05/20 09:41:56 armin76 Exp $
-
-inherit libtool eutils autotools
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls doc exif hal"
-
-RDEPEND="
-	>=dev-libs/libusb-0.1.8
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	doc? ( dev-util/gtk-doc
-		=app-text/docbook-sgml-dtd-4.2*
-	)"
-
-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 clicksmart310
-	digigr8 digita dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam
-	jd11 kodak konica largan lg_gsm mars minolta mustek panasonic pccam300
-	pccam600 polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1
-	sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z template
-	toshiba"
-
-pkg_setup() {
-	if [[ -z "${CAMERAS}" ]] ; then
-		ewarn "All camera drivers will be built since you did not specify"
-		ewarn "via the CAMERAS variable what camera you use."
-		ewarn "libgphoto2 supports: all ${IUSE_CAMERAS}"
-	fi
-	echo
-
-	enewgroup plugdev || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
-	epatch ${FILESDIR}/${PN}-2.2.0-includes.patch
-	epatch ${FILESDIR}/libgphoto-2.2.1-new-dbus-api.patch
-
-	# bug #139534: already merged into upstream SVN
-	epatch ${FILESDIR}/${P}-ngettext.patch
-
-	# bug #153471: create udev-rules for udev >= 0.98
-	epatch ${FILESDIR}/${P}-backported-udev-fixes.diff
-
-	# make default group 'plugdev', not camera
-	sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group
-
-	# fix typo for apidoc
-	# originally in : libgphoto2_port/m4/gp-documentation.m4
-	# but we save on running autoconf again by just patching configure
-	sed -i -e 's:apidocdir\}:apidocdir:g' \
-		configure \
-		libgphoto2_port/configure
-}
-
-src_compile() {
-	local cameras
-	local cam
-	for cam in ${CAMERAS} ; do
-		has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}"
-	done
-	[[ -z "${cameras}" ]] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-	einfo $cameras
-
-	elibtoolize
-
-	local myconf
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	econf \
-		--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 \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		${myconf} || die "econf failed"
-
-	# documentation breaks with -j1
-	emake -j1 apidocdir=/usr/share/doc/${PF}/api || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install \
-		apidocdir=/usr/share/doc/${PF}/api || die "install failed"
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES
-
-	# install hotplug support
-	if use kernel_linux; then
-		insinto /etc/hotplug/usb
-		newins ${S}/packaging/linux-hotplug/usbcam.group usbcam
-		chmod +x ${D}/etc/hotplug/usb/usbcam
-	fi
-
-	if [[ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-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}"
-
-		HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
-		HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
-		UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules"
-
-		if use kernel_linux; then
-			einfo "Generating usbcam-gphoto2.usermap ..."
-			echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${D}/${HOTPLUG_USERMAP}
-			echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${D}/${HOTPLUG_USERMAP}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap >> ${D}/${HOTPLUG_USERMAP} \
-				|| die "failed to create usb-usermap"
-		fi
-
-		if use hal; then
-			einfo "Generating HAL FDI files ..."
-			mkdir -p ${D}/${HAL_FDI%/*}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \
-				|| die "failed to create hal-fdi"
-		fi
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p ${D}/${UDEV_RULES%/*}
-		${D}/usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 >> ${D}/${UDEV_RULES} \
-			|| die "failed to create udev-rules"
-		exeinto /lib/udev
-		doexe ${S}/packaging/generic/check_ptp_camera
-	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 " /usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap > ${HOTPLUG_USERMAP}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-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."
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild
deleted file mode 100644
index 29576ad37e4e..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r5.ebuild,v 1.4 2008/05/20 09:41:56 armin76 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
-# 2. Track upstream bug udevscriptdir does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&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
-
-inherit 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="nls doc exif hal 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 clicksmart310 digigr8 digita
-dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 kodak
-konica largan lg_gsm mars minolta mustek panasonic pccam300 pccam600
-polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1 sonydscf55
-soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-RDEPEND=">=dev-libs/libusb-0.1.8
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	doc? ( app-doc/doxygen )"
-
-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
-
-	enewgroup plugdev || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-rpm.patch"
-
-	# Fix for udev >= 098 rules generation
-	epatch "${FILESDIR}"/${P}-udev-rules-fix3.diff
-}
-
-src_compile() {
-	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"
-
-	CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D"
-
-	local myconf
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	econf \
-		--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 \
-		$(use_enable nls) \
-		--with-rpmbuild=/bin/true \
-		--disable-docs \
-		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-#		$(use_enable doc docs) \	TODO
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# fixup autoconf bug TODO
-	if ! use doc && [ -d ${D}/usr/share/doc/${PF}/apidocs.html ]; then
-		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	# fixup udevscriptdir is not working TODO
-	dodir /lib
-	mv "${D}/usr/$(get_libdir)/udev" "${D}/lib" || die "Moving udev-helper files failed."
-	# end fixup
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING
-
-	HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
-	UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules"
-
-	if [ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-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; then
-			einfo "Generating HAL FDI files ..."
-			mkdir -p ${D}/${HAL_FDI%/*}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \
-				|| die "failed to create hal-fdi"
-		fi
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p ${D}/${UDEV_RULES%/*}
-		${D}/usr/$(get_libdir)/libgphoto2/print-camera-list \
-			udev-rules-0.98	group plugdev mode 0660 >> ${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 " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 group plugdev mode 0660 > ${UDEV_RULES}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-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."
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
deleted file mode 100644
index a4cdda08cc3b..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.9 2008/05/20 09:41:56 armin76 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
-# 2. Track upstream bug udevscriptdir does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&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
-
-inherit eutils autotools
-
-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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="nls doc exif hal 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 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"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-RDEPEND=">=dev-libs/libusb-0.1.8
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	doc? ( app-doc/doxygen )"
-
-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 || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-rpm.patch
-
-	# Fix as-needed at configure time
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# Fix udev rules for Kernel 2.6.22 and greater
-	epatch "${FILESDIR}"/${P}-udev-rules-fix4.diff
-
-	AT_M4DIR="${S}/auto-m4 ${S}/m4m" eautoreconf
-}
-
-src_compile() {
-	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 \
-		--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 \
-		$(use_enable nls) \
-		--with-rpmbuild=/bin/true \
-		--disable-docs \
-		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-#		$(use_enable doc docs) \	TODO
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# fixup autoconf bug TODO
-	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"
-
-	if [ -x "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-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; then
-			einfo "Generating HAL FDI files ..."
-			mkdir -p "${D}"/${HAL_FDI%/*}
-			"${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> "${D}"/${HAL_FDI} \
-				|| die "failed to create hal-fdi"
-		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}"/usr/$(get_libdir)/libgphoto2/print-camera-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 " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules version 0.98 group plugdev > ${UDEV_RULES}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-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.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.1-r1.ebuild
index 81943acb20f6..90e1d2ba1192 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.1-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1-r1.ebuild,v 1.7 2008/07/24 16:29:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1-r1.ebuild,v 1.8 2008/08/03 22:10:38 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -8,7 +8,7 @@
 # 3. Track upstream bug regarding rpm usage.
 #	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874
 
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="nls doc exif hal kernel_linux"
 RESTRICT="test"
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild
deleted file mode 100644
index 7c1a450af30f..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v 1.13 2008/05/25 13:08:31 maekke 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
-
-inherit eutils autotools
-
-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 ia64 ppc ppc64 sparc x86"
-
-IUSE="nls doc exif hal 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 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"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-RDEPEND=">=dev-libs/libusb-0.1.8
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )"
-
-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 || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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 #212721, libtool-2 failure
-	sed -i "s:lt_dlcaller_register:lt_dlinit:g" configure libgphoto2_port/configure || die "libtool sed failed"
-
-	# Fix bug #216206, libusb detection
-	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
-}
-
-src_compile() {
-	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 \
-		--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 \
-		$(use_enable nls) \
-		--with-rpmbuild=/bin/true \
-		--disable-docs \
-		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-# FIXME:		$(use_enable doc docs) \
-
-	emake || die "make failed"
-}
-
-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
-}