media-gfx/gimp: Cleanup of vulnerable ebuilds, disable automagic detection for dbus.

(Portage version: 2.1.2.7)

7 files changed, 15 insertions, 291 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index fff3d46fe586..b43bb470368a 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.198 2007/05/08 14:25:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.199 2007/05/09 04:44:12 hanno Exp $
+
+  09 May 2007; Hanno Boeck <hanno@gentoo.org> -gimp-2.2.12.ebuild,
+  -gimp-2.3.15.ebuild, gimp-2.3.16.ebuild, gimp-9999.ebuild:
+  Cleanup of vulnerable ebuilds, disable automagic detection for dbus.
 
   08 May 2007; Jeroen Roovers <jer@gentoo.org> gimp-2.2.14.ebuild:
   Stable for HPPA, despite that it does not run (bug #176226 and bug #168131).
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.12 b/media-gfx/gimp/files/digest-gimp-2.2.12
deleted file mode 100644
index ccb24da9eee4..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a1906db60166a88317f2df5f195a57d gimp-2.2.12.tar.bz2 12875447
-RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7cb gimp-2.2.12.tar.bz2 12875447
-SHA256 fd8368522f8d5d9db16d930f1ef702c5f052e513ab9801ac1fb91f7f26205baa gimp-2.2.12.tar.bz2 12875447
diff --git a/media-gfx/gimp/files/digest-gimp-2.3.15 b/media-gfx/gimp/files/digest-gimp-2.3.15
deleted file mode 100644
index 3131eb7debbf..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.3.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca1ac6c338866020b9ebe98d134bd749 gimp-2.3.15.tar.bz2 16080133
-RMD160 8c2017dccf188fe2b76e8a15acdc91c338c3457a gimp-2.3.15.tar.bz2 16080133
-SHA256 419f42a6e9b305a6b7870771ef072e64265f9332f8dcfa341ba14f5216aa0ac7 gimp-2.3.15.tar.bz2 16080133
diff --git a/media-gfx/gimp/gimp-2.2.12.ebuild b/media-gfx/gimp/gimp-2.2.12.ebuild
deleted file mode 100644
index e09e0e5cbe78..000000000000
--- a/media-gfx/gimp/gimp-2.2.12.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.12.ebuild,v 1.13 2007/04/30 21:53:08 genone Exp $
-
-inherit flag-o-matic libtool eutils fdo-mime alternatives
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-
-SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
-python smp sse svg tiff wmf"
-
-#	X? ( virtual/x11 )"
-RDEPEND=">=dev-libs/glib-2.4.5
-	>=x11-libs/gtk+-2.4.4
-	>=x11-libs/pango-1.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-
-	gimpprint? ( =media-gfx/gimp-print-4.2* )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-
-	png? ( >=media-libs/libpng-1.2.10 )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		media-libs/libexif )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8.2 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )
-	lcms? ( media-libs/lcms )
-	doc? ( app-doc/gimp-help )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack "${A}"
-	cd "${S}"
-
-	# fixes bug #76050, allows for themable icons
-	sed -i -e s,@gimpdatadir@/images/@GIMP_DESKTOP_ICON@,@GIMP_DESKTOP_ICON@, ${S}/data/misc/gimp.desktop.in.in
-
-	# Fix linking to older version of gimp if installed - this should
-	# void liquidx's hack, so it is removed.
-	epatch "${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch"
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	# remove this for now, since I have 3 reports that this is
-	# not necessary
-	# replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-
-	# this is fixed in HEAD, but apply when using mmx
-	if use mmx; then
-		append-flags "-fomit-frame-pointer"
-	fi
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	elif use x86; then
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	elif use amd64; then
-		HARDENED_SUPPRESS_MMX="--enable-mmx"
-	fi
-
-	local myconf
-
-	# Hard enable SIMD assembler code for AMD64.
-	if use x86; then
-		myconf="${myconf} `use_enable sse`"
-	elif use amd64; then
-		myconf="${myconf} --enable-sse"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		${myconf} \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_enable smp mp` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_with lcms` \
-		`use_with gtkhtml gtkhtml2` \
-		`use_with svg librsvg` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-}
-
-src_install() {
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-
-	# Create the gimp-remote link, see bug #36648
-	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]"
-
-	# fix for bug #76050
-	ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png \
-		${ROOT}/usr/share/pixmaps/
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	elog ""
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog ""
-}
-
-pkg_postrm() {
-	[[ ! -f ${ROOT}/usr/bin/gimp-2.2 ]] && \
-		rm -f ${ROOT}/usr/share/pixmaps/wilber-icon.png
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/gimp/gimp-2.3.15.ebuild b/media-gfx/gimp/gimp-2.3.15.ebuild
deleted file mode 100644
index 285e8d6276e1..000000000000
--- a/media-gfx/gimp/gimp-2.3.15.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.15.ebuild,v 1.2 2007/04/30 21:53:08 genone Exp $
-
-inherit fdo-mime flag-o-matic
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.3/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
-
-RDEPEND=">=dev-libs/glib-2.12.3
-		>=x11-libs/gtk+-2.8.20-r1
-		>=x11-libs/pango-1.12.2
-		>=media-libs/freetype-2.1.7
-		>=media-libs/fontconfig-2.2.0
-		>=media-libs/libart_lgpl-2.3.8-r1
-		sys-libs/zlib
-		dev-libs/libxml2
-		dev-libs/libxslt
-		x11-themes/hicolor-icon-theme
-		aalib? ( media-libs/aalib )
-		alsa? ( >=media-libs/alsa-lib-1.0.0 )
-		doc? ( app-doc/gimp-help )
-		gnome? ( >=gnome-base/gnome-vfs-2.10.0
-			>=gnome-base/libgnomeui-2.10.0
-			>=gnome-base/gnome-keyring-0.4.5 )
-		gtkhtml? ( =gnome-extra/gtkhtml-2* )
-		jpeg? ( >=media-libs/jpeg-6b-r2
-			>=media-libs/libexif-0.6.0 )
-		lcms? ( media-libs/lcms )
-		mng? ( media-libs/libmng )
-		pdf? ( >=app-text/poppler-bindings-0.3.1 )
-		png? ( >=media-libs/libpng-1.2.2 )
-		python?	( >=dev-lang/python-2.2.1
-			>=dev-python/pygtk-2.8 )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		svg? ( >=gnome-base/librsvg-2.8.0 )
-		wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.12.0
-		>=dev-util/intltool-0.31
-		doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-		eerror
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-}
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-
-	econf --enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with gtkhtml gtkhtml2) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg 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) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	elog
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/gimp/gimp-2.3.16.ebuild b/media-gfx/gimp/gimp-2.3.16.ebuild
index a808373f6671..f1b3c41a8ea7 100644
--- a/media-gfx/gimp/gimp-2.3.16.ebuild
+++ b/media-gfx/gimp/gimp-2.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.16.ebuild,v 1.5 2007/05/06 16:50:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.16.ebuild,v 1.6 2007/05/09 04:44:12 hanno Exp $
 
 inherit fdo-mime flag-o-matic multilib python
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec curl dbus debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
 RDEPEND=">=dev-libs/glib-2.12.3
 	>=x11-libs/gtk+-2.10.6
