From d56d144655e3785864da43c9acb6c228ef9360ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Jun 2019 11:30:24 +0100 Subject: gentoo resync : 22.06.2019 --- dev-lang/R/Manifest | 4 ---- dev-lang/R/files/R-2.11.1-parallel.patch | 17 ------------- dev-lang/R/files/R-2.13.1-zlib_header_fix.patch | 20 ---------------- dev-lang/R/files/R-3.0.0-rmath-shared.patch | 28 ---------------------- .../R/files/R-3.3.2-zlib-1.2.10-backport.patch | 20 ---------------- 5 files changed, 89 deletions(-) delete mode 100644 dev-lang/R/files/R-2.11.1-parallel.patch delete mode 100644 dev-lang/R/files/R-2.13.1-zlib_header_fix.patch delete mode 100644 dev-lang/R/files/R-3.0.0-rmath-shared.patch delete mode 100644 dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch (limited to 'dev-lang/R') diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 0369702ee5bd..200335633102 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,7 +1,3 @@ -AUX R-2.11.1-parallel.patch 685 BLAKE2B 877a6cc17cc415e9cc6e76a2c1e4807c6549c9ad65a9bc014fa7de186c32509af945ae96d0ba976243efa38c32eb0dea1f67e9c97c5d7f99af54c3ab36011989 SHA512 30491365eee00389f6f09c2093b5b5a568f4567c110cc0cb3332a53d6a7fcd87fe8f46f9f8521cf21bf1f0cfa24f4282a6e22396902f454c43f26542ac22c2a9 -AUX R-2.13.1-zlib_header_fix.patch 591 BLAKE2B 89087e6a37cffbe1c2f879d5ed8bae39d6d05813a121ec13f1d4e27cf65daf615b46d1246765f2deb7704487ed3382a5c1435710ec2f23d257defd427caeddb2 SHA512 1ada5a3ccb0ff902f7df35d6a42f4e99fee6a1f7b36ece000b9e2fed2b731abf5c3687d22239cd324ff6677bf8edff3415aca57c31beef33c73b98073206136a -AUX R-3.0.0-rmath-shared.patch 1137 BLAKE2B dbae2fd70ec163edf4707aec5ad28737b4b9af20c98a0807a7d947496cd3536834c24a435f9ec641205237c71dc3378ac307ebc013f0e21939f9a4aaff4a53be SHA512 92b950703f1bb6dc82b5cee5e4165fddbdf6a2aa2670980460268dae0918f884c8c0ced069b5d106853c7be814025153e8b3fe9689f1db7eeb387cf73b18a4d4 -AUX R-3.3.2-zlib-1.2.10-backport.patch 511 BLAKE2B c5210ed01461c0f2f22e7668a1952593ca4732debd7061df94f6f43536fdbe8accb3338eceffc00b8c321dc5979b045adb7b49390450a330e202175500f3b585 SHA512 29fa5be3de023f0699bab8fec5095f83936d4e40be1cbc43595a7e5ff0023d586c1bfcfe5ed8edde805fa699443e2c6be61779000e6c91be22d7b19309cbb09a AUX R-3.4.1-parallel.patch 487 BLAKE2B bb596d66fab359511c6364ac06cbbe311decd3201292c55e3350e1fc3639c36049c88b1e90adf132da67e1835b646d882415559716727e62217b1c1c679711f0 SHA512 6bc59ebd6c0599110218a70a03030877df8a7fb70d17204a365330d9aa71f7b0688a2502c64b341c478061041da43eb0b0d08cfe63e3e394236142c7d148d778 AUX R-3.4.1-rmath-shared.patch 899 BLAKE2B 0aba9c1c5417531647bed3829d53909e6f3983dea3f3de149c0ef270a8bc4eddc46dab4cbdc7cce78c0c163446a4d3a014afc9bc571f0d4a61cfa6827e40f16b SHA512 20c62b774149ae1959d28217a1be6f30968562de3ad5e4a8d7bfc7c579ca5c35fcd1304d68e222be0a37cb6db9b946fbe82d21a26fecccbecea1401b8c0b25d4 DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4489e21953c0e3fc7bfdf720d924f1e0167d3dbf65f63ed42ac10dea8b45289b921cda1c0e6d25a0063ebb SHA512 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651 diff --git a/dev-lang/R/files/R-2.11.1-parallel.patch b/dev-lang/R/files/R-2.11.1-parallel.patch deleted file mode 100644 index c713d335badd..000000000000 --- a/dev-lang/R/files/R-2.11.1-parallel.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix ocasional failure with parallel install -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=322965 -R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 - -Patch by Sebastien Fabbro - ---- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000 -+++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000 -@@ -81,7 +81,7 @@ - Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status - @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - --install: installdirs install-intl-@USE_INCLUDED_LIBINTL@ -+install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@ - @for d in $(SUBDIRS); do \ - (cd $${d} && $(MAKE) $@) || exit 1; \ - done 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 deleted file mode 100644 index 136acb26055f..000000000000 --- a/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -Update for zlib header changes for zlib > 1.2.5 - -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=383431 -R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951 - -Patch by Michael Schreckenbauer - ---- 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) diff --git a/dev-lang/R/files/R-3.0.0-rmath-shared.patch b/dev-lang/R/files/R-3.0.0-rmath-shared.patch deleted file mode 100644 index f53fb7910511..000000000000 --- a/dev-lang/R/files/R-3.0.0-rmath-shared.patch +++ /dev/null @@ -1,28 +0,0 @@ -Link with libm to fix unresolved symbols when linked with as-needed -and add a soname to the standalone math library -R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953 - -Patch by Sebastien Fabbro -Adapted to R-3.0.0 by Denis Dupeyron - ---- src/nmath/standalone/Makefile.in.orig 2013-04-04 14:39:15.777544946 -0600 -+++ src/nmath/standalone/Makefile.in 2013-04-04 14:40:51.256153179 -0600 -@@ -64,7 +64,8 @@ - Rexeclibdir_LTLIBRARIES = $(libRmath_la) - libRmath_la_SOURCES = $(SOURCES) - libRmath_la_OBJECTS = $(OBJECTS:.o=.lo) --libRmath_la_LDFLAGS = -+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so -+libRmath_la_LIBADD = $(LIBM) - - CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES) - DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) -@@ -117,7 +118,7 @@ - - ## under peculiar circumstances, $(LIBM) here helps. - $(libRmath_la): $(libRmath_la_OBJECTS) -- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM) -+ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ - - test: $(srcdir)/test.c - $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \ diff --git a/dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch b/dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch deleted file mode 100644 index 2cfb30da90fd..000000000000 --- a/dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: R.m4 -=================================================================== ---- m4/R.m4 (revision 71152) -+++ m4/R.m4 (revision 71889) -@@ -3105,10 +3105,11 @@ - #include - #include - int main() { --#ifdef ZLIB_VERSION --/* Work around Debian bug: it uses 1.2.3.4 even though there was no such -- version on the master site zlib.net */ -- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); -+#ifdef ZLIB_VERNUM -+ if (ZLIB_VERNUM < 0x1250) { -+ exit(1); -+ } -+ exit(0); - #else - exit(1); - #endif -- cgit v1.2.3