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

Package-Manager: portage-2.1.3.16

9 files changed, 28 insertions, 470 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/Manifest b/media-gfx/gimp/Manifest
index 32d61bf1a0c2..27abd7148984 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,33 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ltmain_sh-1.5.0-fix-relink.patch 1718 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc SHA1 7205f8faab869bc68e98d0b20c8015067ddbd014 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc files/ltmain_sh-1.5.0-fix-relink.patch 1718
 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/ltmain_sh-1.5.0-fix-relink.patch 1718
-DIST gimp-2.2.16.tar.bz2 13101068 RMD160 8c5045a472469710dee1289f878e386798d48052 SHA1 0e25426507e1eda50b0b3cb11b348e563557bbae SHA256 039b5d79ab267f85d486247f327876e5cba5cb266e72f11c6835a1e8380e83c9
 DIST gimp-2.2.17.tar.bz2 13102077 RMD160 0272b20a59633eb057383e60d69abf668dd507d8 SHA1 e7bbfe5fd685f625f023af7f8fe5774feed26116 SHA256 8a4d3b28b3a11ea7564df09c8990d1c90bc3dd713b1dde0737e08603854b01b4
 DIST gimp-2.3.19.tar.bz2 16803491 RMD160 3ea293372ef0656543912c0a63ab287fd9ae72ca SHA1 f04efda774e8ed57ded5058d37091f7a8d7b17b2 SHA256 f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
-DIST gimp-2.4.0-rc1.tar.bz2 16966553 RMD160 da71de342826b7fabd13912916e25c0c6ef94a61 SHA1 79295637bf4b6d229d92b3926bce6c985bf18c71 SHA256 a136bf8460f1c9a78e7831d0e897e95e7f62d13f8371d76e23114ad96b752f59
-DIST gimp-2.4.0-rc2.tar.bz2 17646885 RMD160 7ca825daeed10c023b3a1503a8908ff7ebd0a4bf SHA1 5d9f67040f048c8a3c9beb3331057f1589715fcc SHA256 6eca07a873852e1027154a0617d2b2199bd9d59a0c5566907177fd3c1c76b2f2
 DIST gimp-2.4.0-rc3.tar.bz2 17146422 RMD160 60e6e51df84b6f2bea9e86b99261625ef09efe8a SHA1 ed8d0e852d8c0edf0bbb2673ff8bf291844fadde SHA256 f175dd88cfc242c8ef01ac9e61c731fc2cb0a2f87764485d7dca8b71f886045f
-EBUILD gimp-2.2.16.ebuild 4444 RMD160 c0f619758bc3f19c986c22f5a6b2b5e212757041 SHA1 9e00a43e55d5b9d0b61bfb20c0e2d1061fab35b5 SHA256 cfac94dc0d099e74c4f100da1234fa86084fa125b335b729b7bb455a89408779
-MD5 8129fd80584ccb3882005aec0900d521 gimp-2.2.16.ebuild 4444
-RMD160 c0f619758bc3f19c986c22f5a6b2b5e212757041 gimp-2.2.16.ebuild 4444
-SHA256 cfac94dc0d099e74c4f100da1234fa86084fa125b335b729b7bb455a89408779 gimp-2.2.16.ebuild 4444
-EBUILD gimp-2.2.17.ebuild 4459 RMD160 3221ba09924a762e4df709d291fc3b1223202763 SHA1 3c56419184c5b086d39f4e922770f2c1f30e5ce1 SHA256 d2e03d54f4ff5af67cdaa834047ab0c77d2e3c1a9053332a5cfaded921e23ff3
-MD5 49ea8ec243949d82712f88397d9c74cb gimp-2.2.17.ebuild 4459
-RMD160 3221ba09924a762e4df709d291fc3b1223202763 gimp-2.2.17.ebuild 4459
-SHA256 d2e03d54f4ff5af67cdaa834047ab0c77d2e3c1a9053332a5cfaded921e23ff3 gimp-2.2.17.ebuild 4459
+EBUILD gimp-2.2.17.ebuild 4468 RMD160 5edb165b9d2a87fde7721bd94d0f551bc78b4b62 SHA1 e3597a3e2763af8de525db82f7fc2e2a80b162b7 SHA256 01a713b465de58358a5504d06c0dc33e55e1f648b874b424a1f3aebb47830930
+MD5 53f6e6d379b15c51022bd0900e0d943d gimp-2.2.17.ebuild 4468
+RMD160 5edb165b9d2a87fde7721bd94d0f551bc78b4b62 gimp-2.2.17.ebuild 4468
+SHA256 01a713b465de58358a5504d06c0dc33e55e1f648b874b424a1f3aebb47830930 gimp-2.2.17.ebuild 4468
 EBUILD gimp-2.3.19.ebuild 3449 RMD160 a1931074784c38e52c2d9debbdb2141cb9b86597 SHA1 fe0fec80a6de241b2e52e1f5559cd096d966895c SHA256 5f679e7ccda242e000d0ea4c390ae82f75f8394cf35a8521c119647bcca5c7d2
 MD5 88d75a64352883b9d52ea2b688d4624e gimp-2.3.19.ebuild 3449
 RMD160 a1931074784c38e52c2d9debbdb2141cb9b86597 gimp-2.3.19.ebuild 3449
 SHA256 5f679e7ccda242e000d0ea4c390ae82f75f8394cf35a8521c119647bcca5c7d2 gimp-2.3.19.ebuild 3449
