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

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

5 files changed, 11 insertions, 239 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 117904afe29c..10ef742d31b7 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.325 2011/03/21 23:07:11 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.326 2011/03/27 09:45:59 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gimp-2.6.11-r1.ebuild,
+  gimp-9999.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gimp-2.6.10.ebuild,
   gimp-2.6.11.ebuild, gimp-2.6.11-r1.ebuild, gimp-9999.ebuild:
diff --git a/media-gfx/gimp/gimp-2.6.10.ebuild b/media-gfx/gimp/gimp-2.6.10.ebuild
deleted file mode 100644
index 71f53e5973b6..000000000000
--- a/media-gfx/gimp/gimp-2.6.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild,v 1.4 2011/03/21 23:07:11 nirbheek Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1:2
-	>=x11-libs/gtk+-2.12.5:2
-	>=x11-libs/pango-1.18.0
-	x11-libs/libXpm
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk:2 )
-	jpeg? ( virtual/jpeg:0 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( =media-libs/lcms-1* )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-python/pygtk-2.10.4:2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	svg? ( >=gnome-base/librsvg-2.8.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with wmf)"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.11-r1.ebuild b/media-gfx/gimp/gimp-2.6.11-r1.ebuild
index 66c7c1e611f0..d8b5d9e35467 100644
--- a/media-gfx/gimp/gimp-2.6.11-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r1.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-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.7 2011/03/21 23:07:11 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.8 2011/03/27 09:45:59 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
+IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
 
 RDEPEND=">=dev-libs/glib-2.18.1:2
 	>=x11-libs/gtk+-2.12.5:2
@@ -33,7 +33,6 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
 	gnome? ( gnome-base/gvfs )
 	webkit? ( net-libs/webkit-gtk:2 )
 	jpeg? ( virtual/jpeg:0 )
@@ -62,7 +61,7 @@ pkg_setup() {
 		$(use_enable altivec) \
 		$(use_with curl libcurl) \
 		$(use_with dbus) \
-		$(use_with hal) \
+		--without-hal \
 		$(use_with gnome gvfs) \
 		--without-gnomevfs \
 		$(use_with webkit) \
diff --git a/media-gfx/gimp/gimp-2.6.11.ebuild b/media-gfx/gimp/gimp-2.6.11.ebuild
deleted file mode 100644
index 4ada211ab9eb..000000000000
--- a/media-gfx/gimp/gimp-2.6.11.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild,v 1.4 2011/03/21 23:07:11 nirbheek Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1:2
-	>=x11-libs/gtk+-2.12.5:2
-	>=x11-libs/pango-1.18.0
-	x11-libs/libXpm
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk:2 )
-	jpeg? ( virtual/jpeg:0 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( =media-libs/lcms-1* )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2:0 )
-	python?	( >=dev-python/pygtk-2.10.4:2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	svg? ( >=gnome-base/librsvg-2.8.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with hal) \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with wmf)"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 23221fbee66c..989c245bdea4 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.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-gfx/gimp/gimp-9999.ebuild,v 1.33 2011/03/21 23:07:11 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.34 2011/03/27 09:45:59 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -17,7 +17,7 @@ LICENSE="GPL-3"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
+IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
 
 RDEPEND=">=dev-libs/glib-2.18.1:2
 	>=x11-libs/gtk+-2.12.5:2
@@ -35,7 +35,6 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
 	gnome? ( gnome-base/gvfs )
 	webkit? ( net-libs/webkit-gtk:2 )
 	jpeg? ( virtual/jpeg:0 )
@@ -64,7 +63,7 @@ pkg_setup() {
 		$(use_enable altivec) \
 		$(use_with curl libcurl) \
 		$(use_with dbus) \
-		$(use_with hal) \
+		--without-hal \
 		$(use_with gnome gvfs) \
 		--without-gnomevfs \
 		$(use_with webkit) \