gentoo resync : 03.11.2018

3 files changed, 79 insertions, 2 deletions

diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 2c08573bb65a..3fd844a84e77 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,5 +1,6 @@
+AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-3.6.3.ebuild 755 BLAKE2B 587f11c595be77c84acb9d7f9fe14be92b76721205e7e0ca3491440d98f37ddc34d4bd973833b1ee1af32a80a9719773e57291b6375900336973e73665d10057 SHA512 56331663a9c6e1ebee5b6acaf66ce3635c8524e6cbee8604c134ec0df68ef4577b89a7c839885102bed0986e9623cf7a60947e8159e2b6687d3cbc04b3bf07e5
-EBUILD gcal-4.1.ebuild 868 BLAKE2B 09ee0f85e3dc79ad692b952e7f189d525682b57e93c8233bf0d8b14c7a291a46390b9d19421cd4dfcc81e7746f0074162326caafcecaabe5e259b6f10b903304 SHA512 306c9790470d422c09f5536f24ae643f2c2ba8c36817aaae361615d89c559c19d5c6618859539776567e8e2a4833d706cc0765ee616c0cdaf99537fa51a2d14d
+EBUILD gcal-4.1.ebuild 912 BLAKE2B cbcb5a1786ea13eabc235b8d64840be8fb1ff88d63b54dd733e4776a755753f44be1c1e610a1930f49b77006948b91541e7adcb56f7d73da3d91fed15921e33a SHA512 58000cff99fd528fac6755aeaf4d553a6e5bf45fe25d494d7a1214f52c617829cb56f4a0d94a4fea9827c7d8ce3fbef8b8c0aac7df2f684fdefe488465d7ea7c
 MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/files/gcal-4.1-glibc228.patch b/app-misc/gcal/files/gcal-4.1-glibc228.patch
new file mode 100644
index 000000000000..6e9b7c26eff5
--- /dev/null
+++ b/app-misc/gcal/files/gcal-4.1-glibc228.patch
@@ -0,0 +1,74 @@
+diff -ruN gcal-4.1.orig/lib/fseeko.c gcal-4.1/lib/fseeko.c
+--- gcal-4.1.orig/lib/fseeko.c	2017-01-22 18:09:38.000000000 +0100
++++ gcal-4.1/lib/fseeko.c	2018-10-27 21:56:46.232442299 +0200
+@@ -1,9 +1,9 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2017 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3, or (at your option)
++   the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
++   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -33,9 +33,9 @@
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,7 +47,8 @@
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -80,7 +81,7 @@
+ #elif defined __minix               /* Minix */
+   if (fp_->_ptr == fp_->_buf
+       && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+       && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__            /* uClibc */
+@@ -123,7 +124,8 @@
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+@@ -150,7 +152,7 @@
+       fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__               /* emx+gcc */
+       fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+       fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__              /* Atari FreeMiNT */
+       fp->__offset = pos;
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index 7f56acee8cae..cd7e657da4f9 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,8 @@ RDEPEND="nls? ( virtual/libintl )
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
+PATCHES=( "${FILESDIR}/${P}-glibc228.patch" )
+
 src_configure() {
 	tc-export CC
 	append-cppflags -D_GNU_SOURCE