gentoo resync : 25.08.2020

4 files changed, 7 insertions, 128 deletions

diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 1df4bb9a658d..194cd04d5f3e 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,7 +1,3 @@
-DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
-DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476776ab91d4b73dc9799b3d945e46283fe565fee32b08df7a8734c027cbeacf0e7a44c4e15efaa6c992c69f9b7a SHA512 66e81ea8d86cdf374c9e1109d26e02c0b3101608e751ab6bbded76cca42eb8c2c1d43f6a993b9003b6013d815683f644bff7513ce63dc750ffa8d608cccb49b3
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
-EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
-EBUILD cb2bib-1.9.9.ebuild 1777 BLAKE2B 3f71e35f3a27fe137e17bfdb0d605fb20b397f1f3144ceb0ce6d14038ef119675cfbd8ae0e3aa54085da54548b21edaf4e8198ab09e2f6ea5354822bda3205b0 SHA512 8092905d8d12e49ae68e204d78289c8a2c6ddf007349e61883183982821248f6a0a04ea946b69e1565c12df3928b06e260a73a85f87b4d781721113fdc4b2767
-EBUILD cb2bib-2.0.0.ebuild 1882 BLAKE2B ac145533edc970e58f57da2ddad3269b3af26d780fb4c30ff5d5993fc02e87c720717143a9d7524c8e92eba6b2ec11b27fc463973a49a2d322681df545bc19e0 SHA512 f1200c6efd5b2a03e1d3b181e6b52d0258607bf71a0c09916d31fca8404fdde475f8a989738bff811d3cd72dd53e416b281b40dc7b6c23e3dc841546bcabbae8
+EBUILD cb2bib-2.0.0.ebuild 1926 BLAKE2B 6f2436e81d7c08c9fb84bd76da3495c46d32a5054c0263b60980e631226865fe27e776d75e0cbd02d932d1fc661898e7fd6b246332dea1c47a50e21f520839bd SHA512 5f150c5e1b1c9018b4b42342e10e198ffdfdfe667309cfe6960675d4572f8f392601560bab5dc83db5423753e94adfe2f99fb848292364ab6a0c370a1af5276e
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
deleted file mode 100644
index e91077411de8..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	lzo? ( dev-libs/lzo:2 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
-	default
-
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		$(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler[utils] - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.9.ebuild b/app-text/cb2bib/cb2bib-1.9.9.ebuild
deleted file mode 100644
index 1a3068c56e88..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	lzo? ( dev-libs/lzo:2 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
-	default
-
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		$(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler[utils] - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild
index 70c2922ef25f..3eb3286f5902 100644
--- a/app-text/cb2bib/cb2bib-2.0.0.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lzo webengine +webkit"
 
 REQUIRED_USE="?? ( webkit webengine )"
@@ -43,6 +43,11 @@ src_configure() {
 		$(use !lzo && echo -config disable_lzo)
 }
 
+src_compile() {
+	# bug #709940
+	emake -j1
+}
+
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs