gentoo resync : 16.04.2018

3 files changed, 26 insertions, 1 deletions

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 617e5fadc12c..f4c1530ec103 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -2,6 +2,7 @@ AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dc
 AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3
 AUX texmacs-1.99.2-norpath.patch 428 BLAKE2B 3af37ef5c77816f15a46cf373d2052675e451ab78f13ca55f86da8f32a4327a17c850b7b533c72e0c94d1fdde22df306ac6fdf718ecd8045f603a1f26a3857c7 SHA512 7cd81f6199823fb1a50af697d9456db53db18ffb8de84bbbbd35a58020d288239dc7ab5e4e13b7db19189393292cb2d312bae52540999898342f7a505c9eb21d
 AUX texmacs-1.99.2-underlinking.patch 559 BLAKE2B 5f72d821cba36b3d7100233146f0f64ef1e8e74a75cc4f8c4bf3fc20315438c11c434d3223fd27b7f58ea3583caa3f1977b8b31ef4628c395a05f2d31c0ed858 SHA512 4d8805895b02adf107acc32e434a28f7def6fffe0d69d1b49f0d6cffbe94d55dbe31ee4c4c2ae7709313c6ce7b0d5c9cebb11004cf6e9f6a08f46cf3725a223b
+AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec
 AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5
 AUX texmacs-plugins-1.patch 2920 BLAKE2B b0b19c3e573b6d8d4a10b128feee839bd991eab46d39b5959d3afce3a02ccc471a6db9b5807523f35fb23dae87957b19fce1181296453fb19e2538c720798a38 SHA512 e8d9617166b712dfdf72b4c7b97a8945cbd5d505c092eb59a31de05b44b48d75839cb6344ba96ec378cca322a3fc17d99cb7f8e27c1fed86dc0d3329b02c1ca6
 AUX texmacs-updates.patch 1387 BLAKE2B 4a6014fb55e912611aab02fc27970aad58183f3cabded7f773def36c56a0dd1ae6e16c955c7b6ee37a696470e04219dfb5abaf64885c3d1af9c8dc792f73511f SHA512 209c5f64e21ae76fe41419101afb98ce4f61f040e9d29e3dbe37ec5bb0e16a1f3dd5aebe381db99e8d7278c5c36cd1654f78ba4af69e032670b1fdb62aafbda1
@@ -11,6 +12,6 @@ DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9
 EBUILD texmacs-1.99.2-r1.ebuild 1859 BLAKE2B 5169eff496b09fb03b8756fa2e75f0b2904e333c6dafa93dd348915ccc633ef23c06973b39e4fbd6067ad39a7b982f2e8fe1f9dd52813e12e219a5ef933b08ad SHA512 0d530b0ab47462b964650ad0bd8a28c2c05cb2cd09b2c8054123c5e794fe8093b47645b3713edc1ecc772f846dae37bb821e3925048764480182aa4ac0b63a6a
 EBUILD texmacs-1.99.5.ebuild 1840 BLAKE2B ea7932a639605afeaad05ba624caf118a353f20880174923d4b2fc55b835efca2c661721e21fcf037a2a7c8805791c1f91cb5cf201f3f28d47e1ad8c7a7d3863 SHA512 cf5241fa735e93f87f5c630a13172c4ef7682ce1303f6a001bab79c2d573bc71322e359dc5a13f3430333fe75ec875ab6c1af921d05ccd4d5ff1dfacf719edef
 EBUILD texmacs-1.99.6-r1.ebuild 1619 BLAKE2B ddeaf9804ca92f537d24d759e3cf1683c02b3b849f688c08a501481ad1e838f2613ac6911f57df259b5fa58a52d30823690d3dda781d8c5a4e6588079a4457b2 SHA512 fd3858ad690822ddc9d6806fb98a8567230948d50fc65a5309bf2a1f7f060f100b813c5b4fa0d72c819b854964767fe8c52c2c2305c984fc0ef00521068940d5
-EBUILD texmacs-1.99.6-r2.ebuild 1683 BLAKE2B 8ab489e4869723eb9d4c260c2b070bd950c6558374e33ef67ce41bdee6d75b9941efa33a36f0e3d80a0ff885ab05fe3ed496e79131c2e2b925b5014a87b4a603 SHA512 7bcb6423e42eed285a0e5e75eb4c38f68a06ec9c9725f856364684f3992386f2920a3cc929ae6660c22a2e99b64202819f4e2af65ad8c90342f8e9c49478ef1a
+EBUILD texmacs-1.99.6-r2.ebuild 1783 BLAKE2B 8061bd4623ec16109a5789d4a253cb86e15a8b845834187a13c72b857fcb9f1304c116430f46061b3d7d7b7230080c4d4815e541350001f972c6c4fe5c0d8aa6 SHA512 38543f692745dfd80fa0c7b7bd0e5336f7d9f5de687f467d8d6defef2f479fa7a030ad3f84e342b620cbafd4541ac93b121f3c1f817e5cfc2a40d1ed45026668
 EBUILD texmacs-1.99.6.ebuild 1725 BLAKE2B f7687d9048bdd782c3ffa31e3f0f423d0609e334c090b66c89a09afa47ee53687054589d955fd4de61d82ca8bd86ba579d3a6bb314f0fc56dc00dc667dba3a89 SHA512 b3d58e9de7f1368bf6099bf2d5d98437f0ac9a81e734a9b0a9bba47eba315721dd356edc1d5c947ce5b697196453c7e896a63de44e9c251ab7ba2d5608018e00
 MISC metadata.xml 532 BLAKE2B 8f4a56ce00b94350aa8597db3fa2f65d676675ee212040b1bd5518563cf7c13e9499d2cb800b4e03e5159280ef17c6ca389b151833e587efe710835cc49ac1f4 SHA512 f7a15d31b19285e863c32dbe1a6e77b10d4a9295dc2f9444a69173eb13e5334acedb0b547253dbe0734a33402e11cd9859c07d8d5db1be3370e547cd96266601
diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
new file mode 100644
index 000000000000..3068169618fb
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
@@ -0,0 +1,21 @@
+C compiler compiles this code for bot int-based and size_t-based
+guile. C++ compiler does not (and is what used by texmacs).
+
+https://bugs.gentoo.org/652054
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37e9e87..5de2711 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
+ SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
+ SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
+ 
+ MESSAGE(STATUS "Checking the size_t of guile strings")
+ 
+-CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
++CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
+   #include <libguile.h>
+   void print_string (SCM s) {
+     int len_r;
+     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
+ " _guile_str_size_test)
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
index e2d3ac76e183..cdc5bdd2566b 100644
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -51,6 +51,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
 
 	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+
+	# fix build failure on 32-bit systems, bug #652054
+	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
 )
 
 src_configure() {