media-gfx/gimp: Update live ebuild

(Portage version: 2.1.10.11/cvs/Linux x86_64)

2 files changed, 41 insertions, 23 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/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
 }