gentoo resync : 28.12.2017

9 files changed, 60 insertions, 465 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index b69cff9eb5d1..673d8d5eeca3 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index ed47bc95322c..32899acc57a0 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -2,10 +2,8 @@ AUX boinc.conf 524 BLAKE2B 58ab78fe971d1da159b35b718e4078565d0f07925d55ab02e5ddd
 AUX boinc.init.in 6144 BLAKE2B 1391b4b8da0327c471f268712287c58fe6efbc8809e971f31abf269f62066f817a7fa1235afa2c192a0328ed5a3a57629e24ccd14a686ea14fc038aa735621b9 SHA512 be57013b24d4cf7a140890d70e08f8113560a88c000c7f42ea0da0c4d6b5207a25f10fb08cb3f42ec02ea8d0697e2e108e8a4f2276b30554197b214a70f98697
 AUX boinc.service 178 BLAKE2B daec610c2e2cff3e4d37b3cb1964e80b85910dec838268bdf03477f1a8b00b19c6a36853f73640575006a219b95983b00bdc12c0486ef8494af4286053d8c058 SHA512 86a59b9096b19e6472781cb2a7229dd0540569666bcb5bedd83371e6264f1d6bee70e8b47216e1a5b6462726dcd3b54d86ba8de4478faab6c1792071b76abaf9
 AUX fix_webview.patch 413 BLAKE2B cd33a6a72395d2c43b7126d4999d11102548184cd22a2b5b6e5035029b788aa4d7bb178d1360d6d81c472500da95d7f1ba77cb1e1e5f5510789a9ae61ff3d0cb SHA512 71f34c4211b28dfdf6837bee64cbf966abf4129109b23a8d05af1d5c3a9f7a5026aa7d88df9a7a646337ee8cad53f42235b9a5a8e43d3074def4c9319c8fb785
-DIST boinc-7.8.1.tar.gz 52056850 BLAKE2B ddedde30c18e231e4820e8ecf66a9a5042b25527a1ce670ddeae314ee08b9549601aab4e920871ff30933474bdf5a1ff2d2772daa76eb602fce1d98a1f9d425f SHA512 32a30f19dd6b7e6b6050de9952091c2a60e27f4891542f70a449a7d7af347d9b0eecae4501bfb7465f453d1bbe321369f911be74b882384aa5216db3bf569656
+AUX fix_xlocale.patch 1944 BLAKE2B 5e54790ccf9208077db9d50ccb8fb536b68700e68a61361664a106d0bae2517105b57d2f65a8314edb129d13703a9617c273a4f6a1ee4172c98eb3697822e560 SHA512 c2d63f8d22cbbf37c5ac6d4c232943a5ddfd151e8854344729bd3b171be74d21fb8af825b26939f221eac929a7faa0d979968c6f1d6189ea6b1fe77dac6c7e74
 DIST boinc-7.8.4.tar.gz 52035132 BLAKE2B 4234bd6f3ad3bbb4d7d518e45c16b8843de35f37d2cfd40ff149d85d14cb6d6bed2cbd682ba1d16099c1261eb000f8bb2e4f637b47d12e84e43266b4de076ed0 SHA512 d888f6c1586b57cdad7c4c783b2e58ae3bc3da8d0183eaacfe43f9798519e65129324222e6190a8ee1f00be2dfd31ee54fe2a88ef77950506e29552ce32de8aa
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.8.1-r1.ebuild 5649 BLAKE2B efec2dcf3702d48e95fdfef65f87ded18e76c838f3f5303ae50c27f336766ffff0091dc2cdcbb8c9b6cf06c9ff5a00941464a6e973c2fc6a3bfa8f2994f18a8e SHA512 e27c13aa9a2f81f56bdfd31fbba381245796f8bbacee66148dee667af9cffb2aaeabeec0909b1fdcdaf0865b29075fe5f3afa51982901c1f05a397cb698f8152
-EBUILD boinc-7.8.1.ebuild 5545 BLAKE2B 58d66333a1d05759b66e67ab4fa55a010fbebfdd71e325f5b53ac0a87c611e9288ce34b68256c10168d9be600a89d352d6429a832ac382846d1df91705b78f6a SHA512 43a17a1ec145b9547c102506280ee116d110162290df1bbe8359122a86602d37502e3f0cf94836b7d98124b5e51f643aac4d269d47ed9f728d8e7f258e343e0a
-EBUILD boinc-7.8.4.ebuild 5631 BLAKE2B 14b477c30ee1bc124df20f4d776a38ae43129db87b9b9fb741c8ed947004c2180590bbb3e6c4201161b9a182b3bfb6518a5b7fd96a25f23c2c7f3f8465c2245f SHA512 c49b826788e47aa5c9cb87ebee02b2f6c7958b60e1e67bfa1d406a13b5577eee7f447c50d4edb454dd3c7b71d69ef3115c2f1ab2b1cfe2e4214150d2fe77d4f6
+EBUILD boinc-7.8.4.ebuild 5834 BLAKE2B 125921209e5d28de1b920f3a06f30e35f61902dff702b6b1d6d1b2b8aa2c07d5033ae3c9d505fee201936dc13a93fc52af853700be41fb737a93bce04a348df3 SHA512 d62923948c81194334b2459a041d4ea4a5c42253fdcc580e334b80242243e732375f8a0473fca29ae055408056d21d1e9cb02c23862c24674bd6adff7b051553
 MISC metadata.xml 956 BLAKE2B bfd864c4b6681a43e43ab33946f7db1edb6feedf830d77f18a96214dedc2867609849478e7076ddc906a1390d48ffd790de085a0274663260012e305428ed999 SHA512 383b00c559f1144fe8288406d085f4894e11a0067260d5ba6c38ca498db73e83b59d0ba9073b57abe5cc88ea6c8e82685f692d92523ac9beef359a5d0926803f
