Clean up old revisions. Rename bonjour to zeroconf, bug #283330.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

7 files changed, 21 insertions, 461 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 944033482294..7ce2c619a3de 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.172 2010/09/10 18:25:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.173 2010/10/02 14:16:28 eva Exp $
+
+  02 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  libgphoto2-2.4.6.ebuild, -libgphoto2-2.4.7-r2.ebuild,
+  -files/libgphoto2-2.4.7-no-test-build.patch, libgphoto2-2.4.8.ebuild,
+  -libgphoto2-2.4.8-r1.ebuild, libgphoto2-2.4.9.ebuild:
+  Clean up old revisions. Rename bonjour to zeroconf, bug #283330.
 
   10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   libgphoto2-2.4.9.ebuild, +files/libgphoto2-2.4.9-dnl.patch:
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch
deleted file mode 100644
index 9fcabd9e8b0a..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not build tests if not running make check
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241
---- a/libgphoto2_port/test/Makefile.am	2010-01-07 01:04:40.000000000 +0100
-+++ b/libgphoto2_port/test/Makefile.am	2010-01-07 01:04:57.000000000 +0100
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = test-gp-port
-+check_PROGRAMS = test-gp-port
- 
- test_gp_port_CPPFLAGS = \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) \
---- a/tests/Makefile.am	2010-01-07 00:56:14.000000000 +0100
-+++ b/tests/Makefile.am	2010-01-07 00:56:40.000000000 +0100
-@@ -2,7 +2,9 @@
- 
- check_PROGRAMS = \
- 	test-camera-list \
--	test-pedantic-c
-+	test-pedantic-c \
-+	test-gphoto2	\
-+	test-filesys
- 
- if HAVE_CXX
- check_PROGRAMS += test-pedantic-cxx
-@@ -22,10 +24,6 @@
- 
- CLEANFILES = $(check_SCRIPTS)
- 
--noinst_PROGRAMS =	\
--	test-gphoto2	\
--	test-filesys
--
- test_gphoto2_SOURCE = test-gphoto2.c
- test_gphoto2_LDADD = \
- 	$(top_builddir)/libgphoto2/libgphoto2.la \
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild
index 43d21dbe1e15..3fa46dd805d9 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.6.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.6.ebuild,v 1.9 2010/01/14 16:44:03 jer Exp $
+# $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.
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
-IUSE="bonjour doc exif hal nls kernel_linux"
+IUSE="doc exif hal nls kernel_linux zeroconf"
 RESTRICT="test"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -43,7 +43,7 @@ done
 
 # libgphoto2 actually links to libtool
 RDEPEND="virtual/libusb:0
-	bonjour? ( || (
+	zeroconf? ( || (
 		net-dns/avahi[mdnsresponder-compat]
 		net-misc/mDNSResponder ) )
 	exif? ( >=media-libs/libexif-0.5.9 )
@@ -105,7 +105,7 @@ src_configure() {
 	econf \
 		--disable-docs \
 		--disable-gp2ddb \
-		$(use_with bonjour) \
+		$(use_with zeroconf bonjour) \
 		$(use_with hal) \
 		$(use_enable nls) \
 		$(use_with exif libexif) \
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild
deleted file mode 100644
index 5181f058892c..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.7-r2.ebuild
+++ /dev/null
@@ -1,206 +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.7-r2.ebuild,v 1.2 2010/01/07 22:31:13 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="bonjour doc examples 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-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=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"
-
-	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 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.8-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.8-r1.ebuild
deleted file mode 100644
index 2740c0242136..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,206 +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-r1.ebuild,v 1.1 2010/03/14 11:19:31 pacho 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="bonjour doc examples 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-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=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"
-
-	# Increase max entries from 1024 to 8192 to fix bug #291049
-	epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.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 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.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
index ab0c73bfe873..07c1a191549a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.8.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.8.ebuild,v 1.6 2010/04/05 14:57:39 armin76 Exp $
+# $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.
@@ -17,7 +17,7 @@ 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="doc examples exif hal nls kernel_linux zeroconf"
 
 # ???
 #RESTRICT="test"
@@ -44,7 +44,7 @@ done
 
 # libgphoto2 actually links to libtool
 RDEPEND="virtual/libusb:0
-	bonjour? ( || (
+	zeroconf? ( || (
 		net-dns/avahi[mdnsresponder-compat]
 		net-misc/mDNSResponder ) )
 	exif? ( >=media-libs/libexif-0.5.9 )
@@ -87,7 +87,7 @@ src_prepare() {
 		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
 	fi
 
-	# Fix USE=bonjour, bug #283332
+	# 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
@@ -117,7 +117,7 @@ src_configure() {
 	econf \
 		--disable-docs \
 		--disable-gp2ddb \
-		$(use_with bonjour) \
+		$(use_with zeroconf bonjour) \
 		$(use_with hal) \
 		$(use_enable nls) \
 		$(use_with exif libexif auto) \
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
index 8aaf28ea29c6..aeeba742ac99 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.3 2010/09/10 18:25:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.4 2010/10/02 14:16:28 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -17,7 +17,7 @@ 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="doc examples exif hal nls kernel_linux zeroconf"
 
 # ???
 #RESTRICT="test"
@@ -44,7 +44,7 @@ done
 
 # libgphoto2 actually links to libtool
 RDEPEND="virtual/libusb:0
-	bonjour? ( || (
+	zeroconf? ( || (
 		net-dns/avahi[mdnsresponder-compat]
 		net-misc/mDNSResponder ) )
 	exif? ( >=media-libs/libexif-0.5.9 )
@@ -87,7 +87,7 @@ src_prepare() {
 		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
 	fi
 
-	# Fix USE=bonjour, bug #283332
+	# 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
@@ -122,7 +122,7 @@ src_configure() {
 	econf \
 		--disable-docs \
 		--disable-gp2ddb \
-		$(use_with bonjour) \
+		$(use_with zeroconf bonjour) \
 		$(use_with hal) \
 		$(use_enable nls) \
 		$(use_with exif libexif auto) \