Add missing dependency on sys-process/time and fix building with libpng-1.5 wrt ...

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/sci-biology/arb/ChangeLog b/sci-biology/arb/ChangeLog
index 06a7796d0602cc42d7441dc9b180e83e3865862c..b9d78830b2e04d951be3169eb2b2121a63f67d0a 100644 (file)
--- a/sci-biology/arb/ChangeLog
+++ b/sci-biology/arb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/arb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.5 2011/06/20 07:34:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.6 2011/08/11 21:36:06 xarthisius Exp $
+
+  11 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/5.2-libpng15.patch, arb-5.2.ebuild:
+  Add missing dependency on sys-process/time and fix building with libpng-1.5
+  wrt #378353. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the
+  report and Samuli Suominen <ssuominen@gentoo.org> for the patch
 
 *arb-5.2 (20 Jun 2011)
 

diff --git a/sci-biology/arb/Manifest b/sci-biology/arb/Manifest
index 69de8afbbdd361ad75042545d00e02d4465c7f62..b6d90d58ce2c0a6e3c413674302958285430b50b 100644 (file)
--- a/sci-biology/arb/Manifest
+++ b/sci-biology/arb/Manifest
@@ -3,21 +3,22 @@ Hash: SHA1
 
 AUX 5.1-bfr-overflow.patch 715 RMD160 6d547f471a31166ac40c0502206c389d649a625d SHA1 64d010c090b83c57bf211810f1760354cca0bed1 SHA256 bedb03c70bd0e4e180f8d6e966bfaf34af32125a1595aae8a994617e6a2f2833
 AUX 5.1-libs.patch 503 RMD160 a32610db2431b84e9195d7481f50be62dfa6e9da SHA1 37792a725b045bc9948e7bcb3883c29d7cabb0ce SHA256 dfa5f131eafbf163b9a3862360694a7b1f9d6231357247c7f18f696c4c4dd983
+AUX 5.2-libpng15.patch 1545 RMD160 86336e2731ec842985ee49611234636230b3356d SHA1 9391a28d2a102d8dd5663f4fd62d18fccd577e9e SHA256 e0fca903aef6c23173a6484717bdbc08e520a47f6f80c589747bddb557169e50
 DIST arb-5.1-glibc2.10.patch.bz2 24659 RMD160 b522f6cd0cdcfe327d43e9b237a154e8261f7db9 SHA1 923c298f21100a6b3d3d8c4007031e1601834701 SHA256 1153e3efe73c1027972ee1b2789ee9841749c0bd2cbb2cc3ad8cd53586ff6f2f
 DIST arb-5.1-linker.patch.bz2 4406 RMD160 b1273f0b5c765c257c905f5945039864f4c6194a SHA1 e7d75c7d56112acc6b79ea13617c8e72ed05a7d8 SHA256 62080367ebd11ed3c9991bfb872e083e2d747264a400178ab0ec11a3502f3d43
 DIST arb-5.1.tgz 9727285 RMD160 8757446e7145faf28382c617fc7fe4b57a857baf SHA1 69696e52bf86eea5213ad9d27be30dd74f1255f3 SHA256 7f0a2411e7b95b94f23c51211461047eb74ffd3dd632552a82425cf903f89dbf
 DIST arb-5.2-linker.patch.bz2 4441 RMD160 7e410bdf330a946bea7746feaabed871305c9cb3 SHA1 cd13e3316c6734094f8e54a554c0c752ef334ff4 SHA256 3b804fca56e920f83b79f7cdfb124769bfa677a3f2216021eed04ba76ac886c6
 DIST arb-5.2.tgz 9729004 RMD160 d9d99d0ebadaa293091ff93f6ca588b2321bd8b0 SHA1 4ee493a16ece5231d46ed1071407c06e733d67c8 SHA256 cd68cfae317aae378da69c4c4ec8036a2babec064896d0b9d845fac2133f6edd
 EBUILD arb-5.1-r1.ebuild 2133 RMD160 846134ac1d2021ff1fb34a3e31145660c56ea1f2 SHA1 aed62a0169f663fe67c8e823181f1b986255bf7c SHA256 308a9ddffd81f563607a235f0b665f5557f90f65ac2933d85b13a2e08094d15e
