gimp cleanup of old versions and QA fixes for new repoman checks

(Portage version: 2.1.3.16)

8 files changed, 10 insertions, 438 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index c75c33c514c6..56f4ca90cea1 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.234 2007/10/16 03:40:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.235 2007/10/24 10:24:31 hanno Exp $
+
+  24 Oct 2007; Hanno Boeck <hanno@gentoo.org> -gimp-2.2.16.ebuild,
+  gimp-2.2.17.ebuild, -gimp-2.4.0_rc1.ebuild, -gimp-2.4.0_rc2.ebuild:
+  Cleanup of old versions and QA fixes.
 
   16 Oct 2007; Luca Barbato <lu_zero@gentoo.org> gimp-2.4.0_rc3.ebuild:
   workaround transformation preview on ppc
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.16 b/media-gfx/gimp/files/digest-gimp-2.2.16
deleted file mode 100644
index ece2891b1d71..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d50c30eddbd3736156036af2e91fd526 gimp-2.2.16.tar.bz2 13101068
-RMD160 8c5045a472469710dee1289f878e386798d48052 gimp-2.2.16.tar.bz2 13101068
-SHA256 039b5d79ab267f85d486247f327876e5cba5cb266e72f11c6835a1e8380e83c9 gimp-2.2.16.tar.bz2 13101068
diff --git a/media-gfx/gimp/files/digest-gimp-2.4.0_rc1 b/media-gfx/gimp/files/digest-gimp-2.4.0_rc1
deleted file mode 100644
index db1d390be2d5..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.4.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 788fb85712ea1d8b52d70f7b2ebdb439 gimp-2.4.0-rc1.tar.bz2 16966553
-RMD160 da71de342826b7fabd13912916e25c0c6ef94a61 gimp-2.4.0-rc1.tar.bz2 16966553
-SHA256 a136bf8460f1c9a78e7831d0e897e95e7f62d13f8371d76e23114ad96b752f59 gimp-2.4.0-rc1.tar.bz2 16966553
diff --git a/media-gfx/gimp/files/digest-gimp-2.4.0_rc2 b/media-gfx/gimp/files/digest-gimp-2.4.0_rc2
deleted file mode 100644
index d7bd7c2eea7c..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.4.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4a17f7d002cfc0ddf13d64181030a71b gimp-2.4.0-rc2.tar.bz2 17646885
-RMD160 7ca825daeed10c023b3a1503a8908ff7ebd0a4bf gimp-2.4.0-rc2.tar.bz2 17646885
-SHA256 6eca07a873852e1027154a0617d2b2199bd9d59a0c5566907177fd3c1c76b2f2 gimp-2.4.0-rc2.tar.bz2 17646885
diff --git a/media-gfx/gimp/gimp-2.2.16.ebuild b/media-gfx/gimp/gimp-2.2.16.ebuild
deleted file mode 100644
index 41965c698e07..000000000000
--- a/media-gfx/gimp/gimp-2.2.16.ebuild
+++ /dev/null
@@ -1,173 +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.16.ebuild,v 1.9 2007/07/22 09:59:49 dberkholz Exp $
-
-inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
-
-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"
-
-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 ""
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-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
-	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.2.17.ebuild b/media-gfx/gimp/gimp-2.2.17.ebuild
index a30a2f117aaf..1ec9134b8e63 100644
--- a/media-gfx/gimp/gimp-2.2.17.ebuild
+++ b/media-gfx/gimp/gimp-2.2.17.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.2.17.ebuild,v 1.9 2007/08/17 16:29:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.17.ebuild,v 1.10 2007/10/24 10:24:31 hanno Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives multilib python
 
@@ -55,7 +55,7 @@ src_unpack() {
 	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
+	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.
@@ -151,7 +151,7 @@ pkg_postinst() {
 
 	# fix for bug #76050
 	ln -s $(gimptool-2.0 --gimpdatadir)/images/wilber-icon.png \
-		${ROOT}/usr/share/pixmaps/
+		"${ROOT}/usr/share/pixmaps/"
 
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
@@ -164,8 +164,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	[[ ! -f ${ROOT}/usr/bin/gimp-2.2 ]] && \
-		rm -f ${ROOT}/usr/share/pixmaps/wilber-icon.png
+	[[ ! -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.4.0_rc1.ebuild b/media-gfx/gimp/gimp-2.4.0_rc1.ebuild
deleted file mode 100644
index fb28a7bc877e..000000000000
--- a/media-gfx/gimp/gimp-2.4.0_rc1.ebuild
+++ /dev/null
@@ -1,125 +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.4.0_rc1.ebuild,v 1.4 2007/09/09 22:30:42 kumba Exp $
-
-inherit fdo-mime flag-o-matic multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.4/testing/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-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.13
-	>=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 )
-	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
-		>=gnome-base/gnome-keyring-0.4.5 )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		>=media-libs/libexif-0.6.15 )
-	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.10.4 )
-	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
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-S="${WORKDIR}/${P/_/-}"
-
-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_with curl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with dbus) \
-		$(use_with gnome) \
-		$(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) \
-		$(use_with wmf) \
-		|| 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
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	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.4.0_rc2.ebuild b/media-gfx/gimp/gimp-2.4.0_rc2.ebuild
deleted file mode 100644
index b39dadbf8f13..000000000000
--- a/media-gfx/gimp/gimp-2.4.0_rc2.ebuild
+++ /dev/null
@@ -1,125 +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.4.0_rc2.ebuild,v 1.2 2007/09/09 22:30:42 kumba Exp $
-
-inherit fdo-mime flag-o-matic multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.4/testing/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-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.13
-	>=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 )
-	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
-		>=gnome-base/gnome-keyring-0.4.5 )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		>=media-libs/libexif-0.6.15 )
-	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.10.4 )
-	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
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-S="${WORKDIR}/${P/_/-}"
-
-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_with curl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with dbus) \
-		$(use_with gnome) \
-		$(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) \
-		$(use_with wmf) \
-		|| 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
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}