bring gimp live ebuild up to date

Package-Manager: portage-2.1.3.16

5 files changed, 26 insertions, 159 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index c3eb2a7c9551..7ffe934212aa 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # 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.237 2007/10/27 11:37:51 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.238 2007/10/31 23:57:28 hanno Exp $
+
+  31 Oct 2007; Hanno Boeck <hanno@gentoo.org> gimp-9999.ebuild:
+  Sync live-ebuild with latest 2.4.
 
   27 Oct 2007; Hanno Boeck <hanno@gentoo.org> gimp-2.4.0.ebuild:
   Raise alsa dep, older versions don't have midi use-flag.
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index ffbd263c15a5..b6641c4574e0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -7,7 +7,6 @@ RMD160 dd7bfaef61da7474e003d2ce2cc5dc4fbbe297dc files/ltmain_sh-1.5.0-fix-relink
 SHA256 8335de81c1b94ecf25f1f68421af6a76be571a0c131277f165818ab6a37541fe files/ltmain_sh-1.5.0-fix-relink.patch 1718
 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-rc3.tar.bz2 17146422 RMD160 60e6e51df84b6f2bea9e86b99261625ef09efe8a SHA1 ed8d0e852d8c0edf0bbb2673ff8bf291844fadde SHA256 f175dd88cfc242c8ef01ac9e61c731fc2cb0a2f87764485d7dca8b71f886045f
 DIST gimp-2.4.0.tar.bz2 17617876 RMD160 e21ce418a4b367b776f49d655ea42c9b09cd05d6 SHA1 55a1f8118c26bb58cd329200a53088d3d5734ca0 SHA256 ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc
 EBUILD gimp-2.2.17.ebuild 4468 RMD160 5edb165b9d2a87fde7721bd94d0f551bc78b4b62 SHA1 e3597a3e2763af8de525db82f7fc2e2a80b162b7 SHA256 01a713b465de58358a5504d06c0dc33e55e1f648b874b424a1f3aebb47830930
 MD5 53f6e6d379b15c51022bd0900e0d943d gimp-2.2.17.ebuild 4468
@@ -21,18 +20,14 @@ EBUILD gimp-2.4.0.ebuild 3716 RMD160 71fd99e34a168d7d90f8e35ab07388cf3e41cf0e SH
 MD5 5fcc48b3d76a55f49df1fc2db8264cff gimp-2.4.0.ebuild 3716
 RMD160 71fd99e34a168d7d90f8e35ab07388cf3e41cf0e gimp-2.4.0.ebuild 3716
 SHA256 39d924a368e2a3ac579713eeab77703c7b5b195526cfaedfed365b81e6c524a7 gimp-2.4.0.ebuild 3716
-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
-SHA256 6dbaf159af5fd34b0da1c946637ad933048a42e9a91357166d38490fb0bfecc3 gimp-2.4.0_rc3.ebuild 3753
-EBUILD gimp-9999.ebuild 3533 RMD160 a56360c4615f770e07bc95678d45eb6cc1bf23e0 SHA1 31601132ddaa923926fd2fc76c8174e6be00dabb SHA256 de2241a0b4332e348a6853d9bd86487fda3d9ab805dfd32bdc4471d86ed17f1c
-MD5 b3c9bf836133ccc63d3eb1f89076f8a3 gimp-9999.ebuild 3533
-RMD160 a56360c4615f770e07bc95678d45eb6cc1bf23e0 gimp-9999.ebuild 3533
-SHA256 de2241a0b4332e348a6853d9bd86487fda3d9ab805dfd32bdc4471d86ed17f1c gimp-9999.ebuild 3533
-MISC ChangeLog 32727 RMD160 7982dc7892e9f19c7674ee294e270dfe77033945 SHA1 66374550ddc2765e3ace64024d2c3a153267889e SHA256 499c319c84181eb2b4f3c6dbe07ae841b9225f5b86c887fa6ca08309af8c2bc2
-MD5 396ebb57e1a06c3d39e3e259cc6d50c3 ChangeLog 32727
-RMD160 7982dc7892e9f19c7674ee294e270dfe77033945 ChangeLog 32727
-SHA256 499c319c84181eb2b4f3c6dbe07ae841b9225f5b86c887fa6ca08309af8c2bc2 ChangeLog 32727
+EBUILD gimp-9999.ebuild 3786 RMD160 ede6db9fbc04791c7dd3ac7f38bdd86d9e296fc6 SHA1 488c776ec66885737fc8da4fcd34c7689badc968 SHA256 f859ede7919d34622459e7ac823bc4a515d137692dc07de3f37f04c0556f06ea
+MD5 63eb6ec2e04cc4f8c7e19ba49cddc9f3 gimp-9999.ebuild 3786
+RMD160 ede6db9fbc04791c7dd3ac7f38bdd86d9e296fc6 gimp-9999.ebuild 3786
+SHA256 f859ede7919d34622459e7ac823bc4a515d137692dc07de3f37f04c0556f06ea gimp-9999.ebuild 3786
+MISC ChangeLog 32828 RMD160 297b677f6af3f7b229ecbdebdf65b1730797b7e7 SHA1 fd4df6fd6c4ccf536fda0d224792054915f02ad7 SHA256 7ecaac56b0fbc7f129ae303bb91217fa488e5282dab7e6e49e2c8822d990449c
+MD5 38a7f412774e65d7c871ea8cc4ffbe24 ChangeLog 32828
+RMD160 297b677f6af3f7b229ecbdebdf65b1730797b7e7 ChangeLog 32828
+SHA256 7ecaac56b0fbc7f129ae303bb91217fa488e5282dab7e6e49e2c8822d990449c ChangeLog 32828
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220
 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220
