media-gfx/gimp: Bump to 2.7.3 (bug #283152)

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

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 63023e596ce49b5fa9e2f0d78ee6b729e9082f2d..5908e74d7450514194299ad31850dbe5bb4158c7 100644 (file)
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.329 2011/07/30 16:03:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.330 2011/08/31 14:44:15 sping Exp $
+
+*gimp-2.7.3 (31 Aug 2011)
+
+  31 Aug 2011; Sebastian Pipping <sping@gentoo.org> +gimp-2.7.3.ebuild,
+  +files/gimp-2.7.3-glib-2.29.patch:
+  Bump to 2.7.3, package.mask'ed for now (bug #283152)
 
   30 Jul 2011; Christoph Mende <angelos@gentoo.org> gimp-2.6.11-r1.ebuild,
   gimp-2.6.11-r2.ebuild, +files/gimp-curl-headers.diff:

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9f649c5522d4a603b544b6131e14bae6e541fcb5..d0f40fcd76ff28d69418cfc9c9509c04d0632c46 100644 (file)
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX gimp-2.7.3-glib-2.29.patch 478 RMD160 24895c62b2ad03247a8bc47d79cd55059188b283 SHA1 c4b8719c7904f4b1349e40ca1e409367a9f5997a SHA256 76a2bac5fbcaacbef592e6c137e12b72320f38224c3c9a717b82f6c34404bbdc
 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
 AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086
 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
+DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca SHA1 bea6edc3423774ace8dd86222314f4ef2278cdd8 SHA256 669811e66c6a5dffdca0df3f39f699b3a013aa5634447d9b90268f4068a8a4d9
 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 45020 RMD160 c71896b200e85dba33abffc322e80b4a2f28bd03 SHA1 dd46eebfeb17e79a63d6084a629401b50f59bf8a SHA256 dbf8ae40f102575765411ef4b41f315cae8fee8c96e2ac97033e3421e57fe7e8
+MISC ChangeLog 45210 RMD160 f7058a1c41cf755d4fd90a44e8a0644bc7e62fd3 SHA1 34d3b7634f1c08aa5c14aab806839315085d3ccb SHA256 195372eb11a75ef4c0314ccbbeefcf1eabf442fdf00cacd0ed90832962640653
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk40KyYACgkQmWq1bYTyC0MN0wD/TTcWE4BXJizGMC3gRV67VmVo
-iYm0Jhn6Zkzcejqr/2UA/R+NPzfVTLsmLYgTm2s7AH2UaRAN2fbc4HmRx/K84Sbr
-=LcXu
+iEYEARECAAYFAk5eSLwACgkQsAvGakAaFgAgXwCgj6Set+mV9hJuJM4JRHCeTc78
+jwoAnj2S6NarrisdxZMsz9lznIR45cew
+=3/96
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch b/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch
new file mode 100644 (file)
index 0000000..fc1e8db
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.7.3-glib-2.29.patch
@@ -0,0 +1,13 @@
+--- configure.ac       2011-08-31 15:44:57.123536234 +0200
++++ configure.ac       2011-08-31 15:45:38.693016544 +0200
+@@ -1940,10 +1940,6 @@
+ # We must build without problems with future releases of libraries
+ # and disabling deprecated API risks breaking the build
+ 
+-if test "x$have_glib_2_32" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+-fi
+-
+ if test "x$have_gtk_2_26" != "xyes"; then
+   CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+ fi

diff --git a/media-gfx/gimp/gimp-2.7.3.ebuild b/media-gfx/gimp/gimp-2.7.3.ebuild
new file mode 100644 (file)
index 0000000..cebd8b4
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.7.3.ebuild
@@ -0,0 +1,126 @@
+# 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-2.7.3.ebuild,v 1.1 2011/08/31 14:44:15 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 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.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
+       dev-libs/libxslt
+       x11-misc/xdg-utils
+       x11-themes/hicolor-icon-theme
+       >=media-libs/babl-0.1.4
+       >=media-libs/gegl-0.1.6
+       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: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 )
+       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.22
+       >=dev-util/intltool-0.40.1
+       >=sys-devel/gettext-0.17
+       >=dev-util/gtk-doc-1"
+
+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 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_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}"/${P}-glib-2.29.patch
+       eautoreconf
+
+       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
+}
+
+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
+}