gentoo resync : 28.04.2018

3 files changed, 142 insertions, 4 deletions

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:"