media-gfx/gimp: 2.7.5

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

5 files changed, 230 insertions, 11 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 1440090fce1f..2aa69a65ba74 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.352 2012/02/02 00:59:17 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.353 2012/03/14 13:01:42 sping Exp $
+
+*gimp-2.7.5 (14 Mar 2012)
+
+  14 Mar 2012; Sebastian Pipping <sping@gentoo.org> +gimp-2.7.5.ebuild,
+  +files/gimp-2.7.5-configure-gs-bzip2.patch, metadata.xml:
+  Bump to 2.7.5, add new and missing dependencies, introduce use flags gs and
+  bzip2
 
 *gimp-2.6.12 (02 Feb 2012)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c2f28ba71b75..6e4059e7c97c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -7,6 +7,7 @@ AUX gimp-2.6.11-poppler-0.17.patch 15620 RMD160 5f22b65bcadecbff1b67a42a6dd48fd1
 AUX gimp-2.7.3-glib-2.29.patch 478 RMD160 24895c62b2ad03247a8bc47d79cd55059188b283 SHA1 c4b8719c7904f4b1349e40ca1e409367a9f5997a SHA256 76a2bac5fbcaacbef592e6c137e12b72320f38224c3c9a717b82f6c34404bbdc
 AUX gimp-2.7.3-libm.patch 995 RMD160 7db10366261d3b302cac3fda669d805fa3a9d09e SHA1 612e372060d37ea13939a92eff6b5383710f9b51 SHA256 cb49b9611aca4e0082cc2f3e0c334341df3ac41009fda41355bd8af77b8601ca
 AUX gimp-2.7.4-no-deprecation.patch 1061 RMD160 b49a7e6681238be6e21fe2f4d52bdc71d1e50ed9 SHA1 5757e2b04d4b2bc4b7edebfc8bc759104bbcfbf5 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7
+AUX gimp-2.7.5-configure-gs-bzip2.patch 2141 RMD160 5d72bd0e4a731d2c9b08b1de563ccbf52744bf26 SHA1 9f7e488842422581834f730f97cd10da525967e7 SHA256 009076fe1006a95da864dc285064b0a0cacdae2eab7cd32404b7c3dacf6a8032
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa37e425c3d SHA1 9b9cae60c775d4312552434373618c6cb9188e3e SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f
 AUX gimp-curl-headers.diff 358 RMD160 b3c5d4120a203280ae9625a11de0ff5d3330dbc3 SHA1 46f694eb7d01a9d952e5651bb8c2ec22c62ccbd4 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f
 AUX gimp-libpng15-v2.diff 18466 RMD160 fc9490eb1525841c19236b4141f9adbdd0c3a273 SHA1 6d0b91b0aa107cba7a0592d0d523a22a1a67b124 SHA256 d3a4f0b365497adf1eaeaf6b4ecb5eff5517eb0ce4373ef15da0e4cece5703aa
@@ -16,6 +17,7 @@ DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091f
 DIST gimp-2.6.12.tar.bz2 16745411 RMD160 3c7ae863474dea670eaeb914e333ba6bf50c7fcc SHA1 82964e3d4eb003239f3443a1bccac53f5d780e15 SHA256 d553c9f1c07f59fa7b7ce9cc5f84ce59bf4e9dfb5b6ee4bd8718b74b947aec62
 DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca SHA1 bea6edc3423774ace8dd86222314f4ef2278cdd8 SHA256 669811e66c6a5dffdca0df3f39f699b3a013aa5634447d9b90268f4068a8a4d9
 DIST gimp-2.7.4.tar.bz2 18600581 RMD160 75aaf0d1102058335429335c51f580c81502461f SHA1 9cff32226f9e32dec2b568b5c3c69062f895743a SHA256 6c0690d5c4e58423308169a2419b684d05e06bd346cded9e081be470a5f93710
+DIST gimp-2.7.5.tar.bz2 19777338 RMD160 801ac6974582707207b37bce273d71b051f7531e SHA1 90ead85bdc3a305b402d7b4398352a27cf663285 SHA256 6d38a1d1213544ea09d74e7ca91fbe0c7e7128fb9296a1dd97253dc0e3a2fe96
 EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 2af3c9c50ab53f009bfad46cfa3f9aa28a8b5d8c SHA1 3f6b9e3b15ea4a5fe757e4e5a11c7cac45617214 SHA256 cc113afc9b25c0d76683589ffd08bd3c6152886915a394b1d27f5e2472d0dd73
 EBUILD gimp-2.6.11-r2.ebuild 3258 RMD160 a96d5740fa938fbeec74c9e9ba6010e0c22f9b5f SHA1 b3b794f86343cfecaf6ca4dd3e1fe50f3d323bc7 SHA256 c870a227f5ec24221a803d820581efe629840ffd29d083a9486b4c617e0caa87
 EBUILD gimp-2.6.11-r3.ebuild 3443 RMD160 602f9483084583edcbe8a43220a14205ee8c33cd SHA1 3f3f9efbd51d5dd843b2aff533c3087d1cfe12d4 SHA256 cb6c684aeaaa0ff649ba427926fb7503635ac67b8ba5c1b246230a681dc8fae7
