gentoo resync : 31.03.2018

9 files changed, 232 insertions, 4 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f09db3d4651f..3b94be85741d 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 47b5ec4272ea..f5d0b32eb385 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,8 @@
 AUX 2.1-python.patch 1019 BLAKE2B 1ca2692b77850998f49e93f43dc371d05e33438f867c352bdbf085a86a280e11fa5d00d738661875ede0041907683ced98407ce75676d638f35ae0a92cfd0f54 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8
+AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d
+AUX lyx-2.3.0-qt-5.11.patch 481 BLAKE2B 86883721e9d59d0b05d465419e93038c64ee5b473e32cd182487661383ad4921e92d89fe24610046b9434c87b361e66927db385fb9faf0bc2c7e5a85fb84f416 SHA512 aac667b6b28c2053eabbd66516e59970ccfec26504185e8ebc481427c159255ef3e2434bd57aa45a9960fabf7e36549f44302c3fa146f26009e0582ee0cfa8f4
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
+DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
 EBUILD lyx-2.2.3-r4.ebuild 4369 BLAKE2B 139a8f7198de12dde8b5ac21e185b4ee3ff239e4f7a0bbfbc615585166a15fa7adc346028d2b8ec41c97401a1c359bfed0f72a69a947b21364e780ae52c3e2bd SHA512 5a7e911ff23ff6a3839cc873d6c15fdbb921c6675c8e3ed0e5cd609fcf2316dda1beb0f63dbad4bc898b4c5b6842cbbd269fe84e2ebb07dbcab0407b38b78143
+EBUILD lyx-2.3.0.ebuild 4194 BLAKE2B 7d1b35b5cb50ea39c1485ea5d6fa0ce719fc75457732796529ba7d9009ffb935342a7e5318df30664fe64637f964428e7d8be7c72816331c1dcbad6d5f8e079b SHA512 a4e66146535e66a67ba4b6a21905314d3c2b13837af9329b6c734fddc459954869b57f0103630ec49be49e2bc2173539301d745a34df5340e04ba1822e96a51d
 MISC metadata.xml 1760 BLAKE2B 8a223f94b48a92104942b9ae94c2746da8628c260fc597a836ae3b468bbe277b6383af960883fcd731f2ad288cc34d2ed6a58c118e1bfbdd3c2b766e99514328 SHA512 416c99a6d19a9e736a546c4f939cc5238de5027f1151d49d1bed800a5b2a026868d4197198e86c250b77be568f45f94ace125d83700316a5b001e21ed48b91b4
