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

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

6 files changed, 14 insertions, 245 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/Manifest b/media-gfx/gimp/Manifest
index c536be7f85ae..e9b42d9a4117 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,10 +1,7 @@
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa37e425c3d SHA1 9b9cae60c775d4312552434373618c6cb9188e3e SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f
 AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086
-DIST gimp-2.6.10.tar.bz2 16445326 RMD160 b58fc4e5717508ad531827c82e48067df0d0a748 SHA1 5781fed3fbf45969eac5e6ee2c7a4bb0bb529ecc SHA256 ef7a3fe73b352d8afeda9a5358431ea64a1d4cf3ebab588167f6335cdb52e032
 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
-EBUILD gimp-2.6.10.ebuild 2870 RMD160 d15a6f282485ee61d44218d281a3388743a937e0 SHA1 445f06aa83478a43fc972b3313edda9a82be9c92 SHA256 9f3cad55e9e69ab0bb270565ee14eed9c6c04284805324bd67d5c30d8379a1ce
-EBUILD gimp-2.6.11-r1.ebuild 3147 RMD160 31d3e0a94c5a133089cbb77cfcb8929e85779202 SHA1 579573929c116a8f7ddd1278af56668d90c65a46 SHA256 80cb6977f27a57837fad31a587a316f65e39ddf704623c793f000b6542e9713d
-EBUILD gimp-2.6.11.ebuild 2872 RMD160 db2e7cc394fb64b3b2fe3595070a538cf7e3af7e SHA1 0da3fce00e2841d533a7c07cf715df0c246ee14b SHA256 7abc22d7761cbeafe3b7a8de51e7d470308ac4e1cb29c7ae101c55d750cad83b
-EBUILD gimp-9999.ebuild 2930 RMD160 dbc8e14aca7249feab875596b64932e11e1b7eaa SHA1 c2f62019e0da6672d7ed8309597872df2c7ab5eb SHA256 8ce8c3cb73b256a31e3e0ccae2902d0b1f46723b39c700dfc644e8b748507199
-MISC ChangeLog 44370 RMD160 863d86db7be6df25435afb5d9b8de1594c7f4eeb SHA1 b6269993a6bfd149582da871936bba04643be992 SHA256 336ae25953a25795a75b78d265f673e9979cd4f5441e0c56cc61d9224252d2f5
+EBUILD gimp-2.6.11-r1.ebuild 3119 RMD160 d31d0e457e83953818f8ec71629da91d40017b3c SHA1 cc9b300e15152b39f9d1a88c045ed73771f8213e SHA256 d0d72a6c2ca9af4326d50f98d367d2098672448a11ef5fb56bcfd64ec6a2f294
+EBUILD gimp-9999.ebuild 2902 RMD160 f6ad00a867901822f770814a580fcef45c21ae31 SHA1 ffc67f987d384f3075f059b8fe55bd3992f640f7 SHA256 5c267a093dcfe02f22975b2a81cb92a51449e67536b031608a551d5ffd4abfbb
+MISC ChangeLog 44516 RMD160 f5f64add73179c0937f464048c2bd6ffe143ef33 SHA1 e986dba220a58a396f9843be6b66296a17153cd7 SHA256 105812fb3791cdda7541f052944abb8470f341f9731f428997c3c689f2ba6e39
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
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) \