@@ -26,13 +28,14 @@ EBUILD gimp-2.6.12.ebuild 3400 RMD160 8ccdac57a3cd47185ccae8e681e87347bf2ff36b S
 EBUILD gimp-2.7.3-r1.ebuild 3626 RMD160 d074ad38f0044b1d3e405b4609c1df6fa33265f9 SHA1 855b6e26ec07ecbb04b7c2bd9407e8513222d2ba SHA256 aed8112ba79253851498cad67a25a3960fcef97ffafcc56f503a65130704850f
 EBUILD gimp-2.7.3.ebuild 3231 RMD160 23b84300a99be3edc52caf73e0a0704a97a485d3 SHA1 54577dd2fd1cbe58196750fab720bd3f7ab37394 SHA256 5788d4722d6e7f63a55d51a9c3fccc6392c5eaa19054c2121aecd8bcd5d99899
 EBUILD gimp-2.7.4.ebuild 3626 RMD160 31d1d55354410e4a37fe801e8d319d7fedc767ac SHA1 a14d2c6307c3577f8ad233c290d1278f472e340e SHA256 29071e85d79fec518f4567357cdf4fbf02cef697e630d0038a522722f37102b7
+EBUILD gimp-2.7.5.ebuild 3833 RMD160 2b3342d3047bcf5e9705108eab2ba7575aec0319 SHA1 ac9971dacac928c246b347d3e36e945191275250 SHA256 2f06e21c0c07f6fa436b0fa84c47d182f448727e6bc19b94374cd680efd6a3ad
 EBUILD gimp-9999.ebuild 3400 RMD160 daf3c36bea297dcbeb7f50284dd105b7ea7a118b SHA1 0da5a192f04ef994ac3d753e9c78656d3dd89ec6 SHA256 1f4fc471e2157ff7730e5e2ae9ba6f1c6a6f5feb2c751dac24634a538b0b320c
