Remove support for sys-apps/hal wrt #313389.

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

3 files changed, 10 insertions, 21 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 88ba8a5294ae..bdcfb271615a 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.189 2011/03/22 19:37:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.190 2011/03/27 16:16:07 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libgphoto2-2.4.10.ebuild:
   Marking libgphoto2-2.4.10 ppc stable for bug 353436
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 49d30395556f..652acf189011 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -3,6 +3,6 @@ AUX libgphoto2-2.4.7-respect-bonjour.patch 643 RMD160 09724f2d7ad94938785709548c
 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.10.tar.bz2 5699257 RMD160 d4f6e33c745910877ddc1f804911a76e47f5f5da SHA1 0fbbcfdfe13c3cf128505e3079faf55407b647c5 SHA256 8bb28232c246c19465724dbca2f511dd56feaee3cdb018589e8370c46f1cf1cd
-EBUILD libgphoto2-2.4.10.ebuild 6705 RMD160 141400cb9f858e4a455c89112c87293bbb0dde44 SHA1 7a53eebd890340ece7f7edff103312197f7e54d1 SHA256 d4672b0972ce0fd61725516d2beeba7f89c0aa8218411e54c374abf1d80c67eb
-MISC ChangeLog 31557 RMD160 cf0634fee34322a417804e5094a7bb483d3b3643 SHA1 34b827e550ab4360ed3ae267a6a42994d556c763 SHA256 e4c3f5256ffe047e9df14764bdf688e146c4463781f27ead470d9edc2a7d0936
+EBUILD libgphoto2-2.4.10.ebuild 6181 RMD160 213c4a690436147784034e1cd1cee5c80998bfdd SHA1 7f23c9a1c3ce222051468d6fcad83b8be13e9437 SHA256 e5b4299b49b2a6676ee2f291fe1b131f5db59d2ff13109f78eba102235d66822
+MISC ChangeLog 31688 RMD160 69b8bdf91604e8a9ac9af2dd438cba2665af31ea SHA1 c27e1220091d918ee0af20a54812075ba12f3371 SHA256 f43cc27d2daa48a475b273d6f35ad56e47a946c5ecac5fde6e6a2cfd813d4927
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild
index 91aa80db223f..4959fa0c0a78 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.8 2011/03/22 19:37:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.9 2011/03/27 16:16:07 ssuominen 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="doc examples exif hal nls kernel_linux zeroconf"
+IUSE="doc examples exif nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.
 # If you want to only compile for specific camera(s), set CAMERAS
@@ -55,9 +55,6 @@ RDEPEND="virtual/libusb:0
 		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
@@ -135,7 +132,7 @@ src_configure() {
 		--disable-docs \
 		--disable-gp2ddb \
 		$(use_with zeroconf bonjour) \
-		$(use_with hal) \
+		--without-hal \
 		$(use_enable nls) \
 		$(use_with exif libexif auto) \
 		--with-drivers=${cameras} \
@@ -175,7 +172,6 @@ src_install() {
 	fi
 	# end fixup
 
-	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
 	UDEV_RULES="/$(get_libdir)/udev/rules.d/70-libgphoto2.rules"
 	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
 
@@ -185,15 +181,6 @@ src_install() {
 		# 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#" \
@@ -202,10 +189,9 @@ src_install() {
 			|| 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 "and therefore unable to generate hotplug usermap."
 		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
 
 }