9 files changed, 396 insertions, 21 deletions
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 66f764829b1a..02f4ec6878e5 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index ed86c013ed1b..f5379d1d88e1 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,9 +1,12 @@
+AUX 7.10-fix_xlocale.patch 1715 BLAKE2B 3e221d1c496e3438dd8d86506f76fc269b994c876f47c9b5de04abf0c683d240af683d75dfe09e744db82cdd5ebcb94cf9426c37a9202a49db600b320e78acdb SHA512 c24f8a3289950ef04daaa2c2523171c5e53c26c50238f777fe683c2a45b9a6f0f50db3f9f7150a7e50fc7b4a5df97289c6b6d048310e9436ca420d78c1ef020f
+AUX 7.8-fix_xlocale.patch 1944 BLAKE2B 5e54790ccf9208077db9d50ccb8fb536b68700e68a61361664a106d0bae2517105b57d2f65a8314edb129d13703a9617c273a4f6a1ee4172c98eb3697822e560 SHA512 c2d63f8d22cbbf37c5ac6d4c232943a5ddfd151e8854344729bd3b171be74d21fb8af825b26939f221eac929a7faa0d979968c6f1d6189ea6b1fe77dac6c7e74
 AUX boinc.conf 524 BLAKE2B 58ab78fe971d1da159b35b718e4078565d0f07925d55ab02e5dddafe2c674e227dc75f81c5971d5671fd97dc2d42aba42f8da0536c056ed07c993e3d6e543672 SHA512 60091e8ff96a07fd9bf508cb295f97be280a4c64d0dbefb88414c86bb193ead72c25dd085d20105b616be5e94dfd5aaf3f5b35fa6b6ce2adf09e38996f1f67b0
 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
-AUX fix_xlocale.patch 1944 BLAKE2B 5e54790ccf9208077db9d50ccb8fb536b68700e68a61361664a106d0bae2517105b57d2f65a8314edb129d13703a9617c273a4f6a1ee4172c98eb3697822e560 SHA512 c2d63f8d22cbbf37c5ac6d4c232943a5ddfd151e8854344729bd3b171be74d21fb8af825b26939f221eac929a7faa0d979968c6f1d6189ea6b1fe77dac6c7e74
-DIST boinc-7.8.4.tar.gz 52035132 BLAKE2B 4234bd6f3ad3bbb4d7d518e45c16b8843de35f37d2cfd40ff149d85d14cb6d6bed2cbd682ba1d16099c1261eb000f8bb2e4f637b47d12e84e43266b4de076ed0 SHA512 d888f6c1586b57cdad7c4c783b2e58ae3bc3da8d0183eaacfe43f9798519e65129324222e6190a8ee1f00be2dfd31ee54fe2a88ef77950506e29552ce32de8aa
+DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
+DIST boinc-7.9.3.tar.gz 49628586 BLAKE2B a053645f5e5c41610863c19be028963fb2e92fc0015b9df5377e734af968f1a70e4913cdc2052fd4a396dd1a9a782464e3ffc96a4b59a166f25c387de4c30d6d SHA512 d85880ec8e58d53af2cc5c9e357a29fbefe149450f33dea6fed5847b8e8c8bd9c9c5a309180c801c77fbedd740ebef83c1b410e8bc514e35fe210af57552bad5
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.8.4.ebuild 5834 BLAKE2B 125921209e5d28de1b920f3a06f30e35f61902dff702b6b1d6d1b2b8aa2c07d5033ae3c9d505fee201936dc13a93fc52af853700be41fb737a93bce04a348df3 SHA512 d62923948c81194334b2459a041d4ea4a5c42253fdcc580e334b80242243e732375f8a0473fca29ae055408056d21d1e9cb02c23862c24674bd6adff7b051553
+EBUILD boinc-7.8.6.ebuild 5899 BLAKE2B ee3c8221383a367c2cb603dd149212071c9face092786f8384e0df4b4f26856313e05a6f09ea667b4c983c1170ba6beb6dafd2ca92afe4e89b56e6270c01b006 SHA512 9c3af948037412f3acc7ebbb56796f9016534edb1c5cab0b70d2c07a2efeb82ac3ced6d3be789e8152417d76e9260394caf08392c9237cd9fc7fa5a8c526f3be
+EBUILD boinc-7.9.3.ebuild 5853 BLAKE2B c4b5a5ffc46018771a0e4f271d15e37441649b34d17a7ebce5fb96f88fb1d4abaa531c16716e30cf08c58b041b2c9b81c0fba2243ccf788f4f44f575476227ad SHA512 556641e862bcd4a856e4e6049bdee40e8aff827d9331abacd14254dfa454d840305a0437b6527ac258f594a01b0d151568759b182f143c701e83ace0685772ab
 MISC metadata.xml 877 BLAKE2B b616f96359c8be3e93527a02557cd9a604593d95463c47f66fbcf3012a5b63ac90985a0782b8e23e50c494e87a21aa81b12251b6b5974083e1c546cea85b99b0 SHA512 4be12c3b45beaf4a9ad8cc99a3aa893b91c0cf1329a336b53fa4969ee0319ea8320b19c4bb015a39df52a73c77d8493d9f3f0fde17678416b51003abb38e9263
diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.6.ebuild
index b1ddba69aff0..79674f896626 100644
--- a/sci-misc/boinc/boinc-7.8.4.ebuild
+++ b/sci-misc/boinc/boinc-7.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,51 +12,51 @@ 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 )"
+	X? ( https://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"
+IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
 
 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
+COMMON_DEPEND="
 	>=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
 	)
+	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
 	X? (
+		>=x11-libs/libnotify-0.7
 		dev-db/sqlite:3
 		media-libs/freeglut
-		sys-libs/glibc:2.2
 		virtual/jpeg:0=
 		x11-libs/gtk+:3
-		>=x11-libs/libnotify-0.7
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
 	)
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.4
 	app-text/docbook2X
+	sys-devel/gettext
 	X? ( virtual/imagemagick-tools[png,tiff] )
 "
+RDEPEND="${COMMON_DEPEND}
+	!app-admin/quickswitch
+"
 
 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
+	"${FILESDIR}"/${MY_PV}-fix_xlocale.patch
 )
 
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
@@ -128,6 +128,7 @@ src_install() {
 
 	# cleanup cruft
 	rm -rf "${ED%/}"/etc || die "rm failed"
+	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
 	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
 	newinitd ${PN}.init ${PN}
diff --git a/sci-misc/boinc/boinc-7.9.3.ebuild b/sci-misc/boinc/boinc-7.9.3.ebuild
new file mode 100644
index 000000000000..784d06069db1
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.9.3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0-gtk3
+
+inherit autotools eutils gnome2-utils linux-info systemd user wxwidgets
+
+MY_PV="7.10"
+
+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? ( https://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"
+
+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.
+COMMON_DEPEND="
+	>=app-misc/ca-certificates-20080809
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-2.1
+		>=x11-drivers/nvidia-drivers-180.22
+	)
+	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
+	X? (
+		dev-db/sqlite:3
+		media-libs/freeglut
+		virtual/jpeg:0=
+		x11-libs/gtk+:3
+		>=x11-libs/libnotify-0.7
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook2X
+	sys-devel/gettext
+	X? ( virtual/imagemagick-tools[png,tiff] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-admin/quickswitch
+"
+
+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}"/${MY_PV}-fix_xlocale.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"
+	find "${D}" -name '*.la' -delete || die "Removing .la files 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() {
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
+
+	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() {
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/sci-misc/boinc/files/7.10-fix_xlocale.patch b/sci-misc/boinc/files/7.10-fix_xlocale.patch
new file mode 100644
index 000000000000..6d2360138f8b
--- /dev/null
+++ b/sci-misc/boinc/files/7.10-fix_xlocale.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac	2018-03-21 12:08:02.287768932 +0100
++++ b/configure.ac	2018-03-21 12:09:32.918771652 +0100
+@@ -592,7 +592,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])
+--- a/lib/gui_rpc_client.h	2018-03-21 12:07:51.300768602 +0100
++++ b/lib/gui_rpc_client.h	2018-03-21 12:09:11.671771015 +0100
+@@ -810,8 +810,8 @@
+ 
+ #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
+-#if HAVE_XLOCALE_H
+-#include <xlocale.h>
++#if HAVE_LOCALE_H
++#include <locale.h>
+ #endif
+ extern int		freelocale(locale_t) __attribute__((weak_import));
+ extern locale_t	newlocale(int, __const char *, locale_t) __attribute__((weak_import));
+--- a/clientgui/AsyncRPC.cpp	2018-03-21 12:08:17.241769380 +0100
++++ b/clientgui/AsyncRPC.cpp	2018-03-21 12:08:50.664770384 +0100
+@@ -19,8 +19,8 @@
+ #pragma implementation "AsyncRPC.h"
+ #endif
+ 
+-#if HAVE_XLOCALE_H
+-#include <xlocale.h>
++#if HAVE_LOCALE_H
++#include <locale.h>
+ #endif
+ 
+ #include "stdwx.h"
diff --git a/sci-misc/boinc/files/fix_xlocale.patch b/sci-misc/boinc/files/7.8-fix_xlocale.patch
index 8b80258cf6c1..8b80258cf6c1 100644
--- a/sci-misc/boinc/files/fix_xlocale.patch
+++ b/sci-misc/boinc/files/7.8-fix_xlocale.patch
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index 146ba2111725..9a2c89be5fb2 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -1,7 +1,10 @@
 AUX mendeleydesktop-1.17.8-libdir.patch 578 BLAKE2B 70213348bc2235cea44461bbe371b24b5e9db17ae8a6862d143bdb698e5e7b73dfd665fa32eee0bd6a1a47a2efdc081072a9ed979d5d797b9ff652405ed889e6 SHA512 80aa6539af89efacc382929331ebe0c3a682329cb167d45baa8f6eb85391d6112218fc468cd4525d76afbea568599860aa53d1296e6733d266a30522fde1fa16
 AUX mendeleydesktop-1.17.8-qt5plugins.patch 604 BLAKE2B 198f5628b28921018570577bacbe2e7de011e2e48c60b3727b79db966e441d3c270b374db7790b9c6338239071cd6fbc17c0b1f8e59cf68794a85c1daa906664 SHA512 c2f95d8a5cca3b2cc57ded01e9bda21bd4eed990035bff1864a2b751b5cc57821b1ab5fec9b1be52a17be34e4d15a487b19133afc08a05fac50b13975e002daa
 AUX mendeleydesktop-1.17.8-unix-distro-build.patch 599 BLAKE2B 8ae42be0372af430d1308836ed4ffe4b6b09c67b64bfe0f76b292e95bf198e698cf9dcd1b284aebbc117111777781fa8a3f007e500b3d61499c10c2da01fc6f6 SHA512 2de6e5ff400871cfbfda3572566ec83db81fcc12aed9f8dc63c5f8a9b32cc4cf985dcfe02d56548351999c94b2d575585ee779547714aae932cf9fb042ace644
+DIST mendeleydesktop-1.17.13-linux-i486.tar.bz2 131684415 BLAKE2B 57e87fc00dc1978ecd0b46603cb504652c8c68ce2eed554f8a04967a574e12f05f19f1a4159e4a4c0c476f435ac39489cdcd466eb7bf72bf3a07e6cf1f450aac SHA512 b86f33b21661074737fca1262bd731dd07e3a5457b546b6c99b2794459052902c2ba831a7d8071a5b5edc061fc03a0fb79cbf79e6778960f7045729071216d2a
+DIST mendeleydesktop-1.17.13-linux-x86_64.tar.bz2 126266490 BLAKE2B 97ea8af93d7f2b42fa7941acad09514fa59c46af1b5d5974ba177f08183f23340c589f18a06f0bfa91d711bd70c85f48e61b82f4cfc6ccfb8388fd754f86b772 SHA512 ffb5a33fbc3b4b28e34037760b670a088c7c5c3d4624d3767d26562dd53f4fd0dbbdeb366e8d8673dd6c2f68dc43d8f1c0492400b62729ceab33f73954956325
 DIST mendeleydesktop-1.18-linux-i486.tar.bz2 143543267 BLAKE2B e4196bc19673b17599380a5cf789c20a0e689272f0dbaf0f8542a9985d963827e477c4f808c97ac1e60bb89e63002701cdc3e54a045f1db35e514f86b4ef4e85 SHA512 63a82863a824e5ce180a31453e68c900ba4bcebf0c228f515db87fe523a3cef8a284dd8c81729741fe7c9795b918d7a25503024aa63692014ce5e4a87a7cad11
 DIST mendeleydesktop-1.18-linux-x86_64.tar.bz2 147509182 BLAKE2B 86f8b9827320fbd53df6d7dc343cad79410e7d25f1f757dbc0cc8f5613206e6dc6f80e6539dd5ae5309e42cdcf1681cf4a3585114159a20a4ed5dcdfebc60569 SHA512 9e72ca02beae2412fb427cfc22da3495ae0bcdcc23b188e5f09e4e29a942a276635be54bf22bbcf08c63cdee102c257c145cce00a361c4b8b48e0f538a81b108
-EBUILD mendeleydesktop-1.18.ebuild 2848 BLAKE2B 4973d395bd6be18850c88d1bb55722addc8467dbbcad70bb2713f6e559eb476549ee7b3e2f3077a85b5291ee0fbedc5faa1ba83296defdb20fcc0acf549db1dd SHA512 88b03007846138193cffe65e0875bee871442a88ddf35be096f6050ffd1900075eb74bbf8dfdbda95fad0ff15e378d7d5bc1da2bfaded80c5a0ddff943c413b5
+EBUILD mendeleydesktop-1.17.13-r1.ebuild 2907 BLAKE2B add1e568ee77763d247960fd92e24ab7d7e97299244316a1801a4535c62449448c163681b0599578943e148824a2710a37bf7bba10d2ffe93661ed4699640525 SHA512 9d7f7c94ece7719f2cf05099c2b514a7fa306680ba6e9f65868132fc86615b46bc2c3bcfd29a908bc069402587711e2dfdefbe506605b965b181a280a2af36d2
+EBUILD mendeleydesktop-1.18.ebuild 2847 BLAKE2B 5c4846d3e03a421661dbd4f29454b049602d758d6823f365a19711e4594b365a99f794680dd7d8f1dd95544b57f2534643125c8ca6bf1b8e76055fe0604e3899 SHA512 0217fbcda59604330880bda76521880fcfb3456fa7c61e1f3d2444b152cc8fbce170f8e971d1f5f2a3751535e8a34cfdd22baa0ed391f671a5323f42e336964f
 MISC metadata.xml 588 BLAKE2B 48fadd1764f1af117abae2ae373609f4cbcd93f10ca4d7bb0e77f6fa627843e4e7979dabce7f83777d3453df9f4b9796ba96edaed0cd24848321d832e25650e1 SHA512 d92c21ff3c738f7c5a8a3d7db178ceedbbd15fbf613c4b68d94cc0f0a814311d1c15511bae96d88317f365249dbafd55550289ae178361e214f099f59a27629c
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.17.13-r1.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.17.13-r1.ebuild
new file mode 100644
index 000000000000..a09df10b573d
--- /dev/null
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.17.13-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit desktop gnome2-utils python-single-r1 xdg-utils
+
+MY_P_AMD64="${P}-linux-x86_64"
+MY_P_X86="${P}-linux-i486"
+
+DESCRIPTION="Research management tool for desktop and web"
+HOMEPAGE="https://www.mendeley.com/"
+SRC_URI="
+	amd64? ( ${MY_P_AMD64}.tar.bz2 )
+	x86? ( ${MY_P_X86}.tar.bz2 )
+	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
+	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
+
+LICENSE="Mendeley-terms"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="fetch"
+
+DEPEND=""
+RDEPEND="
+	=dev-qt/qtcore-5.9*:5
+	=dev-qt/qtdeclarative-5.9*:5
+	=dev-qt/qtgui-5.9*:5
+	=dev-qt/qtnetwork-5.9*:5
+	=dev-qt/qtpositioning-5.9*:5
+	=dev-qt/qtprintsupport-5.9*:5
+	=dev-qt/qtsvg-5.9*:5
+	=dev-qt/qtwebengine-5.9*:5[widgets]
+	=dev-qt/qtwebkit-5.9*:5
+	=dev-qt/qtxml-5.9*:5
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	${PYTHON_DEPS}"
+
+QA_PREBUILT="/opt/mendeleydesktop/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.8-libdir.patch
+	"${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch
+	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch
+)
+
+pkg_nofetch() {
+	elog "Please download ${A} from:"
+	elog "http://www.mendeley.com/download-mendeley-desktop/"
+	elog "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}" || die
+
+	if use amd64 || use amd64-linux ; then
+		mv -f "${MY_P_AMD64}" "${P}" || die
+	else
+		mv -f "${MY_P_X86}" "${P}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled Qt libraries
+	rm -r lib/mendeleydesktop/plugins \
+		|| die "failed to remove plugin directory"
+	rm -r lib/qt || die
+
+	# fix qt library path
+	sed -e "s:/usr/lib/qt5/plugins:${EROOT}usr/$(get_libdir)/qt5/plugins:g" \
+		-i bin/mendeleydesktop || die
+
+	# fix library paths
+	sed -e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
+		-e "s:MENDELEY_BASE'] + \"/lib/\":MENDELEY_BASE'] + \"/$(get_libdir)/\":g" \
+		-i bin/mendeleydesktop || die
+}
+
+src_install() {
+	# install menu
+	domenu share/applications/${PN}.desktop
+
+	# install application icons
+	insinto /usr/share/icons
+	doins -r share/icons/hicolor
+
+	# install default icon
+	insinto /usr/share/pixmaps
+	doins share/icons/hicolor/48x48/apps/${PN}.png
+
+	# install documentation, but no license file
+	dodoc share/doc/${PN}/Readme.txt
+
+	# install binary
+	python_fix_shebang bin/${PN}
+	into /opt/${PN}
+	dobin bin/*
+
+	# install libraries
+	dolib.so lib/lib*.so*
+
+	# install programs
+	exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec
+	doexe lib/mendeleydesktop/libexec/*
+
+	# install shared files
+	insinto /opt/${PN}/share
+	doins -r share/mendeleydesktop
+
+	# symlink launch script
+	dosym ../mendeleydesktop/bin/mendeleydesktop /opt/bin/mendeleydesktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.18.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.18.ebuild
index efe5f15b3242..7dacc0eabb42 100644
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.18.ebuild
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.18.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit eutils multilib python-single-r1 xdg gnome2-utils
+inherit desktop gnome2-utils python-single-r1 xdg-utils
 
 MY_P_AMD64="${P}-linux-x86_64"
 MY_P_X86="${P}-linux-i486"
@@ -45,9 +45,11 @@ RDEPEND="
 
 QA_PREBUILT="/opt/mendeleydesktop/.*"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.17.8-libdir.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17.8-libdir.patch
 	"${FILESDIR}"/${PN}-1.17.8-qt5plugins.patch
-	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch )
+	"${FILESDIR}"/${PN}-1.17.8-unix-distro-build.patch
+)
 
 pkg_nofetch() {
 	elog "Please download ${A} from:"