media-gfx/gimp: Update live ebuild

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 46 insertions, 28 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5908e74d7450..6f627e4e2d8b 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # 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.330 2011/08/31 14:44:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.331 2011/08/31 18:44:34 sping Exp $
+
+  31 Aug 2011; Sebastian Pipping <sping@gentoo.org> gimp-9999.ebuild:
+  Sync and fix live ebuild with 2.7.3
 
 *gimp-2.7.3 (31 Aug 2011)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d0f40fcd76ff..33d82602631d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,13 +11,13 @@ DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca
 EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 324ff1505eeed9d839cc9695df3289dff0e5bf6e SHA1 b163b4ce5567abeb087b4f50eb4bfc2bb431a040 SHA256 07c2eafd3ce4e49f05a7b154b30be3f40a069e6617e1538c5e97d901dc424925
 EBUILD gimp-2.6.11-r2.ebuild 3259 RMD160 0f869b84f27b578b0c50da27545afc724ec236fc SHA1 4159ab5be4c896576ab9ca18d5b68b544665d23a SHA256 437a9aeff3e6c03814f0ce2912b8037e2005876aee294be79804a7765aa29180
 EBUILD gimp-2.7.3.ebuild 3221 RMD160 ef48c49f95326beb3e05cbb646b738da5016a5e9 SHA1 05587f53a1649199198ab628703326bcdbbfdd04 SHA256 171737d3c84cce5d83381b45a2c979e523c107854f75c880d379221a1a15d432
-EBUILD gimp-9999.ebuild 2926 RMD160 d7b2dfddc0a5cf41bf88dadb4c1481a89f553672 SHA1 13b14286a21bf8e5f1f1a7b3a5e40391e1e14c86 SHA256 98689de8be260bb36b07fd8db09a4d190dae7ff920ca0f5e112eff3168de8d60
-MISC ChangeLog 45210 RMD160 f7058a1c41cf755d4fd90a44e8a0644bc7e62fd3 SHA1 34d3b7634f1c08aa5c14aab806839315085d3ccb SHA256 195372eb11a75ef4c0314ccbbeefcf1eabf442fdf00cacd0ed90832962640653
+EBUILD gimp-9999.ebuild 3362 RMD160 5e7b1c5f3d1f71f4e0d05ff8466eab853bd4a702 SHA1 666513d3d6bb2bc7e65c9ee5edd1a5a08307b6b9 SHA256 5c29578642765265a07d3f748bcf20a0e613971e30f1f8aafe6342c8b34f3252
+MISC ChangeLog 45319 RMD160 1048f7f32bfa50a84e5227d71ff4bb7e446780f2 SHA1 f81886978c2ac9a2102f15dedfe7e03b1f416881 SHA256 15f55502ac042e9cd03081b1e7b2a815ffb3ffcdf53071f85ee761ff8ef71b01
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5eSLwACgkQsAvGakAaFgAgXwCgj6Set+mV9hJuJM4JRHCeTc78
-jwoAnj2S6NarrisdxZMsz9lznIR45cew
-=3/96
+iEYEARECAAYFAk5egRIACgkQsAvGakAaFgAzsgCgmr9lNuddcnuxIBQX/dnkbxNG
+b4YAoNTb+EgX3/IkHUrywTCCT4XF4zxd
+=yeDL
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 3ff7158a6379..1d891907a361 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,11 +1,11 @@
 # 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.35 2011/04/04 19:57:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.36 2011/08/31 18:44:34 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit git eutils gnome2 fdo-mime multilib python
+inherit git-2 eutils gnome2 fdo-mime multilib python
 
 EGIT_REPO_URI="git://git.gnome.org/gimp"
 
@@ -13,20 +13,22 @@ DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
 SRC_URI=""
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
+IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
-RDEPEND=">=dev-libs/glib-2.18.1:2
-	>=x11-libs/gtk+-2.12.5:2
-	>=x11-libs/pango-1.18.0
-	x11-libs/libXpm
+RDEPEND=">=dev-libs/glib-2.28.1:2
+	>=x11-libs/gtk+-2.24.3:2
+	>=x11-libs/gdk-pixbuf-2.22.1:2
+	>=x11-libs/cairo-1.10.2
+	>=x11-libs/pango-1.22.0
+	xpm? ( x11-libs/libXpm )
 	>=media-libs/freetype-2.1.7
 	>=media-libs/fontconfig-2.2.0
 	sys-libs/zlib
-	dev-libs/libxml2:2
+	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
@@ -39,20 +41,27 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	gnome? ( gnome-base/gvfs )
 	webkit? ( net-libs/webkit-gtk:2 )
 	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
 	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms:0 )
+	lcms? ( >=media-libs/lcms-1.16:0 )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2 )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] )
+	png? ( >=media-libs/libpng-1.2.37: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 )"
+	svg? ( >=gnome-base/librsvg-2.14.0:2 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	x11-libs/libXcursor
+	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
+	>=dev-util/gtk-doc-1
+	>=sys-devel/libtool-1.5
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.10
+	dev-libs/libxslt"
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
@@ -64,11 +73,10 @@ pkg_setup() {
 		$(use_enable altivec) \
 		$(use_with curl libcurl) \
 		$(use_with dbus) \
-		--without-hal \
 		$(use_with gnome gvfs) \
-		--without-gnomevfs \
 		$(use_with webkit) \
 		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
 		$(use_enable mmx) \
@@ -80,7 +88,11 @@ pkg_setup() {
 		$(use_enable sse) \
 		$(use_with svg librsvg) \
 		$(use_with tiff libtiff) \
-		$(use_with wmf)"
+		$(use_with udev gudev) \
+		$(use_with wmf) \
+		--with-xmc \
+		$(use_with xpm libxpm) \
+		--without-xvfb-run"
 
 	if use python; then
 		python_set_active_version 2
@@ -89,13 +101,16 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git_src_unpack
+	git-2_src_unpack
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.3-glib-2.29.patch
+
 	echo '#!/bin/sh' > py-compile
+	chmod a+x py-compile || die
 	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	./autogen.sh
+	./autogen.sh || die
 	gnome2_src_prepare
 }