[patch] gimp-2.7.3.ebuild.diff

gimp-2.7.3.ebuild.diff (text/plain), 3.51 KB, created by iGentoo on 2011-08-24 11:23:46 UTC

--- gimp-2.6.11-r2.ebuild	2011-07-30 16:31:16.000000000 +0000
+++ gimp-2.7.3.ebuild	2011-08-24 11:00:18.077085174 +0000
@@ -9,18 +9,17 @@ inherit eutils gnome2 fdo-mime multilib
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.6/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.7/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-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 xmc 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/pango-1.22.0
 	>=media-libs/freetype-2.1.7
 	>=media-libs/fontconfig-2.2.0
 	sys-libs/zlib
@@ -28,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.1.6
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
@@ -36,15 +35,20 @@ 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-1* )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2:0 )
+	pdf? ( >=app-text/poppler-0.12.4[cairo]
+			>=x11-libs/cairo-1.10.2 )
+	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 )
+	udev? ( >=sys-fs/udev-167[gudev] )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xmc? ( x11-libs/libXcursor )
+	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.40
@@ -56,20 +60,21 @@ DOCS="AUTHORS ChangeLog* HACKING NEWS RE
 pkg_setup() {
 	G2CONF="--enable-default-binary \
 		--with-x \
+		--without-mac-twain \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
 		$(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) \
 		$(use_with mng libmng) \
+		$(use_with pdf cairo-pdf) \
 		$(use_with pdf poppler) \
 		$(use_with png libpng) \
 		$(use_enable python) \
@@ -77,7 +82,10 @@ pkg_setup() {
 		$(use_enable sse) \
 		$(use_with svg librsvg) \
 		$(use_with tiff libtiff) \
-		$(use_with wmf)"
+		$(use_with udev gudev) \
+		$(use_with wmf)
+		$(use_with xmc)
+		$(use_with xpm libxpm)"
 
 	if use python; then
 		python_set_active_version 2
@@ -86,18 +94,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# security fixes from upstream, see
-	# https://bugzilla.gnome.org/show_bug.cgi?id=639203
-	epatch "${FILESDIR}"/gimp-CVE-2010-4540-to-4543.diff
-
-	# fixes for libpng 1.5 (incomplete), see
-	# https://bugzilla.gnome.org/show_bug.cgi?id=640409
-	epatch "${FILESDIR}"/gimp-libpng15-v2.diff
-
-	# don't use empty, removed header
-	# https://bugs.gentoo.org/show_bug.cgi?id=377075
-	epatch "${FILESDIR}"/gimp-curl-headers.diff
-
 	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
 }