-MISC ChangeLog 48781 RMD160 2dc42201dcb38d9081b21bbe83bda3ecb75c36e5 SHA1 5821724641de932541eb32dbb2feb72f148a78e0 SHA256 049a08e1acf1686dd50d4117924c736ce657ec3dbd0278055b3be395bef3c51b
-MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873
+MISC ChangeLog 49027 RMD160 b10e2bc29a55f6a05ceb5412bc1624670b5713f2 SHA1 30cb6a1d63d0237b9a8db86a405cb6e87be2a8c8 SHA256 76f6ca0af27741dd05838adecbe24cfe8c11cab50257d3fd90d4685cba75a214
+MISC metadata.xml 563 RMD160 2fc275c6bf65d4b3554c7d792c062ded278e571e SHA1 a29ad2dc2f53b98e128b7d826e1a033af4321126 SHA256 a7a40cad1aedace28e65901d305de88167ca10ec527812f258da5736338af95d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8p39oACgkQsAvGakAaFgBhhwCgpg5HP5pmHLa4esy5JlmDEJf8
-s5MAoLIcJLgjYD+Ni3NtbXXQBGwWOQ8L
-=aMBX
+iEYEARECAAYFAk9glpoACgkQsAvGakAaFgBdqgCfbunkPWFMn5BaD5Iu3HMHpyjr
+lP8An0ogDxSWGLMp8IOKG8VO+ASXQTVl
+=pSRF
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch b/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch
new file mode 100644
index 000000000000..2a8c127d0e8a
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.7.5-configure-gs-bzip2.patch
@@ -0,0 +1,66 @@
+From b5731b01541ebc345bffd9b57c08981196f1ad1d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 14 Mar 2012 13:40:19 +0100
+Subject: [PATCH] Introduce configure options --with[out]-gs and
+ --with[out]-bzip2 to allow bypassing gs/bzip2
+ auto-detection
+
+---
+ configure.ac |   24 ++++++++++++++++++++----
+ 1 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb60d2f..e2f154d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1154,13 +1154,21 @@ AC_SUBST(Z_LIBS)
+ # Check for libbzip2
+ ####################
+ 
+-have_libbzip2=yes
+-if test -z "$BZIP2_LIBS"; then
++AC_ARG_WITH(gs,  [  --without-bzip2         build without bzip2 support])
++
++have_libbzip2=no
++if test "x$with_bzip2" != xno; then
++  have_libbzip2=yes
+   AC_CHECK_LIB(bz2, BZ2_bzCompress,
+     [AC_CHECK_HEADER(bzlib.h,
+       BZIP2_LIBS='-lbz2',
+       [have_libbzip2="no (libbzip2 header files not found)"])],
+     [have_libbzip2="no (libbzip2 library not found)"])
++  if test "x$have_libbzip2" != xyes -a "x$with_bzip2" = xyes; then
++    AC_MSG_ERROR([
++*** Checks for bzip2 library failed. You can build without it by passing
++*** --without-bzip2 to configure but you won't be able to use compressed files then.])
++  fi
+ fi
+ 
+ AM_CONDITIONAL(HAVE_BZIP2, test "x$have_libbzip2" = xyes)
+@@ -1176,13 +1184,21 @@ fi
+ # Check for Ghostscript library
+ ###############################
+ 
+-have_gs=yes
+-if test -z "$GS_LIBS"; then
++AC_ARG_WITH(gs,  [  --without-gs            build without Ghostscript support])
++
++have_gs=no
++if test "x$with_gs" != xno; then
++  have_gs=yes
+   AC_CHECK_LIB(gs, gsapi_new_instance,
+     [AC_CHECK_HEADER(ghostscript/iapi.h,
+       FILE_PS='file-ps$(EXEEXT)'; GS_LIBS='-lgs',
+       [have_gs="no (Ghostscript header files not found)"])],
+     [have_gs="no (Ghostscript library not found)"])
++  if test "x$have_gs" != xyes -a "x$with_gs" = xyes; then
++    AC_MSG_ERROR([
++*** Checks for Ghostscript library failed. You can build without it by passing
++*** --without-gs to configure but you won't be able to use Postscript files then.])
++  fi
+ fi
+ 
+ AC_SUBST(FILE_PS)
+-- 
+1.7.8.5
+
diff --git a/media-gfx/gimp/gimp-2.7.5.ebuild b/media-gfx/gimp/gimp-2.7.5.ebuild
new file mode 100644
index 000000000000..fff91e77689a
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.7.5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.5.ebuild,v 1.1 2012/03/14 13:01:42 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit versionator autotools eutils gnome2 fdo-mime multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+	>=dev-libs/atk-2.0.1
+	>=x11-libs/gtk+-2.24.7:2
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/cairo-1.10.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2.0
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-misc/xdg-utils
+	x11-themes/hicolor-icon-theme
+	>=media-libs/babl-0.1.6
+	>=media-libs/gegl-0.1.8
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	gnome? ( gnome-base/gvfs )
+	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=media-libs/lcms-1.16:0 )
+	mng? ( media-libs/libmng )
+	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:0 )
+	svg? ( >=gnome-base/librsvg-2.34.2:2 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	x11-libs/libXcursor
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	gs? ( app-text/ghostscript-gpl )
+	udev? ( sys-fs/udev[gudev] )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+pkg_setup() {
+	G2CONF="--enable-default-binary \
+		--with-x \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		$(use_with webkit) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with exif libexif) \
+		$(use_with lcms) \
+		$(use_with gs) \
+		$(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 udev gudev) \
+		$(use_with wmf) \
+		--with-xmc \
+		$(use_with xpm libxpm) \
+		--without-xvfb-run"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+	epatch "${FILESDIR}"/${P}-configure-gs-bzip2.patch
+	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+	echo '#!/bin/sh' > py-compile
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_convert_shebangs -r $(python_get_version) "${ED}"
+		python_need_rebuild
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index be291cf80dc5..822e0b9274f5 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -9,11 +9,14 @@
 		<description>backup maintainer</description>
 	</maintainer>
 	<use>
-		<flag name="webkit">
-		Enable the webkit rendering engine
-	</flag>
+		<flag name="gs">
+			Enable Ghostscript support (<pkg>app-text/ghostscript-gpl</pkg>)
+		</flag>
 		<flag name="smp">
-		Enable support for multiprocessors
-	</flag>
+			Enable support for multiprocessors
+		</flag>
+		<flag name="webkit">
+			Enable the webkit rendering engine
+		</flag>
 	</use>
 </pkgmetadata>