diff --git a/sci-misc/boinc/boinc-7.8.1-r1.ebuild b/sci-misc/boinc/boinc-7.8.1-r1.ebuild
deleted file mode 100644
index 885e7ebb207c..000000000000
--- a/sci-misc/boinc/boinc-7.8.1-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit autotools eutils gnome2-utils linux-info systemd user versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz
-	X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl static-libs"
-
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
-
-# libcurl must not be using an ssl backend boinc does not support.
-# If the libcurl ssl backend changes, boinc should be recompiled.
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-	X? ( virtual/imagemagick-tools[png,tiff] )
-"
-
-PATCHES=(
-	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
-)
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-pkg_setup() {
-	# Bug 578750
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might be missing vsyscall support."
-		elif kernel_is -ge 4 4 \
-			&& linux_chkconfig_present LEGACY_VSYSCALL_NONE; then
-			ewarn "You do not have vsyscall emulation enabled."
-			ewarn "This will prevent some boinc projects from running."
-			ewarn "Please enable vsyscall emulation:"
-			ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
-			ewarn "in /usr/src/linux/.config, to be found at"
-			ewarn "    Processor type and features --->"
-			ewarn "        vsyscall table for legacy applications (None) --->"
-			ewarn "            (X) Emulate"
-			ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
-			ewarn "However, this has security implications and is not recommended."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	econf --disable-server \
-		--enable-client \
-		--enable-dynamic-client-linkage \
-		--disable-static \
-		--enable-unicode \
-		--with-ssl \
-		$(use_with X x) \
-		$(use_enable X manager) \
-		$(usex X --with-wx-config="${WX_CONFIG}" --without-wxdir)
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/${PN}
-
-	if use X; then
-		# Create new icons. bug 593362
-		local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256)
-		for s in "${SIZES[@]}"; do
-			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die
-			newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png
-		done
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-
-		# Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910
-		mv "${ED%/}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
-			die "Failed to rename desktop file"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED%/}"/etc || die "rm failed"
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
-	newinitd ${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		groups+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog
-	elog "You are using the source compiled version of boinc."
-	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
-	elog
-	elog "You need to attach to a project to do anything useful with boinc."
-	elog "You can do this by running /etc/init.d/boinc attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/boinc/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/boinc"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-		elog
-	fi
-	# Add information about BOINC supporting OpenCL
-	elog "BOINC supports OpenCL. To use it you have to eselect"
-	if use cuda; then
-		elog "nvidia as the OpenCL implementation, as you are using CUDA."
-	else
-		elog "the correct OpenCL implementation for your graphic card."
-	fi
-	elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-misc/boinc/boinc-7.8.1.ebuild b/sci-misc/boinc/boinc-7.8.1.ebuild
deleted file mode 100644
index 59a13dfeba92..000000000000
--- a/sci-misc/boinc/boinc-7.8.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit autotools eutils linux-info systemd user versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz
-	X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl static-libs"
-
-REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl ) "
-
-# libcurl must not be using an ssl backend boinc does not support.
-# If the libcurl ssl backend changes, boinc should be recompiled.
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-	X? ( virtual/imagemagick-tools[png,tiff] )
-"
-
-PATCHES=(
-	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/fix_webview.patch
-)
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-pkg_setup() {
-	# Bug 578750
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might be missing vsyscall support."
-		elif kernel_is -ge 4 4 \
-		    && linux_chkconfig_present LEGACY_VSYSCALL_NONE; then
-			ewarn "You do not have vsyscall emulation enabled."
-			ewarn "This will prevent some boinc projects from running."
-			ewarn "Please enable vsyscall emulation:"
-			ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
-			ewarn "in /usr/src/linux/.config, to be found at"
-			ewarn "    Processor type and features --->"
-			ewarn "        vsyscall table for legacy applications (None) --->"
-			ewarn "            (X) Emulate"
-			ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
-			ewarn "However, this has security implications and is not recommended."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	econf --disable-server \
-		--enable-client \
-		--enable-dynamic-client-linkage \
-		--disable-static \
-		--enable-unicode \
-		--with-ssl \
-		$(use_with X x) \
-		$(use_enable X manager) \
-		$(usex X --with-wx-config="${WX_CONFIG}" --without-wxdir)
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/${PN}
-
-	if use X; then
-		# Create new icons. bug 593362
-		local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256)
-		for s in "${SIZES[@]}"; do
-			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die
-			newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png
-		done
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-
-		# Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910
-		mv "${ED%/}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
-			die "Failed to rename desktop file"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED%/}"/etc || die "rm failed"
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
-	newinitd ${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		groups+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	elog
-	elog "You are using the source compiled version of boinc."
-	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
-	elog
-	elog "You need to attach to a project to do anything useful with boinc."
-	elog "You can do this by running /etc/init.d/boinc attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/boinc/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/boinc"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-		elog
-	fi
-	# Add information about BOINC supporting OpenCL
-	elog "BOINC supports OpenCL. To use it you have to eselect"
-	if use cuda; then
-		elog "nvidia as the OpenCL implementation, as you are using CUDA."
-	else
-		elog "the correct OpenCL implementation for your graphic card."
-	fi
-	elog
-}
diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.4.ebuild
index b4628e19804e..b1ddba69aff0 100644
--- a/sci-misc/boinc/boinc-7.8.4.ebuild
+++ b/sci-misc/boinc/boinc-7.8.4.ebuild
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
 	"${FILESDIR}"/fix_webview.patch
