From 50b20b61712ff63a3c4cbcec5895988fb5b81f19 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 1 Jan 2012 14:04:38 +0000 Subject: [PATCH] media-gfx/gimp: fix live ebuild (bug #395065) Package-Manager: portage-2.1.10.43/cvs/Linux x86_64 --- media-gfx/gimp/ChangeLog | 9 +++++++-- media-gfx/gimp/Manifest | 12 ++++++------ media-gfx/gimp/gimp-2.7.3-r1.ebuild | 5 +++-- media-gfx/gimp/gimp-9999.ebuild | 24 ++++++++++++------------ 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 73115714792e..7649004e3e5d 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,11 @@ # 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.348 2011/11/29 23:51:17 sping Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.349 2012/01/01 14:04:38 sping Exp $ + + 01 Jan 2012; Sebastian Pipping gimp-2.7.3-r1.ebuild, + gimp-9999.ebuild: + Fix update versions of live ebuild (bug #395065), propagate Automake 1.11 + bump to 2.7.3-r1 29 Nov 2011; Sebastian Pipping gimp-2.7.3-r1.ebuild, +files/gimp-2.7.3-libm.patch: diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 5a6d3bbeaed9..58634ed208c1 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -19,15 +19,15 @@ 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.7.3-r1.ebuild 3599 RMD160 ff95ef4f859162ba92faddaf978c47298f5444ce SHA1 8d6947c72e90038c17590950060a4035836fc145 SHA256 5e8bd3bfa49edc889007ae511316f99aeb9bc190a067fd59e571428701f03722 +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-9999.ebuild 3393 RMD160 9a0afbad33219cad286b6ed3a2b3fb93f5a4dd43 SHA1 62bd9599b7d232a8a52988a9c189a26004afb00f SHA256 1f95ac758daa8db784d9562985dbb66ef85df96e75d057f763f012da4eff18cf -MISC ChangeLog 48095 RMD160 909f9155ddbf6bdad9786c438c8611b331a7867a SHA1 2a80de342ce794804a298d1f79bc4869466df1a5 SHA256 28bdb4cf67329ea71309acc8efff4bab15768e368d4c58e100633cacdbb8ba94 +EBUILD gimp-9999.ebuild 3400 RMD160 daf3c36bea297dcbeb7f50284dd105b7ea7a118b SHA1 0da5a192f04ef994ac3d753e9c78656d3dd89ec6 SHA256 1f4fc471e2157ff7730e5e2ae9ba6f1c6a6f5feb2c751dac24634a538b0b320c +MISC ChangeLog 48285 RMD160 73becdde5bd56357cc4a9dd76a13b97996abc58f SHA1 f38556a126dd535bc525ca670a156e2217b61c60 SHA256 42266f57d67b4f176432a1f9a73153c81573b6b36e5527304b93bfe3f36543c5 MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7Vb/QACgkQsAvGakAaFgC41ACeN5JUNxoUM/5aVKyP7X+8j8W1 -7rgAnj9t3bZ3JXAfA1Pz1hgbL5pT7Tce -=MTUe +iEYEARECAAYFAk8AZ/cACgkQsAvGakAaFgDl2wCggS810+sKQQGQ3pnLF85qkTKM +LHkAoK8eiT8/grboIiDkw+ZS8BILjJ4x +=IJ+h -----END PGP SIGNATURE----- diff --git a/media-gfx/gimp/gimp-2.7.3-r1.ebuild b/media-gfx/gimp/gimp-2.7.3-r1.ebuild index f0fec1d574db..cbcec5475ae9 100644 --- a/media-gfx/gimp/gimp-2.7.3-r1.ebuild +++ b/media-gfx/gimp/gimp-2.7.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.3-r1.ebuild,v 1.4 2011/11/29 23:51:17 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild,v 1.5 2012/01/01 14:04:38 sping Exp $ EAPI="3" PYTHON_DEPEND="python? 2:2.5" @@ -56,6 +56,7 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) + >=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*" diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 101b28547571..851ea0de6da5 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-9999.ebuild,v 1.40 2011/11/16 10:45:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.41 2012/01/01 14:04:38 sping Exp $ EAPI="3" PYTHON_DEPEND="python? 2:2.5" @@ -19,11 +19,11 @@ KEYWORDS="" 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 +RDEPEND=">=dev-libs/glib-2.30.2:2 + >=x11-libs/gtk+-2.24.7:2 + >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 - >=x11-libs/pango-1.22.0 + >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 @@ -32,14 +32,14 @@ RDEPEND=">=dev-libs/glib-2.28.1:2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.4 - >=media-libs/gegl-0.1.6 + >=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:2 ) + webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) @@ -49,7 +49,7 @@ RDEPEND=">=dev-libs/glib-2.28.1:2 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.14.0:2 ) + svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] )" @@ -58,9 +58,9 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-1.5 + >=sys-devel/libtool-2.2 >=sys-devel/autoconf-2.54 - >=sys-devel/automake-1.10" + >=sys-devel/automake-1.11" DOCS="AUTHORS ChangeLog* HACKING NEWS README*" -- 2.26.2