Fix building with libpng15 wrt #366223. Fix building with sys-libs/zlib >= 1.2.5...

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

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index c2f069b175f9de181d456dbeafba728659be1b6e..bdb3e34b30299fd9648a100997832a8e6d5b584d 100644 (file)
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.189 2011/10/05 19:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.190 2011/10/17 15:34:01 ssuominen Exp $
+
+  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> R-2.10.1.ebuild:
+  Fix building with libpng15 wrt #366223. Fix building with sys-libs/zlib >=
+  1.2.5.1-r1 (OF).
 
   05 Oct 2011; Alexis Ballier <aballier@gentoo.org> R-2.10.1.ebuild,
   R-2.12.1.ebuild, R-2.12.2.ebuild, R-2.13.0.ebuild, R-2.13.1-r1.ebuild:

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 97ff5477c846e1d609877e0b5a130db41d5139f3..fcef862668e68696243b84848e54860d8bbfe425 100644 (file)
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -10,17 +10,21 @@ DIST R-2.12.2.tar.gz 21120720 RMD160 0f835e1f3433f2e2916b784089843a7fe8f47f23 SH
 DIST R-2.13.0.tar.gz 21832899 RMD160 5fc0bbdbdc0f6520e0da68ef7a17a4f3780bf9cb SHA1 878510e8a5fa1ccd1e0c4af5866f5416f3c27469 SHA256 559213ff05a205b9d2ad7ac7abebf477fb87c1bb3f0b03febbff5aa6bd8ab811
 DIST R-2.13.1.tar.gz 22063747 RMD160 3d83b907f6c81980a7e65bdf942936d6ce02a850 SHA1 8b9d48c7a654186064f369652ea34a085eff239b SHA256 ded5f39bc5130ff58a53d361435e0fee818ebec6c2aacc976ab625a3adf9bc51
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.10.1.ebuild 4111 RMD160 8c374f2d802d71d3caf2140b671fbf79bbaf84ce SHA1 0934f0cc3ec4c5b72911168064ce4c3705fa0be1 SHA256 8411a844ac6f649a0a1bce6c91f4f2eb411c498820038e23936e47b28abcd613
+EBUILD R-2.10.1.ebuild 4498 RMD160 72d270e846311fa090ffddfa9b042bc1b5f6cf32 SHA1 68767a818c647dffb55dab4e8e0499549cb22ade SHA256 5d13b703ba12a24e8140b951f7778e372f6b4eeeb64c306d8afa5d3df1ffc14f
 EBUILD R-2.12.1.ebuild 4385 RMD160 81af44c3035c7899473ac738e42a5b97422b8f33 SHA1 94d0659a9699fb0ab8a7bc32953a4bddb2d009a9 SHA256 81800f7f7e830b538658c24786ca2399b91c8bcc5aac162ee695476d50b8778e
 EBUILD R-2.12.2.ebuild 4583 RMD160 e3c0375b59748c342890ba9596d26ea699d69131 SHA1 87ed3a582f3c28af2b6f2dc9d8ce916b85128531 SHA256 393404dacad782b923d2b0d571701db926dbad782fb6b84e7fc2811ce52d659b
 EBUILD R-2.13.0.ebuild 4593 RMD160 966aad7953bf32940bb6431c82918c3572e8c01e SHA1 ddff14f5a6080e58af0c1f38e04f331d84688dcf SHA256 8d6b1676a7eb5e86460bd330c3c4c76977a9ccd7e8d4cae97c1aaa1661ef588d
 EBUILD R-2.13.1-r1.ebuild 5161 RMD160 1879836a7ccca78b7b6b54ef5b205d2ea7da948c SHA1 e06caf3d2fb5caba19972b04936392cf367bb87f SHA256 6d9b955768e0f2ff6a4510010de199acd600f03de6749dca2d3a879f013935b3
-MISC ChangeLog 27565 RMD160 3258acbb34215b337604d9aa1536d9a34ad2aaa5 SHA1 7d8249aadcfead06875629b56c25207bdb9e873f SHA256 e1b8205e4187dd85b5eb87b042e4a6d458a3a6b10bae6c142ade2289c981cc07
+MISC ChangeLog 27734 RMD160 1a9d1670bd200fa786d52c7492cd6cfa4c7e16ee SHA1 120279414bddc1ee8e6724932867937a87c6c95c SHA256 ba0ffece46770115ffda0a2dfa3e249e146a9991246d37e6c0251b7fdf2551f1
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6Mrf4ACgkQvFcC4BYPU0r8sQCgkJzdTLURA1foSm78KxFp1X0Y
-4pwAniN4qzk405lUM+UcLAN7QTlae4hD
-=cVyr
+iQEcBAEBAgAGBQJOnEraAAoJEEdUh39IaPFNtrYH/AmzzT4fk7jv40W5ypGw6Pcp
+wNRqriOF62ay4vdfUzwgyyQrsNLY2LMCPhkCD6E5JtBtjuHMMQiH95eRduxovqGL
+NbRtO80ID0QXA0eFesHiXYGS+7Mmgt3Bz/cVk3f7p2hPBw5a1dyge4GCCJ6IWx4I
+VuEa3DgRYEjRZ/cyeAyriyXdrO6VlvdSQVNgHbM5wGWG082qxNUDfjbhEOIBFzj7
+JYVkimDmAPUZIrOQtP/8K3KO5s/Lv0BeulUE5QPIBn0iSGUsRmPy7jYKQTS2c1Uq
+I+N0VfCl48ZVJ1r8t8FdFUUHhxxHg2ltFTRhJDt+La7EKJaQ1YivRliTg9Cpafg=
+=vd3U
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild
index 8a59a8fc8e91aa476e60b7cd0643ba0d02bdcdfb..03f3516b739f35becf9e86af87b303f069da7f5b 100644 (file)
--- a/dev-lang/R/R-2.10.1.ebuild
+++ b/dev-lang/R/R-2.10.1.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/dev-lang/R/R-2.10.1.ebuild,v 1.13 2011/10/05 19:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.14 2011/10/17 15:34:01 ssuominen Exp $
 
 EAPI=2
 
@@ -76,6 +76,16 @@ src_prepare() {
        sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \
                || die "sed for HTML links to manual failed"
 
+       # Fix compability with zlib-1.2.5.1-r1 OF change
+       has_version ">=sys-libs/zlib-1.2.5.1-r1" && \
+               sed -i -e '1i#define OF(x) x' src/main/unzip.h
+
+       # Missing include that was implicit before
+       sed -i -e '1i#include <zlib.h>' src/main/dounzip.c || die
+
+       # Don't try to access libpng internal structure
+       sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/modules/X11/rbitmap.c || die
+
        use lapack && \
                export LAPACK_LIBS="$(pkg-config --libs lapack)"