media-gfx/gimp: Link fix (bug #283152, comment 20)

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

4 files changed, 35 insertions, 8 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index c5a616138f9e..73115714792e 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.347 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.348 2011/11/29 23:51:17 sping Exp $
+
+  29 Nov 2011; Sebastian Pipping <sping@gentoo.org> gimp-2.7.3-r1.ebuild,
+  +files/gimp-2.7.3-libm.patch:
+  Fix underlinking with libm reported by Rion (bug #283152, comment 20)
 
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> gimp-2.6.11-r1.ebuild,
   gimp-2.6.11-r2.ebuild, gimp-2.6.11-r3.ebuild, gimp-2.6.11-r4.ebuild,
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index dbe45c02fa77..5a6d3bbeaed9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX gimp-2.6.11-cve-2011-2896.patch 1818 RMD160 4cc01a8197a31f3793897150e190ea097135efe7 SHA1 fc510e48d6a0e4840b7d98d93d0d4350add167ca SHA256 6613af30b70afb984a89dc8fa75ca6ba3271471d7fd62de23a1a9fda2fd5ec89
 AUX gimp-2.6.11-file-uri.patch 2209 RMD160 17cd5c7b454e7f64f7ed50cec4d9fe160ce7f2fc SHA1 77b3f6f50934a70f2ac938cfa0a1876ee72c2d14 SHA256 cb9da632417fcc866c047104cfbe25b5b9964fa5e65e333c042fdf23c19e692f
 AUX gimp-2.6.11-poppler-0.17.patch 15620 RMD160 5f22b65bcadecbff1b67a42a6dd48fd167272bc9 SHA1 418cbe80cc5cd7f6476ce196c755344954df83e0 SHA256 69b214ff495c7cbc1f52c0c56fa9a09e4dfba47f54da8bb3c8b063b26b8d04bd
 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-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
@@ -18,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 3533 RMD160 47ee7382c650cf7cb87f6e46ac1beb05c16ad0c3 SHA1 6f2ea79d67b62aeff24dc50c793fa0e8d8b3db2e SHA256 2ea59ba37b0cfe9c6b0a2fbb4ee0a9e9e272e7373285c8de0f4007c2fcbb619c
+EBUILD gimp-2.7.3-r1.ebuild 3599 RMD160 ff95ef4f859162ba92faddaf978c47298f5444ce SHA1 8d6947c72e90038c17590950060a4035836fc145 SHA256 5e8bd3bfa49edc889007ae511316f99aeb9bc190a067fd59e571428701f03722
 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 47915 RMD160 485b13a60716d9f962be440b4509d92a71d9a9a2 SHA1 b578f8f7c7e1085d8218bf2779cb228b6418ab4f SHA256 1545a197e0de4ef603eabe18e0924974700333f66c65641ad8efc08adc3ed40a
+MISC ChangeLog 48095 RMD160 909f9155ddbf6bdad9786c438c8611b331a7867a SHA1 2a80de342ce794804a298d1f79bc4869466df1a5 SHA256 28bdb4cf67329ea71309acc8efff4bab15768e368d4c58e100633cacdbb8ba94
 MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7DlEgACgkQgAnW8HDreRa59gCgwQXhz2sncxqUOARsXMB4HQ9C
-7MEAoKvrcwgwEY+AqRTp7afGK61BE7jq
-=WKR2
+iEYEARECAAYFAk7Vb/QACgkQsAvGakAaFgC41ACeN5JUNxoUM/5aVKyP7X+8j8W1
+7rgAnj9t3bZ3JXAfA1Pz1hgbL5pT7Tce
+=MTUe
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.7.3-libm.patch b/media-gfx/gimp/files/gimp-2.7.3-libm.patch
new file mode 100644
index 000000000000..df9f3cf35b96
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.7.3-libm.patch
@@ -0,0 +1,21 @@
+--- plug-ins/script-fu/Makefile.am	2011-11-30 00:33:18.503293635 +0100
++++ plug-ins/script-fu/Makefile.am	2011-11-30 00:36:41.479756076 +0100
+@@ -1,14 +1,16 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++libm = -lm
++
+ libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+ libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
++libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
+ 
+-libtinyscheme=tinyscheme/libtinyscheme.a
++libtinyscheme=tinyscheme/libtinyscheme.a $(libm)
+ libftx=ftx/libftx.a
+ 
+ if OS_WIN32
diff --git a/media-gfx/gimp/gimp-2.7.3-r1.ebuild b/media-gfx/gimp/gimp-2.7.3-r1.ebuild
index c733da8f4be9..f0fec1d574db 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
 # 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.3 2011/11/16 10:45:20 jlec Exp $
+# $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 $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -97,6 +97,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glib-2.29.patch
+	epatch "${FILESDIR}"/${P}-libm.patch  # bug #283152, comment 20
 	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
 
 	echo '#!/bin/sh' > py-compile