gentoo resync : 15.09.2018

3 files changed, 2 insertions, 67 deletions

diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 9e5c79bef8e3..d8d1291acc4f 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,5 +1,3 @@
-DIST cb2bib-1.9.7.tar.gz 845121 BLAKE2B eafce83874e82c20a45de5dc4c1558aa40346821f26bf2d9f53332f337e5cdaffb92c70972fd8b99823f72615608ea848808c9875e16ed50f02cf1d9655d552e SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4
 DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
-EBUILD cb2bib-1.9.7.ebuild 1790 BLAKE2B db2460c6938e26d0d349b6bf4ec5e3c8cf70484a9f88cd6774b1586ab1b16a847cae12dcc1aa0befaef92b45261136247b4b0eaa28c1502110f16958c49bd320 SHA512 32a00cff24547b539671f355083d5b8956d49a1ad416ad904c94f2c72b4ad2c1376298e6aaf1515a995f771cb9b6a2989c06a80ed408c24982b94dbc72109d7b
-EBUILD cb2bib-1.9.8.ebuild 1780 BLAKE2B 3d8ed83b34ac231bb158646f6ef3d45200e784f9702fc328ed5fd77c4f870f099856264f1d22fec812ae1dc27efad82a14002ca623dbd88fa1383f9502aff9f5 SHA512 7001951bf5a033a735d7b5a60c45d5c775bbcfb974fffac8a543ec95a2edaeaf1cd54a2053bd262515db81f65bf9334e906a06430a1715a63d81d3bc850c22b3
+EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.7.ebuild b/app-text/cb2bib/cb2bib-1.9.7.ebuild
deleted file mode 100644
index ee41902c48f2..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="http://www.molspaces.com/cb2bib/"
-SRC_URI="http://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 )
-	webkit? ( dev-qt/qtwebkit:5 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-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() {
-	einfo
-	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"
-	einfo
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
index 295b6e26046f..e91077411de8 100644
--- a/app-text/cb2bib/cb2bib-1.9.8.ebuild
+++ b/app-text/cb2bib/cb2bib-1.9.8.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 )"