@@ -46,16 +41,13 @@ SHA256 8d1332c32d0e4a382bb2d420813052046e65e2cc4c79df449bbfff3a9d15d728 files/di
 MD5 ad5162a56e8d700e5ab3ca98557d8616 files/digest-gimp-2.4.0 241
 RMD160 3b158cfe4c9a37da38a889c312c4606957f5319f files/digest-gimp-2.4.0 241
 SHA256 103c29d6fdc5b2deafaad9d0625a4a8a5f3e21bd237afed3db46e090f0ff8992 files/digest-gimp-2.4.0 241
-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)
 
-iD8DBQFHIyM5r2QksT29OyARAhNKAJ0RXgQSfS2QqF3pPJXF9GsbNDtKrwCdGJ+1
-V08oEb0YGWWlOvmDOzLxvUc=
-=69Sg
+iD8DBQFHKRaTr2QksT29OyARAg1ZAKCREjvudS37yQNOd56fAtz6XcJwywCfatfs
+Px0MFzRhd9Wk7xUUy4eqJ5Q=
+=SSBG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/digest-gimp-2.4.0_rc3 b/media-gfx/gimp/files/digest-gimp-2.4.0_rc3
deleted file mode 100644
index bba1bb5fea1a..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.4.0_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f468ce7c1e3ead678f41b10b28200e60 gimp-2.4.0-rc3.tar.bz2 17146422
-RMD160 60e6e51df84b6f2bea9e86b99261625ef09efe8a gimp-2.4.0-rc3.tar.bz2 17146422
-SHA256 f175dd88cfc242c8ef01ac9e61c731fc2cb0a2f87764485d7dca8b71f886045f gimp-2.4.0-rc3.tar.bz2 17146422
diff --git a/media-gfx/gimp/gimp-2.4.0_rc3.ebuild b/media-gfx/gimp/gimp-2.4.0_rc3.ebuild
deleted file mode 100644
index 8fe0db113096..000000000000
--- a/media-gfx/gimp/gimp-2.4.0_rc3.ebuild
+++ /dev/null
@@ -1,130 +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_rc3.ebuild,v 1.3 2007/10/16 03:40:58 lu_zero 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 "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	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"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-
-	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-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index b6f05026ff97..8e6a43ab4455 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.14 2007/08/17 16:29:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.15 2007/10/31 23:57:28 hanno Exp $
 
 inherit subversion fdo-mime flag-o-matic multilib python
 
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib
 		sys-apps/hal )
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 		>=gnome-base/gnome-keyring-0.4.5 )
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
 	jpeg? ( >=media-libs/jpeg-6b-r2
-		>=media-libs/libexif-0.6.0 )
+		>=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
 	pdf? ( >=app-text/poppler-bindings-0.3.1 )
@@ -55,12 +55,13 @@ DEPEND="${RDEPEND}
 
 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
+	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
+		eerror "This package requires media-libs/alsa-lib compiled with midi support."
+		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
+	fi
 }
 
 src_compile() {
@@ -70,6 +71,10 @@ src_compile() {
 	# 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"
+	# gimp assumes char is signed (fixes preview corruption)
+	if use ppc || use ppc64; then
+		append-flags "-fsigned-char"
+	fi
 
 	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
 	"${S}"/autogen.sh $(use_enable doc gtk-doc) || die