Updated for zlib header changes (closes bug #383431).

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

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 1d7202e6c5718e39bb273c2e64e07e9a8da9a767..0634c4100e511525f7a0b3be8396a31aeadd2665 100644 (file)
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.187 2011/08/04 11:38:27 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.188 2011/09/25 06:23:59 nerdboy Exp $
+
+*R-2.13.1-r1 (25 Sep 2011)
+
+  25 Sep 2011; Steve Arnold <nerdboy@gentoo.org> -R-2.13.1.ebuild,
+  +R-2.13.1-r1.ebuild, +files/R-2.13.1-zlib_header_fix.patch:
+  Updated for zlib header changes (closes bug #383431).
 
   04 Aug 2011; Naohiro Aota <naota@gentoo.org> R-2.13.1.ebuild:
   Fix dependency for FreeBSD. We have rpc related functions in freebsd-lib.

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a4b055d38d7f48b22a8012254e4efd0f3a1551d2..16868e021092888d8b9a15268464bdb56ede8a9b 100644 (file)
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1 SHA1 02ea92a7ef3c2b87a9b1f3c929cb8eb828cd06db SHA256 d17c52fcda732908954aa4bbf690085402a4027ef905bc456e5101602e2bcf4f
 AUX R-2.12.1-ldflags.patch 526 RMD160 d54e94d5c1d621821d5b0ff5d8ea789a153259eb SHA1 5cfbec92afaa164aa28fc28def531b26b2e8e428 SHA256 1af5dcdba86a915b7f6dc67d81afb71959adeca1a305890c3b7e0666b7537546
+AUX R-2.13.1-zlib_header_fix.patch 383 RMD160 a90c76bd42a86d972ba59e38b98e60222aa5e807 SHA1 1a10ce2ff0d357b9b2eb7c6512a0a12a954aec4c SHA256 e9ebeebcffbef51219537dd18a57d2764099a01999336c5a9e76030d17d1c72e
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 DIST R-2.12.1.tar.gz 20806432 RMD160 a083689dc6785cd8072461f30ce4a7969fc7ec91 SHA1 41f443cd646f7773bd824c41ea53cac3102b428d SHA256 74475d73f145d25c1e121dac9e4f18eaa077510b9e58d514cc6ae523382dee3f
 DIST R-2.12.2.tar.gz 21120720 RMD160 0f835e1f3433f2e2916b784089843a7fe8f47f23 SHA1 dbdc46edbab2dbbdc115b7247f80da5fee3dd912 SHA256 869ac219844671e4139aa4ddf5a272c27e26b1250bc427af3877fb237a5a9dbb
@@ -13,13 +11,6 @@ EBUILD R-2.10.1.ebuild 4132 RMD160 7cba401673eb7da1ce2a127da7d732a66199a2f7 SHA1
 EBUILD R-2.12.1.ebuild 4406 RMD160 589188ea6e9355e8aede1a0ed432686b7a5270dc SHA1 9e2f668a98eb414966db6a8f134baf3c1573c8b1 SHA256 1dc731612dde5a4f16583c09ca10f0d90d29dafc4b8038c6ed4a7d54585e6528
 EBUILD R-2.12.2.ebuild 4604 RMD160 49836bd3a04547ecdf7d5f764deeae045f1d30f5 SHA1 4fffde5a6610df42e3f46fb61fb36fced6ee007c SHA256 7d06a2eb55f2e733794f78f747547531728541ab7efaab16c23ac9bc319c48ec
 EBUILD R-2.13.0.ebuild 4614 RMD160 fe7c37984a5320117d481150f21f494a5a4167f2 SHA1 6652c2866031c44568e49fca54f3009fb877e4ab SHA256 e692e2f37a86298ba0460930508173db9ddecaded8ce389e7f738405a17f061e
-EBUILD R-2.13.1.ebuild 5043 RMD160 8a324523c28e54878d1607c123ee9dfd50ae69da SHA1 6bf97d4cff806837f1c3015724ae85c0396de536 SHA256 12e0ef4aa7e6b5f736ccfafaae2708c3b65d32502a6162990679eca488be3475
-MISC ChangeLog 27167 RMD160 3e71ec33f2ec94bc9a741936f46cc31ec2af4835 SHA1 3b170dc4b7bad0851cc223e3a26d969dfe1821e2 SHA256 8c674cfbfbbc95d4af2147474e1964a301770e197660b2aab338f5e3e24c53de
+EBUILD R-2.13.1-r1.ebuild 5179 RMD160 19044dd1fe014b4969ba51b189e8291f5d1e2a98 SHA1 7dc79d2d35a6f9cce480d3c905c195fb5ca4f9d5 SHA256 4986e28bea9881d3b12d4630fc96d8c309e4f283ea98ed1818af7a172d44abee
+MISC ChangeLog 27383 RMD160 a75bbfe7852379d3654d6d46bb4cb564609c7122 SHA1 516f4ebe6cba5baf1a57ca718445bc93b437bfb4 SHA256 02f6cb1a7194b97877b59e1acf1ab98de4edfba96d7347b2814d854e6b39ce42
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
-
-iEYEARECAAYFAk46hMIACgkQGpDnPLSHuMBCXQCcChOXEiqXYYX/GTiZ5p4NWB7q
-i7YAoL4r2EUQ9twGd2zhmPr6w37V4rcI
-=3+SC
------END PGP SIGNATURE-----

diff --git a/dev-lang/R/R-2.13.1.ebuild b/dev-lang/R/R-2.13.1-r1.ebuild
similarity index 94%
rename from dev-lang/R/R-2.13.1.ebuild
rename to dev-lang/R/R-2.13.1-r1.ebuild
index dc5d148ef330634dfe27d3d5fa8f8929602cd7f0..7d240c95146e3ecad086a7f7bce92726e98a6adb 100644 (file)
--- a/dev-lang/R/R-2.13.1.ebuild
+++ b/dev-lang/R/R-2.13.1-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/dev-lang/R/R-2.13.1.ebuild,v 1.2 2011/08/04 11:38:27 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1-r1.ebuild,v 1.1 2011/09/25 06:23:59 nerdboy Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ CDEPEND="app-arch/bzip2
        || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 sys-freebsd/freebsd-lib )
        virtual/blas
        cairo? ( x11-libs/cairo[X]
-               || ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+               >=x11-libs/pango-1.20[X] )
        jpeg? ( virtual/jpeg )
        lapack? ( virtual/lapack )
        perl? ( dev-lang/perl )
@@ -40,7 +40,7 @@ DEPEND="${CDEPEND}
                   app-text/ptex ) )"
 
 RDEPEND="${CDEPEND}
-       app-arch/unzip
+       ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
        app-arch/xz-utils
        java? ( >=virtual/jre-1.5 )"
 
@@ -68,6 +68,8 @@ src_prepare() {
        # upstream does not want it, no reasons given
        # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
        epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+       # update for zlib header changes (see bug #383431)
+       epatch "${FILESDIR}"/${P}-zlib_header_fix.patch
 
        # glibc 2.14 removed rpc
        if has_version '>=net-libs/libtirpc-0.2.2-r1'; then

diff --git a/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch
new file mode 100644 (file)
index 0000000..0e1482e
--- /dev/null
+++ b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch
@@ -0,0 +1,13 @@
+--- src/main/unzip.h.orig      2011-09-24 19:35:53.000000000 -0700
++++ src/main/unzip.h   2011-09-24 19:37:06.000000000 -0700
+@@ -58,6 +58,10 @@
+ #define ZLIB_FILEFUNC_SEEK_END (2)
+ #define ZLIB_FILEFUNC_SEEK_SET (0)
+ 
++#ifndef OF
++#define OF(x) x
++#endif
++
+ #define ZLIB_FILEFUNC_MODE_READ      (1)
+ #define ZLIB_FILEFUNC_MODE_WRITE     (2)
+ #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)