diff --git a/app-office/lyx/files/lyx-2.3.0-python.patch b/app-office/lyx/files/lyx-2.3.0-python.patch
new file mode 100644
index 000000000000..e41c2604bf5c
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-python.patch
@@ -0,0 +1,30 @@
+diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
+index 97c4f68..8f05e62 100644
+--- a/src/graphics/GraphicsConverter.cpp
++++ b/src/graphics/GraphicsConverter.cpp
+@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
+ 	LYXERR(Debug::GRAPHICS, "build_script ... ");
+ 	typedef Graph::EdgePath EdgePath;
+ 
+-	script << "#!/usr/bin/env python\n"
++	script << "#!/usr/bin/env python2\n"
+ 		  "# -*- coding: utf-8 -*-\n"
+ 		  "import os, shutil, sys\n\n"
+ 		  "def unlinkNoThrow(file):\n"
+diff --git a/src/support/os.cpp b/src/support/os.cpp
+index 8eea49370a..d7a0f81aa3 100644
+--- a/src/support/os.cpp
++++ b/src/support/os.cpp
+@@ -65,10 +65,10 @@ int timeout_min()
+ string const python(bool reset)
+ {
+ 	// Check whether the first python in PATH is the right one.
+-	static string command = python23("python -tt");
++	static string command = python23("python2 -tt");
+ 	// FIXME THREAD
+ 	if (reset) {
+-		command = python23("python -tt");
++		command = python23("python2 -tt");
+ 	}
+ 
+ 	if (command.empty()) {
diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
new file mode 100644
index 000000000000..6f1848142bb3
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
@@ -0,0 +1,16 @@
+--- a/src/frontends/qt4/GuiDocument.cpp	2018-02-25 01:11:18.000000000 +0100
++++ b/src/frontends/qt4/GuiDocument.cpp	2018-03-30 19:45:47.283928297 +0200
+@@ -68,11 +68,12 @@
+ #include "frontends/alert.h"
+ 
+ #include <QAbstractItemModel>
+-#include <QHeaderView>
++#include <QButtonGroup>
+ #include <QColor>
+ #include <QColorDialog>
+ #include <QCloseEvent>
+ #include <QFontDatabase>
++#include <QHeaderView>
+ #include <QScrollBar>
+ #include <QTextBoundaryFinder>
+ #include <QTextCursor>
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
new file mode 100644
index 000000000000..ad0929130f0c
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_P="${P/_}"
+inherit desktop gnome2-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-texlive/texlive-fontsextra
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	docbook? ( app-text/sgmltools-lite )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-tex/chktex
+		dev-tex/dvipost
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-pictures
+		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
+		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	subversion? ( dev-vcs/subversion )
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qtconcurrent:5
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS=${T}/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash
+	fi
+}
diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index df6a10d194c5..66b6093ff965 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1,5 +1,5 @@
 AUX pinpoint-0.1.8-CVE-2013-7447.patch 1197 BLAKE2B 3a9593e8175ade71784f1f656971b854ea7ccaa69ea28d90f34ed73b4049179871bf1dc731f0a29d0d8c129a1a108d18270a2cc65ba75e89accb616ceef8fa87 SHA512 1ad48cd84f1dc4c14e7e9886263bb595573e3941b9725dc777bee15bbe2404fb5b582a2850a0a6068627af608d0fe960a1775b388c3f175906ad9fd884708756
 DIST pinpoint-0.1.8.tar.xz 772980 BLAKE2B 1ca653b1cece97b47accd3a9cfe2560030f70a35703bd12b52cb692a15181b9bac2d40265bb6eaa486dc1919044f7b74874cb8b7fc8f4f37b78d938c89cb28ca SHA512 dc41405f79bf03b6a7c77ec31304e505d4ae2d13407304fbcc2f338dfe175f91db3c554ea06ba8041edbf99a12551f16efed98b5a07f29b7f24255cad2b1b94d
-EBUILD pinpoint-0.1.8-r1.ebuild 1196 BLAKE2B 2197a1fc639802f43ed6461e7e7401b47146bf024cc6a15e18bd61412c6bc28a33ae7f99d70402daee0a08fcfcb7b906f45f20428c3d3e5341b029b0cee5fdde SHA512 aabe46ea2ff9303ef86039ef44b49e5bd79046fac3142a52bc68b2d2fbda6422f3393621d78e3f58ec7198c9574025f2ddf5b0d55829fc84ecbafb8bbae362a3
+EBUILD pinpoint-0.1.8-r1.ebuild 1194 BLAKE2B 69910e8197750b647780faa4e87912805006911f3b1c1f00b6af9631840d7362a9ea9d44741d84237d92ee7ded143088ef5fb62e995f4cf0e8f5c06e4eab088f SHA512 0a793115dc2df8613acc8163700f5b81dff7e49ef4a550124aebb1534fe612f7b4f16734c70db9bf66f253ee283ddeb2693e6f4ae2870391106f6f430c1b4e9d
 EBUILD pinpoint-0.1.8.ebuild 1074 BLAKE2B 25d7f97330e783ef83ff7af954e2218c1c05deee79ed60d05a90fb74f71f9182d1bae2683a28d5d56969f3a94d509feb7d623df6ef211a40cb6ec3e1be23f459 SHA512 0e282f771c36b73fefcca603242d8d9b760a95aee086a6f658ceee6100ea6e64e45bbe3122060fa90eaf523665a22e0f1a8fe9d4173bd794989ff5562a418e7d
 MISC metadata.xml 507 BLAKE2B e171dd659b7a4c19874ae97040e6241f761a7cdf49228c121ba44b82cba3175f3a444ec69933ece62b70be5d970ba95f5bee0480e4b012564f29921fa5c58f7b SHA512 be6bb803225f307fc7d2a9febd4ece776ce2e99f902d952b80c5bb8068793a9f32ab09c6a79a4c950299a83829fd32fab366600637892fbac02a908f038add74
diff --git a/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild b/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
index 7bf59666c4c6..0102de0eb567 100644
--- a/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
+++ b/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gstreamer +pdf"
 
 # rsvg is used for svg-in-pdf -- clubbing it under pdf for now
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 3cc1845256ec..617e5fadc12c 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -11,6 +11,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 1684 BLAKE2B 16de10fae7384d3ccf642a62c7e3ed1df2e5acc09658bbbe2e3ff6f4f2bf283edb8470f16d9264892b56207457b8fa815d65abdee021dbca8a16674606141609 SHA512 532c5654a3009f70d491b1f830ca7901863c76d967d311989bae18abe1493ecc1ace3d0c9068f12e21d90a22686b0a60cd3230fccaf885dde06f8fdde111c756
+EBUILD texmacs-1.99.6-r2.ebuild 1683 BLAKE2B 8ab489e4869723eb9d4c260c2b070bd950c6558374e33ef67ce41bdee6d75b9941efa33a36f0e3d80a0ff885ab05fe3ed496e79131c2e2b925b5014a87b4a603 SHA512 7bcb6423e42eed285a0e5e75eb4c38f68a06ec9c9725f856364684f3992386f2920a3cc929ae6660c22a2e99b64202819f4e2af65ad8c90342f8e9c49478ef1a
 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/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
index a5c61a4633ff..e2d3ac76e183 100644
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/ghostscript-gpl