@@ -27,6 +27,8 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib
+		sys-apps/hal )
 	doc? ( app-doc/gimp-help )
 	gnome? ( >=gnome-base/gnome-vfs-2.10.0
 		>=gnome-base/libgnomeui-2.10.0
@@ -80,6 +82,7 @@ src_compile() {
 		$(use_with curl) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
+		$(use_with dbus) \
 		$(use_with gnome) \
 		$(use_with gtkhtml gtkhtml2) \
 		$(use_with jpeg libjpeg) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index f4db68737cff..f755caa53a5a 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.12 2007/05/06 16:50:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.13 2007/05/09 04:44:12 hanno Exp $
 
 inherit subversion fdo-mime flag-o-matic multilib python
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec curl debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec curl dbus debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
 RDEPEND=">=dev-libs/glib-2.12.3
 	>=x11-libs/gtk+-2.10.6
@@ -29,6 +29,8 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib
+		sys-apps/hal )
 	doc? ( app-doc/gimp-help )
 	gnome? ( >=gnome-base/gnome-vfs-2.10.0
 		>=gnome-base/libgnomeui-2.10.0
@@ -79,6 +81,7 @@ src_compile() {
 		$(use_with curl) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
+		$(use_with dbus) \
 		$(use_with gnome) \
 		$(use_with gtkhtml gtkhtml2) \
 		$(use_with jpeg libjpeg) \