media-gfx/gimp: Fix live ebuild (bug #386247)

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

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 10f1879551c4fa715b5f19c8fcb6378a06f33e97..83e074fa23aadb7760f7064b51eb6567831e6e29 100644 (file)
--- 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.343 2011/09/29 16:13:30 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.344 2011/10/09 23:40:29 sping Exp $
+
+  09 Oct 2011; Sebastian Pipping <sping@gentoo.org> gimp-9999.ebuild:
+  Remove glib 2.29 patch from live ebuild (bug #386247)
 
   29 Sep 2011; Sebastian Pipping <sping@gentoo.org> gimp-2.6.11-r5.ebuild,
   +files/gimp-2.6.11-poppler-0.17.patch:

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 288feea9174eefc760a359f6e90c1a58ce358f30..9db59384bf53550ccee10de43891370078da3766 100644 (file)
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -18,13 +18,13 @@ EBUILD gimp-2.6.11-r4.ebuild 3599 RMD160 716dc59bece8d051abbff3342792967c3bbad8c
 EBUILD gimp-2.6.11-r5.ebuild 3866 RMD160 de7cfd740b410accb111b9c47d44254b6ee8f4f2 SHA1 92dd136e0541f9b7fcd6b8f3b9d6141d73ddaab7 SHA256 54692cd675c252bd2ef63b160e2b5862a7efa20684b5f3fc87f46fdc733f7d55
 EBUILD gimp-2.7.3-r1.ebuild 3390 RMD160 9b078def828d702fee05f0be342d3fee26774746 SHA1 6461bdf711374d5f8e2dd50b2e6387984b668d56 SHA256 244d4182eed991e506bfec846cf71ef089a699cd91d1787472f8907e68aa3ca5
 EBUILD gimp-2.7.3.ebuild 3230 RMD160 6b38a0a065ec8425f8a4f148091d9592654df883 SHA1 ac744bc74f5f667dde7f81b51c2119e417bf2f8c SHA256 7158983e329c36765e33024aef0559640ea49a9f1e6bcca25508129d7663a2e4
-EBUILD gimp-9999.ebuild 3443 RMD160 b8468c1dd4625ab3267f66af056eac8a89596c53 SHA1 010d83b218f0ae999a81e683ea0e4ededf0fed00 SHA256 464b8c58ff4a11584d3eda30aa2c18be662e94a0cd7edac9532fc7b6e56cca4d
-MISC ChangeLog 47176 RMD160 b4a8ac98d29ec4b090bed5642dfd96df89e83720 SHA1 cf94226f24ead188b621e17e305a1dd3cae2bb07 SHA256 97da1878aa62375a3de106cd776c9f18d43cb3fafa7b29c77333d82596ad57cd
+EBUILD gimp-9999.ebuild 3392 RMD160 308b6dcfc512a74997da17a398e6fe57e33203a9 SHA1 9634fc3c3885024e0d8a7838ed60439282a0bbfb SHA256 93845cca2a9da9be82bbd35a1bb629bc04fc52266fbebf192795cfecd093a81d
+MISC ChangeLog 47303 RMD160 93961e672c8f7bd702569654f25dadb497f4c12f SHA1 37f858a9065cbe6f3bbeaff34f5bfebab9704a58 SHA256 43d4cd42568e9dca0dc79c3a9727eb00a62f93a16b2432adadc4924c32568d51
 MISC metadata.xml 451 RMD160 c2366a451084b99caa969c8893e290131989f8b1 SHA1 12cf8d4d3369f89b059ba8866f1d95c3c5345a75 SHA256 7039e67746d36107db19e625b77e97b840877159dd5629c7f92010b3aa736396
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6EmSsACgkQsAvGakAaFgAStQCcDkjioSJkYfLNHpGZOZ13wlh4
-azwAoK1vibNEnaknfGe6uKoG1Sy6Ua1k
-=L6w9
+iEYEARECAAYFAk6SMO4ACgkQsAvGakAaFgD+4wCfTvULbesZvQ+bQdI8xv6WVM9+
+3mYAn1vUErkeWBj1k8+fuEgFMlxAm1ph
+=++of
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 916399bdfc5a2a7dc5178cd089ff2269dca93949..065db31e86b0bb2e17866022d71b804f1e04d6a0 100644 (file)
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.38 2011/09/02 15:58:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.39 2011/10/09 23:40:29 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -104,8 +104,6 @@ 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