gentoo Easter resync : 12.04.2020

7 files changed, 130 insertions, 85 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 08a48aca3178..fa4a52caaf03 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index afed5bd5fe20..751e72ced8ec 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -3,5 +3,8 @@ AUX mendeleydesktop-1.17.8-qt5plugins.patch 604 BLAKE2B 198f5628b28921018570577b
 AUX mendeleydesktop-1.17.8-unix-distro-build.patch 599 BLAKE2B 8ae42be0372af430d1308836ed4ffe4b6b09c67b64bfe0f76b292e95bf198e698cf9dcd1b284aebbc117111777781fa8a3f007e500b3d61499c10c2da01fc6f6 SHA512 2de6e5ff400871cfbfda3572566ec83db81fcc12aed9f8dc63c5f8a9b32cc4cf985dcfe02d56548351999c94b2d575585ee779547714aae932cf9fb042ace644
 DIST mendeleydesktop-1.19.4-linux-i486.tar.bz2 155476937 BLAKE2B 4f2ae744b46940d55e3d3620d72bd35530f906a117edf89a5e020bd98ae79ac2541ea605855f6fcf79ac9b0ca7340cb298bac65c01c42c4014f994c0da47eec9 SHA512 d70e2e7d29bee69b943f800e971a1e02b3c09c80e25113fc91ed2df158100d77fc46932074bcbd19bd0871676f9e0afa0e0fd20dfa860b3ddce72c89597dbdfd
 DIST mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 159335193 BLAKE2B 583238552309c935ffb36ff2904ae64cf6feae4607b0c1f479fd5744bbdd301181702e51b02220a70cadeaa9f4ae1fc4b63d91b75870fd641cee8b5473becc6f SHA512 b3e6cf2ab2a1584121d57f9400ac363a006828c4077d66781c04ba75af18830ca803074c6517675b8d1f979087b1778ba25435ed549eaa4e38b5684d5ed07f6e
+DIST mendeleydesktop-1.19.5-linux-i486.tar.bz2 155700577 BLAKE2B 4eeab5ab0d8f5292a2a1241553b925e692bb66122ec289906cafc7a61993985c21f57fd60170b5b0858b0d8f6f3f0d74e66fc0b397b2c8fe0b2d7e108e311927 SHA512 3618ded22cd6b7c7c5bf2a07cf2ea717a2371a7748e09d25f4ddc0445fa79aeb58acf5e5a1b9382f33402552c27365403e48f59fb0f3d092e8987e5f075bbf02
+DIST mendeleydesktop-1.19.5-linux-x86_64.tar.bz2 159458350 BLAKE2B a84556855f82c2e011cae0d4d44cf949a2cc3e133f2f94f7264328b69dc714f6a4eaf8cd62b8b78a049b3eaa73ae924c865b3e692f0562ffceac3dbb4fbc78d2 SHA512 286cd25739ad2c9ec66aba7f15f085ed4f9c66194b970d57f82c93333f83141e6e1df2577aa7dc83255a4b04b2901268d7e3041aadc606530eed740d27a9cc30
 EBUILD mendeleydesktop-1.19.4.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
+EBUILD mendeleydesktop-1.19.5.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
 MISC metadata.xml 386 BLAKE2B f7b77dcf87b678d7daeb1399a8e3523adbbafcdfa3f775bfa349171b6ac8d4af6dde360a2b6c3281f34a6729d1c146b215c2730f6fb895f60a99b7b75ffddf79 SHA512 34a3638dec2839d2c4fab397b571496793d2a87d8d13229e9b57965dc994ce648cc42a561437e3d0fd09c1c9aa1c9a29987709b3dee3365bec59ae0a435f9463
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild
new file mode 100644
index 000000000000..5daa682e978a
--- /dev/null
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit desktop python-single-r1 xdg
+
+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="bindist fetch"
+
+DEPEND=""
+BDEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+"
+
+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 your DISTDIR directory."
+}
+
+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() {
+	xdg_src_prepare
+
+	# 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*
+
+	# remove qtconf and qt-5.10 workaround
+	rm lib/mendeleydesktop/libexec/qt.conf
+	rm "lib/mendeleydesktop/libexec/QtWebEngineProcess --type=zygote --lang=en-US"
+
+	# 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
+}
diff --git a/sci-misc/pythoncad/Manifest b/sci-misc/pythoncad/Manifest
deleted file mode 100644
index 41aab53b9d44..000000000000
--- a/sci-misc/pythoncad/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pythoncad-1.37-png.patch 1535 BLAKE2B b4113a6ac0524284c4d00b9fd3a7462fceb23026fb54c077a55df759fa7df8ed4cd9ae2d69e3286910be81d20e6168ddf0c840d7c629f9be880adb67eebe2e5a SHA512 642932e86ea12454c6e1d00820d21200cbde5653ebb6145c73790c7685bb8885022067bc3c9e12f3dc3b2f036c80896775acf8ba3e490b1df35b666e2ec1959e
-DIST PythonCAD-DS1-R37.tar.gz 504053 BLAKE2B 09e8ce415eb9af57a53d516e0bf8046e04a78861f1cb97d8bca7d27c87938dda6c27f5b5e8a3bd5aafcda91caf5ab203f933df3717d781b4b7994376544b6647 SHA512 dfc0dd3272f447202c0cf12e60c39d877390ccf6696529f6bcce9a4442db4f09b735d718bc5611d6c33fbedf2190c496fb7a737001eb73a38fbce1ae80eadc81
-EBUILD pythoncad-1.37-r1.ebuild 1029 BLAKE2B 28d45bf71b920d5ea6c95db16967a04b63a17edbac105abff191a7fba07e628cbc99eacd7d13142be146797add5199f6760f1eea82443a46fabdcae55a2a8528 SHA512 d93b193239c09bdb05982df873fabc0d0a657be5f3d477e716cd5ecfc5e427a71e1481fc129c128690e787dfe7ec371bf7e8cfa806f99aacb94bfcfdd8070e23
-MISC metadata.xml 331 BLAKE2B 7799e1decb3b94d019d74aba17fcc70708ca9973817354f3342910a6accf2db93ea8f82ba8f9877e78529ee282bc0264026bb4ff3dc7f0d2c8eaccc25b5f111a SHA512 31803480a3e8c99757e97e9b55885edbe54f1a2f448529d852f0e432b8cc264b62bd615a725ca48fa013513030b0d72c5a0ba9628f67537b5f1c9d17db7e9df6
diff --git a/sci-misc/pythoncad/files/pythoncad-1.37-png.patch b/sci-misc/pythoncad/files/pythoncad-1.37-png.patch
deleted file mode 100644
index 7d36625e21a8..000000000000
--- a/sci-misc/pythoncad/files/pythoncad-1.37-png.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru PythonCAD-DS1-R37~/PythonCAD/Interface/Gtk/gtkDialog.py PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py
---- PythonCAD-DS1-R37~/PythonCAD/Interface/Gtk/gtkDialog.py	2010-03-11 00:01:58.000000000 +0100
-+++ PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkDialog.py	2010-03-11 00:03:48.000000000 +0100
-@@ -107,7 +107,7 @@
-     _abautDialog.set_program_name("PythonCad")
-     _abautDialog.set_version("DS1-R37")
-     _abautDialog.set_comments("CAD built from Python")
--    _iconPath=os.path.join(os.getcwd(),"gtkpycad.png")
-+    _iconPath=os.path.join("/usr/share/pixmaps/pythoncad.png")
-     _pixBuf=gtk.gdk.pixbuf_new_from_file(_iconPath)
-     _abautDialog.set_logo(_pixBuf)
-     _abautDialog.set_website("http://sourceforge.net/projects/pythoncad")
-diff -ru PythonCAD-DS1-R37~/PythonCAD/Interface/Gtk/gtkimage.py PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py
---- PythonCAD-DS1-R37~/PythonCAD/Interface/Gtk/gtkimage.py	2010-03-11 00:01:58.000000000 +0100
-+++ PythonCAD-DS1-R37/PythonCAD/Interface/Gtk/gtkimage.py	2010-03-11 00:02:59.000000000 +0100
-@@ -154,7 +154,7 @@
-         self.__image = image
-         self.__window = gtk.Window()
-         self.__window.set_title(image.filename)
--        self.__window.set_icon_from_file("gtkpycad.png")
-+        self.__window.set_icon_from_file("/usr/share/pixmaps/pythoncad.png")
-         self.__window.connect("destroy", self.__destroyEvent)
-         self.__window.connect("event", self.__windowEvent)
-         self.__window.connect("key_press_event", self.__keyPressEvent)
diff --git a/sci-misc/pythoncad/metadata.xml b/sci-misc/pythoncad/metadata.xml
deleted file mode 100644
index ab9c765c0261..000000000000
--- a/sci-misc/pythoncad/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>a scriptable, open-source, easy to use CAD</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pythoncad</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-misc/pythoncad/pythoncad-1.37-r1.ebuild b/sci-misc/pythoncad/pythoncad-1.37-r1.ebuild
deleted file mode 100644
index d7d06a472e13..000000000000
--- a/sci-misc/pythoncad/pythoncad-1.37-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 versionator
-
-MY_PN="PythonCAD"
-MY_PV="DS$(get_major_version)-R$(get_after_major_version)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="CAD program written in PyGTK"
-HOMEPAGE="https://sourceforge.net/projects/pythoncad"
-SRC_URI="mirror://sourceforge/pythoncad/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-png.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e "s/gtkpycad.png/pythoncad.png/" \
-		-e "s/gtkpycad.py/pythoncad/" \
-		"${PN}.desktop" || die "sed failed"
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript gtkpycad.py pythoncad
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /etc/"${PN}"
-	doins prefs.py
-	domenu "${PN}".desktop
-	newicon gtkpycad.png "${PN}".png
-}