gentoo resync : 23.12.2017

9 files changed, 105 insertions, 8 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 6410a45c3b65..8949fe82eafa 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 4ded14ee626f..dcc8d4d3f7fb 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -4,10 +4,10 @@ DIST lyx-2.0.8.1.tar.xz 10481988 BLAKE2B 121a2f5a86f9b2f92fc211c052a26dfeb0c89c3
 DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B ddc6e10974f495bb465fced0bfe95e0530831e924c12323267feec59e49900efefda154abac927f3129ab0820706a870fb463e749cff2b5c4b47368d954c9d20 SHA512 6f8c62ff96458d0c8c8057ae1e587be4c63bd3bdf2d4f095c24d447017034eda8c6b645efbd258f0956a9bbfe5fde2f90df36515be7b8a94cb63674bc3a58672
 DIST lyx-2.2.2.tar.xz 15490148 BLAKE2B 16d9b1448da76dd0b02ee4cdec38831a0c3aa7a0798b4f99bb6c93717223dfd3c62145afa76324177ed162d4c45ab341a963831855c9607d8544574ae88766da SHA512 5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
-EBUILD lyx-2.0.8.1-r1.ebuild 4335 BLAKE2B 630b3fbd1d92274043b5a18dd74144f7587460f3df8b4e8e984d4288b1940f9ff2697256598f9028d817b28fd4475a7fbe90d741c25340ae97bb4730412d4b93 SHA512 824bf4865268d7e7594f7f1ec21ad8128602765bc8ae9b4d86ea7ffdb12cd5ac54cc9b61e48e5badb4e5cd388f067afe05b1cc5b5d73b380900e51a5f3339c82
-EBUILD lyx-2.1.5-r1.ebuild 4251 BLAKE2B b09acf66c169593e969fe7b432574a9fa3cd7fdec86a13451de6cbf928e7f8043e2c78bd9421f5d94d0519e2be4f89f8e332a2eb6ce0a06b84ad7b5a4dfcf262 SHA512 a46a099611d5e83fbf7ef35d27c1a2e7f16eb74af8c68a7800a13642b3c8c21365d735fa53d79c934f2233314e9da868ce3364e36d62a7a1b341f7cbe445a18e
-EBUILD lyx-2.2.2-r1.ebuild 4648 BLAKE2B ccf7457c23ae06765069fcb8da5d451c630858359a2798a9d746b412278db5bb563774d60b56c2b1f59f8a65909db97054b2348cb59aed42173118fceb006a5f SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7
+EBUILD lyx-2.0.8.1-r1.ebuild 4336 BLAKE2B 3215a65172c1925c8cba5587f25e53ff7d605ecfa80130553c7facf228dfe1f065cc481d366d171c8a13174fb7151af175aed650b3fe6622096587859a587a72 SHA512 4c4a3850b0b078b6b03eeb12a83c26534c8ee35d1e66da820dac6a5eae6f638f8723dded3d10fcf7b5559ab68e19754eb9019a7553ccd40e59bf7a69f44126be
+EBUILD lyx-2.1.5-r1.ebuild 4252 BLAKE2B c9d8bab2db9d974209b6cc0e13971c59cf86ec10defc7083b824446ee6dc2e07d6d72a79697b7b4a2642c6c7bdac35730b14402d9adc474d727d964e2f03c17b SHA512 2cc4841356eb3cd3e2ddbb92efa3d113ad31477ca711f210338cfa7cbeb9eccf79a32ccc453a0fcdac55be5caea0feeaae870d42229936e2301c21f9345716f7
+EBUILD lyx-2.2.2-r1.ebuild 4649 BLAKE2B 2cba6ae6c37be6a8dfb9c7c68718a68445ee4d87f9c93782927ce1c9e4d088a7cfa6c2c5e60da0cf7597f88ff4546155fbca15d11d68962f0ef9844b265aed1c SHA512 67750bf312cbbe65639ba0293bbb3aac4460ec42fc74478b82a3bbe7eb6ede4749d895b0d8038105943d3906c048f234cfec15ff248df6d15789c09493d00c19
 EBUILD lyx-2.2.3-r1.ebuild 4550 BLAKE2B d5323277ebc540115a633820f38729ec28ab256179c86537b965a06a967d34da0802902da31ce797c0db73c4b6d8bd81be9ec7ded97ea6a5c718b2cf2d95a736 SHA512 e951bbdbfbd13aca1b63492f95188bc0f68ca025fef457b2ea610b571955d0678a8a95ea86c5e7449db4cfcf392c2d017bf9ea9ea6fa7952d18bb91ab56a0140
 EBUILD lyx-2.2.3-r2.ebuild 4520 BLAKE2B a2b67d675bd8e11331e1d3da9034585f475390d9125f47ae820d1caf16ffa9e0c78f985eea9089c51f248e8f6effba75e5e2de8fa009416c3b7cb23807be4c33 SHA512 217b879d325a4c7bdbdfaa581e219fd212ac356284590c2da7a663890e3108fde7f92ed94af49bc161d50b1c34da8840f4ee76c954ab0494151b1e34d5cebb1c
-EBUILD lyx-2.2.3.ebuild 4648 BLAKE2B ccf7457c23ae06765069fcb8da5d451c630858359a2798a9d746b412278db5bb563774d60b56c2b1f59f8a65909db97054b2348cb59aed42173118fceb006a5f SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7
+EBUILD lyx-2.2.3.ebuild 4649 BLAKE2B 2cba6ae6c37be6a8dfb9c7c68718a68445ee4d87f9c93782927ce1c9e4d088a7cfa6c2c5e60da0cf7597f88ff4546155fbca15d11d68962f0ef9844b265aed1c SHA512 67750bf312cbbe65639ba0293bbb3aac4460ec42fc74478b82a3bbe7eb6ede4749d895b0d8038105943d3906c048f234cfec15ff248df6d15789c09493d00c19
 MISC metadata.xml 1876 BLAKE2B 873befa20f6827e2938d5673b4db4bf56d8e501f98a64ce53acd1cfa55a44341fcd9660bd22494244a73e6e7b5a5efcb257916cf0130f4d40c8907aa3f6bb55c SHA512 5d76edc1d253fc60f7eb3f72548685fcc305a1bd51b12d034ef9bd32a74ef53c8b662e5938cc4353d6862f3f6f7d4a52cd4ad03c2d0d906c50e8b118b13d70f7
diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
index 0cd685c7964a..6d3194d8af99 100644
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 FONT_S="${S}/lib/fonts"
 FONT_SUFFIX="ttf"
 DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
+HOMEPAGE="https://www.lyx.org/"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
 	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${MY_P}.tar.xz"
 
diff --git a/app-office/lyx/lyx-2.1.5-r1.ebuild b/app-office/lyx/lyx-2.1.5-r1.ebuild
index 8eaf004cd5f8..3e4ad4766551 100644
--- a/app-office/lyx/lyx-2.1.5-r1.ebuild
+++ b/app-office/lyx/lyx-2.1.5-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 FONT_S="${S}/lib/fonts"
 FONT_SUFFIX="ttf"
 DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
+HOMEPAGE="https://www.lyx.org/"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
 	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/${MY_P}/${MY_P}.tar.xz"
 
diff --git a/app-office/lyx/lyx-2.2.2-r1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
index e3060f8aa90d..fdc8702116dc 100644
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 FONT_S="${S}/lib/fonts"
 FONT_SUFFIX="ttf"
 DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
+HOMEPAGE="https://www.lyx.org/"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
 
diff --git a/app-office/lyx/lyx-2.2.3.ebuild b/app-office/lyx/lyx-2.2.3.ebuild
index e3060f8aa90d..fdc8702116dc 100644
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ b/app-office/lyx/lyx-2.2.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 FONT_S="${S}/lib/fonts"
 FONT_SUFFIX="ttf"
 DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
+HOMEPAGE="https://www.lyx.org/"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
 
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index fa6711ae1348..34d3c92f09c6 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -2,10 +2,13 @@ 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-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
 DIST TeXmacs-1.99.2-src.tar.gz 18957858 BLAKE2B e109f012158d3382d26c52db2695df3d15fcbf45b85437e4bde0854a52762c6fd3ac630408d3e1e6cd29cb121def3bd6ce217464fc638c99fa120718ab7b7a5e SHA512 e9d2dd0aab2e66470c4ae860e13b6fad2cc07913f14f7bca042c703d4d8b4a62fafafa711b81a0d8f8c125a3641b8bb5f38cd3adac74ec18895671423aa60be9
 DIST TeXmacs-1.99.5-src.tar.gz 25014543 BLAKE2B 22c6f876015e6641959cded32dae93eda7e1c153f82c2fb60c026c9243c6e35d4b29df42c265a947e64a07cb72de6436e066713b200e3ec66bd4f1f274473807 SHA512 a7d846fd8823e486cf724bfcbe04ae877dd64995d6131af59b49427a1178e36b52b9fcd9109783b9ae1e39c988ae9ed497b1540dce29645ebf2c4301ca7357a8
+DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee
 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.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-math_util.patch b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
new file mode 100644
index 000000000000..006c92c2be33
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
@@ -0,0 +1,15 @@
+diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp
+--- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp	2017-12-22 03:27:43.000000000 +0700
++++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp	2017-12-22 16:44:35.052378917 +0700
+@@ -24,11 +24,4 @@
+ inline int    sign (double x) { return x>0?1:x<0?-1:0; } 
+ inline bool   fnull (double x, double approx) { return norm(x) <= approx; }
+-#ifndef __SUNPRO_CC
+-inline double pow (double x, int n) {
+-  double r= 1.0;
+-  while (n > 0) { r *= x; n--; }
+-  return r; }
+-#endif
+-
+ 
+ #endif // defined MATH_UTIL_H
diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild
new file mode 100644
index 000000000000..bd65c285bdbd
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.99.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools xdg-utils gnome2-utils qmake-utils
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="imlib jpeg netpbm pdf svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	<dev-scheme/guile-1.9[deprecated]
+	media-libs/freetype
+	x11-apps/xmodmap
+	x11-libs/libXext
+	virtual/latex-base
+	dev-qt/qtgui:4
+	imlib? ( media-libs/imlib2 )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# respect LDFLAGS, bug #338459
+	"${FILESDIR}"/${PN}-plugins-1.patch
+
+	# dont update mime and desktop databases and icon cache
+	"${FILESDIR}"/${PN}-updates.patch
+
+	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
+
+	# remove new/delete declarations, bug 590002
+	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
+
+	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-optimize="${CXXFLAGS}" \
+		--with-qt="$(qt4_get_bindir)" \
+		$(use_with imlib imlib2) \
+		$(use_enable pdf pdf-renderer)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}