+	# xlocale.h was removed in modern glibc, bug 639108
+	"${FILESDIR}"/fix_xlocale.patch
 )
 
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
@@ -134,6 +136,8 @@ src_install() {
 }
 
 pkg_preinst() {
+	gnome2_icon_savelist
+
 	enewgroup ${PN}
 	# note this works only for first install so we have to
 	# elog user about the need of being in video group
@@ -145,7 +149,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 
 	elog
 	elog "You are using the source compiled version of boinc."
@@ -183,5 +189,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 }
diff --git a/sci-misc/boinc/files/fix_xlocale.patch b/sci-misc/boinc/files/fix_xlocale.patch
new file mode 100644
index 000000000000..8b80258cf6c1
--- /dev/null
+++ b/sci-misc/boinc/files/fix_xlocale.patch
@@ -0,0 +1,42 @@
+--- a/configure.ac	2017-12-18 17:45:19.829854890 +0100
++++ b/configure.ac	2017-12-18 17:46:13.845853923 +0100
+@@ -602,7 +602,7 @@
+    echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
+    echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
+ 
+-   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h])
++   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h])
+ 
+    AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
+    AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
+@@ -986,9 +986,6 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
+-#ifdef HAVE_XLOCALE_H
+-#include <xlocale.h>
+-#endif
+ ]])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+--- a/lib/gui_rpc_client.h	2017-12-18 17:47:22.826852688 +0100
++++ b/lib/gui_rpc_client.h	2017-12-18 17:48:42.384851263 +0100
+@@ -807,7 +807,6 @@
+ 
+ #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
+ // uselocale() is not available in OS 10.3.9 so use weak linking
+-#include <xlocale.h>
+ extern int		freelocale(locale_t) __attribute__((weak_import));
+ extern locale_t	newlocale(int, __const char *, locale_t) __attribute__((weak_import));
+ extern locale_t	uselocale(locale_t) __attribute__((weak_import));
+--- a/clientgui/AsyncRPC.cpp	2017-12-18 17:47:30.727852546 +0100
++++ b/clientgui/AsyncRPC.cpp	2017-12-18 17:48:56.785851005 +0100
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
+-#include <xlocale.h>
++#include <locale.h>
+ #endif
+ 
+ #include "stdwx.h"
diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest
index 5f0fba24101a..c60cdd95e872 100644
--- a/sci-misc/cdfplayer/Manifest
+++ b/sci-misc/cdfplayer/Manifest
@@ -1,5 +1,3 @@
-DIST CDFPlayer_10.4.0_LINUX.sh 1315941152 SHA256 4c202541762839c766d6f484377e3413de9dd7c70f47484da615572c8e44f4ed SHA512 13205dad6d3a57937b55f41d895e6eef5c7ebf1f416622226cbe97a7de4a39c8d1b5c7424194c2aa4bca9020b52f52ef311af118d810c6065a1275e58d9580a1 WHIRLPOOL 36236338c6ec922a6294da34e5379ba5ecf087b307a484abd79c516804d1db6f859b33a1535a9dce6f1980a51972ec1ceff3b39a6270b9d9797beedabc03a0f3
-DIST CDFPlayer_11.0.1_LINUX.sh 1630401312 SHA256 0f5f89d252481ea7fb49bd6c6c9b0a38956d4f0c32c361d02a543a8582c472e8 SHA512 bf52caa6a495ce78670ab6931e8caa3167121d5193e6839bb745026883f32c536d460faa960a59e593486fbf1a90d1ca51cb8e8a52eedff20e48eb1cb1a80701 WHIRLPOOL 9946110dffe973043dc4d89fd015ebcadfbd6e747b3993059cc811ce7e8f09df37db80daf9a3701cbd09de2331c3e534a20064876eabc256561aeca9fe4357a3
-EBUILD cdfplayer-10.4.0.ebuild 2135 BLAKE2B c29db50273a9b3131f31462447931330e88b04bed6311c00eb602ce3a868077553439e47371e84f177e12584ee5452ef46b020b356225c5ceffe13e19750572e SHA512 e2e80d28a4904057b4d80514d9b157edd62b8c7538a30dcb6311ad385ec5d6eb23c530d831bad3a665d08eab9dd187f1f8639c666a65e04bfb0bd1f2349f0c1e
-EBUILD cdfplayer-11.0.1.ebuild 2135 BLAKE2B deafe6bc761c794ae90647ac27142dda47b3cbcd2281952183d86fd5b12606c7bf67a15ac4a6d7c212378d169538760b53d6c6cfbcc355334324f245f68fb256 SHA512 8a33853c1680c9948473ace3fdbb4a296bb6c12b8939669ef735aedd0384c7d140f0413f84bab5d2a4c4fb82710f68d9128be554df5a7bd7843c52f2a67ab77b
+DIST CDFPlayer_11.2.0_LINUX.sh 1821479711 BLAKE2B 7d12a94b43fdd60dc6af3d78fe45f85a2aa68752c690de023d4cd0cc5d24f8b091db7846d3732d7618d7df659b982fbcf19543d7d0c0116ddcae7f7b1aa11d88 SHA512 8a9a98ed5dceb18db41e52269dedf2a00ee89015a76eb650b852f8e1c19040918ecfa7594737f2982118c7358eab4d1e85694eecbe059edc963d4bdc8533b470
+EBUILD cdfplayer-11.2.0.ebuild 2103 BLAKE2B 2f832880dfd4d5cb4d7692830cd6e34d77658e4a41b12403a875c69cf781492533049380746e8a43e8f43a7619732ec32394f79bb51b9e34e4c1efbe986d2b57 SHA512 95ecf50e8435fdce56e90e8670fc810c56d6fb13251fb4e82a86d6ed07c982136b4c7752fda5c425458c7dc90110c8bfdb7c9864bf36fdb6fe0f6fd22390c47b
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild b/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild
deleted file mode 100644
index c8687b11278f..000000000000
--- a/sci-misc/cdfplayer/cdfplayer-10.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="CDFPlayer_10.4.0_LINUX.sh"
-HOMEPAGE="http://www.wolfram.com/cdf-player/"
-
-LICENSE="WolframCDFPlayer"
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RESTRICT="strip mirror bindist fetch"
-
-DEPEND=""
-
-# this list comes from lsof output
-# probably there are still some libraries missing
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	media-libs/alsa-lib
-	dev-libs/expat
-	media-libs/fontconfig
-	dev-libs/icu
-	x11-libs/libxcb
-	dev-libs/libxml2
-	|| ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
-"
-
-# we need this a few times
-MPV=$(get_version_component_range 1-2)
-
-# we might as well list all files in all QA variables...
-QA_PREBUILT="opt/*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	/bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/CDFPlayer/${MPV}" "-execdir=${S}/opt/bin" || die
-}
-
-src_install() {
-	# move all over
-	mv "${S}/opt" "${D}/opt" || die
-
-	# the autogenerated symlinks point into sandbox, redo
-	rm "${D}/opt/bin/"* || die
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
-
-	# fix some embedded paths and install desktop files
-	insinto /usr/share/applications
-	for filename in $(find "${D}" -name "wolfram-cdf10.desktop") ; do
-		echo Fixing "${filename}"
-		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
-		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-		doins "${filename}"
-	done
-}
-
-pkg_nofetch() {
-	einfo "Sadly Wolfram provides no permanent link to the player files."
-	einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from"
-	einfo "${HOMEPAGE} and place it in ${DISTDIR}"
-}
diff --git a/sci-misc/cdfplayer/cdfplayer-11.0.1.ebuild b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
index 561ed97e3815..c449fbfa4514 100644
--- a/sci-misc/cdfplayer/cdfplayer-11.0.1.ebuild
+++ b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit versionator
 
 DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="CDFPlayer_11.0.1_LINUX.sh"
+SRC_URI="CDFPlayer_11.2.0_LINUX.sh"
 HOMEPAGE="http://www.wolfram.com/cdf-player/"
 
 LICENSE="WolframCDFPlayer"
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-libs/icu
 	x11-libs/libxcb
 	dev-libs/libxml2
-	|| ( sys-libs/ncurses:5/5 sys-libs/ncurses:0/5 )
+	sys-libs/ncurses:5/5
 "
 
 # we need this a few times
@@ -61,8 +61,8 @@ src_install() {
 
 	# the autogenerated symlinks point into sandbox, redo
 	rm "${D}/opt/bin/"* || die
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
-	dosym /opt/Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
+	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer
+	dosym ../Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer
 
 	# fix some embedded paths and install desktop files
 	insinto /usr/share/applications