-EBUILD gimp-2.4.0_rc1.ebuild 3504 RMD160 73b3e7417ff4a70a2ca153b20560245fd1d3c14c SHA1 9faafce02800d11102d9de18e55ea3a98c1fc75e SHA256 6297a0a057df65ff932d487b2976861259e5752dbe7b495084dcf6dd8ae0cee6
-MD5 7f1e7cd084faec03af0a1a4873d59499 gimp-2.4.0_rc1.ebuild 3504
-RMD160 73b3e7417ff4a70a2ca153b20560245fd1d3c14c gimp-2.4.0_rc1.ebuild 3504
-SHA256 6297a0a057df65ff932d487b2976861259e5752dbe7b495084dcf6dd8ae0cee6 gimp-2.4.0_rc1.ebuild 3504
-EBUILD gimp-2.4.0_rc2.ebuild 3504 RMD160 57e005b4339805b196290da481bcd8a96053b889 SHA1 96fecce5e10d907afe16ac48f51ed5c68dc78cca SHA256 d3eb9c5226c9c4f6a372639bbae958aa929492f575098aacdaf23ae72b472e05
-MD5 1b9b2514057c1f688ebc10fc51802020 gimp-2.4.0_rc2.ebuild 3504
-RMD160 57e005b4339805b196290da481bcd8a96053b889 gimp-2.4.0_rc2.ebuild 3504
-SHA256 d3eb9c5226c9c4f6a372639bbae958aa929492f575098aacdaf23ae72b472e05 gimp-2.4.0_rc2.ebuild 3504
 EBUILD gimp-2.4.0_rc3.ebuild 3753 RMD160 cdefd62632937baf09b66e0f5f48299b7a7f0678 SHA1 3941105915b1e5e9d4febf77bb98ff0a93873e98 SHA256 6dbaf159af5fd34b0da1c946637ad933048a42e9a91357166d38490fb0bfecc3
 MD5 6c1bd037c57978c4ed8cb27c04db8889 gimp-2.4.0_rc3.ebuild 3753
 RMD160 cdefd62632937baf09b66e0f5f48299b7a7f0678 gimp-2.4.0_rc3.ebuild 3753
@@ -36,32 +24,30 @@ EBUILD gimp-9999.ebuild 3533 RMD160 a56360c4615f770e07bc95678d45eb6cc1bf23e0 SHA
 MD5 b3c9bf836133ccc63d3eb1f89076f8a3 gimp-9999.ebuild 3533
 RMD160 a56360c4615f770e07bc95678d45eb6cc1bf23e0 gimp-9999.ebuild 3533
 SHA256 de2241a0b4332e348a6853d9bd86487fda3d9ab805dfd32bdc4471d86ed17f1c gimp-9999.ebuild 3533