-EBUILD arb-5.2.ebuild 1991 RMD160 e1e971bd995c6cc314d9627bd5ebdd714bfeaebf SHA1 1c6fe56aa271547c373b94171bb9908b39e867e8 SHA256 9190d3f3f4ee72a37763f914ecc3ad8635f8d1c1fcf06b622d24e5889c22baef
-MISC ChangeLog 1012 RMD160 66ea07717193261da183007c098f0bac8ff05cfc SHA1 c0a5f172a41bef264b7a64f962f61a154103cfc5 SHA256 b8fcd073a614656718f41e7f65ad74cd2661f650f69e169dffe93929e934c00a
+EBUILD arb-5.2.ebuild 2068 RMD160 234413a2fc64489fcaa48f7ea5e93edc579cf1dc SHA1 e5bb02105a17c0e8c9070450a9cf66d47b005c30 SHA256 b96c09e5d18816ad7b4b0008c5d260a17aee030df7d699f7945dd91cbab16a13
+MISC ChangeLog 1338 RMD160 12d855af3f4856cbfa1af4c06a6b0f4e11a1eec0 SHA1 8f474f6cc8d7c97b448345f70c6d8b850f55f48a SHA256 43d32542bbdb21a06ce81c2428e7e105d77dcf8eb7050bee1cfcd6cf3d2bded9
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4gYwcACgkQIiMqcbOVdxRdEAQAhBa7iXN+jotD+maVANm79Gls
-9/m0F46NRUaixXoosMJ6/5VD4tQdGH77/LZsF7hmLfKfHzOp37bKJJlxWv/zUeZu
-t5qhpHs3eVMBcffvglhBA0hsm/KXe8w6aROoWpGhdEvPeb7qMTQCrRgBNs4dJu/T
-2pI9Z/PEFEevNwiL6dU=
-=Yl+T
+iJwEAQECAAYFAk5ES08ACgkQIiMqcbOVdxQa+wP7BtxfMZEP45YZgt7EaroySYui
+RmY9BvIgRE1+3IYfaeZdt/OEefINzpdTSx9j0lo+e6XLQG/awJoZO2jVGe9ZBu69
+CcFBuD+L6CAjXTqJOAsVVwxMPuJugbGyxKQaBdZLyH7gbZb0QiXttbkgrt+aeJ6o
+1KwF914L2tgUZmZCOcQ=
+=AzTP
 -----END PGP SIGNATURE-----

diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild
index 9e6c93b9a69e62c7959a9cdbddec6f37e0c596e7..cded5698b7eec61ad026bee38747f80035ce92cf 100644 (file)
--- a/sci-biology/arb/arb-5.2.ebuild
+++ b/sci-biology/arb/arb-5.2.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/sci-biology/arb/arb-5.2.ebuild,v 1.2 2011/07/15 15:55:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.3 2011/08/11 21:36:06 xarthisius Exp $
 
 EAPI=4
 
@@ -17,8 +17,7 @@ LICENSE="arb"
 IUSE="+opengl"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
-       app-text/sablotron
+CDEPEND="app-text/sablotron
        media-libs/libpng
        media-libs/tiff
        www-client/lynx
@@ -29,7 +28,9 @@ DEPEND="
                media-libs/glew
                media-libs/freeglut
                media-libs/mesa[motif] )"
-RDEPEND="${DEPEND}
+DEPEND="${CDEPEND}
+       sys-process/time"
+RDEPEND="${CDEPEND}
        sci-visualization/gnuplot"
 # Recommended: libmotif3 gv xfig xterm treetool java
 
@@ -42,7 +43,8 @@ src_prepare() {
        epatch \
                "${WORKDIR}"/${P}-linker.patch \
                "${FILESDIR}"/5.1-libs.patch \
-               "${FILESDIR}"/5.1-bfr-overflow.patch
+               "${FILESDIR}"/5.1-bfr-overflow.patch \
+               "${FILESDIR}"/${PV}-libpng15.patch
        sed -i \
                -e 's/all: checks/all:/' \
                -e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \

diff --git a/sci-biology/arb/files/5.2-libpng15.patch b/sci-biology/arb/files/5.2-libpng15.patch
new file mode 100644 (file)
index 0000000..3d750e7
--- /dev/null
+++ b/sci-biology/arb/files/5.2-libpng15.patch
@@ -0,0 +1,45 @@
+Fix building with libpng-1.5
+
+https://bugs.gentoo.org/show_bug.cgi?id=378353
+
+Patch written by Samuli Suominen <ssuominen@gentoo.org>
+--- a/GL/glpng/glpng.c
++++ b/GL/glpng/glpng.c
+@@ -285,7 +285,7 @@
+     endinfo = png_create_info_struct(png);
+ 
+     // DH: added following lines
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+     {
+         png_destroy_read_struct(&png, &info, &endinfo);
+         return 0;
+@@ -390,7 +390,7 @@
+     endinfo = png_create_info_struct(png);
+ 
+     // DH: added following lines
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+     {
+         png_destroy_read_struct(&png, &info, &endinfo);
+         return 0;
+@@ -569,7 +569,7 @@
+ #define ALPHA *q
+ 
+                 switch (trans) {
+-                    case PNG_CALLBACK:
++                    case PNG_CALLBACKT:
+                         FORSTART
+                             ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+                         FOREND
+--- a/GL/glpng/glpng.h
++++ b/GL/glpng/glpng.h
+@@ -57,7 +57,7 @@
+ #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+ 
+     /* Transparency parameters */
+-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
++#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
+ #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
+ #define PNG_SOLID     -1 /* No transparency                                */
+ #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */