media-gfx/gimp: 2.6.12

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

3 files changed, 143 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 3665adba5b0f..1440090fce1f 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.351 2012/01/02 18:49:04 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.352 2012/02/02 00:59:17 sping Exp $
+
+*gimp-2.6.12 (02 Feb 2012)
+
+  02 Feb 2012; Sebastian Pipping <sping@gentoo.org> +gimp-2.6.12.ebuild:
+  Bump to 2.6.12, drop included patches
 
   02 Jan 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.7.4.ebuild,
   +files/gimp-2.7.4-no-deprecation.patch:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5ff55fe938bd..c2f28ba71b75 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -13,6 +13,7 @@ AUX gimp-libpng15-v2.diff 18466 RMD160 fc9490eb1525841c19236b4141f9adbdd0c3a273
 AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086
 DIST gimp-2.6.11-underlinking.patch.xz 5544 RMD160 289359e3b2367cf85dd2f838350ae340ff21256c SHA1 7b7daa0144da506519070835a101455f87e6bfba SHA256 5e7f2f16b8fe9b186b94cbe4cea1cda6242b066c07d36ca4907e276e32976d56
 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
+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
 EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 2af3c9c50ab53f009bfad46cfa3f9aa28a8b5d8c SHA1 3f6b9e3b15ea4a5fe757e4e5a11c7cac45617214 SHA256 cc113afc9b25c0d76683589ffd08bd3c6152886915a394b1d27f5e2472d0dd73
@@ -21,16 +22,17 @@ EBUILD gimp-2.6.11-r3.ebuild 3443 RMD160 602f9483084583edcbe8a43220a14205ee8c33c
 EBUILD gimp-2.6.11-r4.ebuild 3600 RMD160 76cd2144d8b8c13421120f55700560e7a0bd1d8b SHA1 6e94b7147e4d327c3531075324cc0a047d7272dd SHA256 d7b7cfb733e0980a9dd456b86d9c334bba2a5e596f61323d29ed0436015cbaca
 EBUILD gimp-2.6.11-r5.ebuild 3867 RMD160 b0eebc0e7b3cd9b8366ed2343b1e2465cd398f47 SHA1 c668a75835b150b0cf712a8b3ef60888492e10d3 SHA256 d9c1b8f087bf985f8701d95cc5d7e6861028bd27119e8025989902949f8fd8d6
 EBUILD gimp-2.6.11-r6.ebuild 4095 RMD160 bbfbf61addd5cf33fb56e2107b62e0e06f5bb6b6 SHA1 b9a35f81feef39c4ecd8833348695c22d26fe7f8 SHA256 552e6b7d8a21e071a75bdf59e80d9b05270f87f8a3a32a3d08d2292cf3564d36
+EBUILD gimp-2.6.12.ebuild 3400 RMD160 8ccdac57a3cd47185ccae8e681e87347bf2ff36b SHA1 14841bc73be06d92c3c1f830fcc432d03541d6ab SHA256 5d132e8f66b4546df6728bc7ef66696925d94e43b4ce556a85f44469b96de212
 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-9999.ebuild 3400 RMD160 daf3c36bea297dcbeb7f50284dd105b7ea7a118b SHA1 0da5a192f04ef994ac3d753e9c78656d3dd89ec6 SHA256 1f4fc471e2157ff7730e5e2ae9ba6f1c6a6f5feb2c751dac24634a538b0b320c
-MISC ChangeLog 48639 RMD160 1121bbe98a3ab8bbeb63a8c8a07e5e3aab590f18 SHA1 221b30070c3e86f89ce076dac1e29f4590f50bc7 SHA256 8ef0bd30900d982d1342c101b7877394f6d0e014149f9e565983468e4b551fb8
+MISC ChangeLog 48781 RMD160 2dc42201dcb38d9081b21bbe83bda3ecb75c36e5 SHA1 5821724641de932541eb32dbb2feb72f148a78e0 SHA256 049a08e1acf1686dd50d4117924c736ce657ec3dbd0278055b3be395bef3c51b
 MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8B/BIACgkQsAvGakAaFgAdpgCgkHTyTig6g2xus9g+lsfDgyJB
-u+MAnA5yh+4gRDd/g8xa9TIBzrwdztji
-=/3V4
+iEYEARECAAYFAk8p39oACgkQsAvGakAaFgBhhwCgpg5HP5pmHLa4esy5JlmDEJf8
+s5MAoLIcJLgjYD+Ni3NtbXXQBGwWOQ8L
+=aMBX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.6.12.ebuild b/media-gfx/gimp/gimp-2.6.12.ebuild
new file mode 100644
index 000000000000..75b212596e53
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.6.12.ebuild
@@ -0,0 +1,131 @@
+# 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.6.12.ebuild,v 1.1 2012/02/02 00:59:17 sping Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit eutils gnome2 fdo-mime multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
+	mirror://gimp/v2.6/${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"
+
+RDEPEND="
+	>=dev-libs/glib-2.18.1:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=media-libs/fontconfig-2.2.0
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.0.22
+	>=x11-libs/gtk+-2.12.5:2
+	x11-libs/libXpm
+	>=x11-libs/pango-1.18.0
+	sys-libs/zlib
+	x11-misc/xdg-utils
+	x11-themes/hicolor-icon-theme
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( >=media-libs/libexif-0.6.15 )
+	gnome? ( gnome-base/gvfs )
+	jpeg? ( virtual/jpeg:0 )
+	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 )
+	python?	( >=dev-python/pygtk-2.10.4:2 )
+	svg? ( >=gnome-base/librsvg-2.8.0:2 )
+	tiff? ( >=media-libs/tiff-3.5.7:0 )
+	webkit? ( net-libs/webkit-gtk:2 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.12.0
+	>=sys-devel/gettext-0.17
+	doc? ( >=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) \
+		--without-hal \
+		$(use_with gnome gvfs) \
+		--without-gnomevfs \
+		$(use_with webkit) \
+		$(use_with jpeg libjpeg) \
+		$(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 wmf)"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't use empty, removed header
+	# https://bugs.gentoo.org/show_bug.cgi?id=377075
+	epatch "${FILESDIR}"/gimp-curl-headers.diff
+
+	# apply file-uri patch by upstream
+	# https://bugs.gentoo.org/show_bug.cgi?id=372941
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
+	epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
+
+	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
+}