-MISC ChangeLog 32316 RMD160 b6d82c90af08f8865f843c61ede82eef4a506f60 SHA1 49a28e1065855d00e75bb1e5869862d955935d11 SHA256 cc9393a8197f1eb68c69d34fceafd7cb118adf268f4ecb47f65e2385508d4cc2
-MD5 25869b41e62b7f3b7d915446f0da86ee ChangeLog 32316
-RMD160 b6d82c90af08f8865f843c61ede82eef4a506f60 ChangeLog 32316
-SHA256 cc9393a8197f1eb68c69d34fceafd7cb118adf268f4ecb47f65e2385508d4cc2 ChangeLog 32316
+MISC ChangeLog 32492 RMD160 89366bb0a5128806c369ed7bde6869f63254273a SHA1 2fe57e90c5e41fb5591e596608b1d5aac3adde78 SHA256 09bc8b6016915a66f0026f34de2dd57563302d293f5f51515a7058e51e2779ef
+MD5 16f0c75c0c980dd91ae97cd79449cb46 ChangeLog 32492
+RMD160 89366bb0a5128806c369ed7bde6869f63254273a ChangeLog 32492
+SHA256 09bc8b6016915a66f0026f34de2dd57563302d293f5f51515a7058e51e2779ef ChangeLog 32492
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220
 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220
 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081 metadata.xml 220
-MD5 da0e876e96e42e764341043d0c73e2b9 files/digest-gimp-2.2.16 244
-RMD160 4367a4a3ead09939d0247ff18bf228ea1136e7f9 files/digest-gimp-2.2.16 244
-SHA256 1a01b9871cd12129d82a3477185c599f69686938cdd09d824b9c83423e362ee3 files/digest-gimp-2.2.16 244
 MD5 416654faf52ed5927d0ff0c6c6b3acdc files/digest-gimp-2.2.17 244
 RMD160 135da53851e609eac1f11cb537e135607ff62853 files/digest-gimp-2.2.17 244
 SHA256 7c961a762cf3f1c983d3ba19b4b4e2ec6d49b3d82f6d5faeed9903d630fdffdd files/digest-gimp-2.2.17 244
 MD5 937f5d523b59d3cf0d5a287f0ffe978f files/digest-gimp-2.3.19 244
 RMD160 89c0c60b11a019298569fb2eb54e967243a871f6 files/digest-gimp-2.3.19 244
 SHA256 8d1332c32d0e4a382bb2d420813052046e65e2cc4c79df449bbfff3a9d15d728 files/digest-gimp-2.3.19 244
-MD5 0492c309920bd0501a873ce286300fdf files/digest-gimp-2.4.0_rc1 253
-RMD160 2d72ecd22a91013a6b5831e1bf1bdbacdfa53812 files/digest-gimp-2.4.0_rc1 253
-SHA256 8680db371e5e9925b3a1bd814b9e73dbe0ece8df6b8aaeabf733290657430ba5 files/digest-gimp-2.4.0_rc1 253
-MD5 3b76cb9001cc04fc61c6552b6b77a0aa files/digest-gimp-2.4.0_rc2 253
-RMD160 2b2da4d720a7fb5bed91d42a057845c511e9aa57 files/digest-gimp-2.4.0_rc2 253
-SHA256 45a9aac134c40b7ec542aa12c5b96d0112a4295966dc3eac1af1f98278c89aea files/digest-gimp-2.4.0_rc2 253
 MD5 a34705b5c18fd38ebc0d37d33bfe6291 files/digest-gimp-2.4.0_rc3 253
 RMD160 891ee03293067c57189a5573cff56a6089061323 files/digest-gimp-2.4.0_rc3 253
 SHA256 d0297fc16d6d4b2d9ab0e31096fba54aab58ef97ba0322eebff5a8f35e24a6fd files/digest-gimp-2.4.0_rc3 253
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gimp-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gimp-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gimp-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHHx3Qr2QksT29OyARAupDAJ9JucQ/0kaVD2obK6aoiMbLbleFkACgmuwE
+Bk/9ELCq/YrZtDtC4m8hNN0=
+=AVWM
+-----END PGP SIGNATURE-----
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
-}