gentoo resync : 23.03.2018

5 files changed, 2 insertions, 96 deletions

diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 4eb3282ae5ff..37e662608946 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/clustalx/Manifest b/sci-biology/clustalx/Manifest
index f761ea81363f..110d0f5eeb0c 100644
--- a/sci-biology/clustalx/Manifest
+++ b/sci-biology/clustalx/Manifest
@@ -1,7 +1,5 @@
 AUX clustalx-2.1-qt5.patch 8173 BLAKE2B dca2d4f7531ac38510cc9c2aa788244293c436940d38945c906c76b7a29d395179190833517c01cbe48d450111d3f115427fb55536ab55dd01fc0617ff9e7bc2 SHA512 d8c9e9e1aade86f6ba4aa88618ace305152b819cf445119c82b4d4e56c7923e25876c83fd74c8dc91715ce484ff0ea3111b13ed7d8219c1222ad60e09b72d29e
 DIST clustalx-2.1.tar.gz 341649 BLAKE2B 43a740b278127d4745699a75479e422cc95a864bd55a9fe37eb68c0b36ae89e07848e8fdae2207ff9b3850eebc273b803df0261eefd3e7d96d8fa58c75af3adc SHA512 e8cbad783722161de6999ab01a91d555fc10db609197a8d2878f91e9d7dc998784c02d2ccb54c4936ee27b41321db6f4f37021221662f483b8b6d945b6e1c026
 DIST clustalx.png.xz 74808 BLAKE2B 3e0b7ba5d0c4e1013a1ea0146460384279e7116cccde1abdd2e34de16867d83b88c0a04fbc64524e340611fdc5a5df4dbc73f10af610a43fae65c0907b7ac25d SHA512 0907710c944fc1b883c58501cd7bc2abbc5bf171495b58dbe9829d60d7c3530c210f89a5bfafc3cec03808ae50f5c9a78ce37b9175c2e37590494e115e8e343a
-EBUILD clustalx-2.1-r1.ebuild 1093 BLAKE2B 369910c48ad315148d210bf616980a483ca37ec9a27e227876e4057faed667db1ca4bc8dfd760dcce2ccb1d54a3fa7d4fdf3d762bdc7b89908c8bdcbcd2610e6 SHA512 997c71482dff6f73841ba912904b9ea34992ffd9dc90466e233017857a93c11a2f930ff242bfc0b1309bedbf4e6be2556bf26efa9a9f7dfe83d0e96abc06e8a0
-EBUILD clustalx-2.1-r2.ebuild 1225 BLAKE2B 458fb581439821d8eabffc507148a830a74e593f84679757699348d65f1bbe076e5fcba21f0fd2d083256d0de63498378ab87f4a3d74d5f3166fbddd93437954 SHA512 6d0d46521bc2511dca32363e7faf6ff550de74f6e6fcf22f0d3ebd7cbe0f10884dbdb52fcfcba034b4185419d2109663bf1e589d072937b6bbc012fe5ad5c250
-EBUILD clustalx-2.1-r3.ebuild 1335 BLAKE2B 03ef2401f491e0bec656d6454282009295fb15cfba8e87b8ea113a7276497223272ac6be2d4382030ba777355cdc905dad8a7fc375bb08b58b42bc6f912151be SHA512 28fa3b11103b78dba8d15dd1b43e18dcfce575c141f880dcf74230f396fe80a4bf684b4abad3ab74eaceb578625ea0727d7afc50d86f789a1c6f682a9cb46b39
+EBUILD clustalx-2.1-r3.ebuild 1334 BLAKE2B 0b1569dc3212ce64a0441829f9055db197986478a84f690b5211ea2fa3638b066fa2b6e34374fa335c49649bd0c01e1a6df5c5322fda0e734ad26c06b91855fe SHA512 b89c27b5c4169f00029102eefc46c6d0bccf81d25d95201ed87bdf0bf8c9b292bc678e08c129bd24e6bb0b304a49549be861c5a322b8e78626c994472dfcf84e
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/clustalx/clustalx-2.1-r1.ebuild b/sci-biology/clustalx/clustalx-2.1-r1.ebuild
deleted file mode 100644
index 1d3ce97d942d..000000000000
--- a/sci-biology/clustalx/clustalx-2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Graphical interface for the ClustalW multiple alignment program"
-HOMEPAGE="http://www.ebi.ac.uk/tools/clustalw2/"
-SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	>=sci-biology/clustalw-${PV}"
-
-src_prepare() {
-	sed \
-		-e "s|colprot.xml|${EPREFIX}/usr/share/${PN}/colprot.xml|" \
-		-e "s|coldna.xml|${EPREFIX}/usr/share/${PN}/coldna.xml|" \
-		-e "s|colprint.xml|${EPREFIX}/usr/share/${PN}/colprint.xml|" \
-		-i ClustalQtParams.h || \
-		die "Failed to patch shared files location."
-	sed \
-		-e "s|clustalx.hlp|${EPREFIX}/usr/share/${PN}/clustalx.hlp|" \
-		-i HelpDisplayWidget.cpp || \
-		die "Failed to patch help file location."
-	rm -rf usr || die
-}
-
-src_install() {
-	dobin clustalx
-	insinto /usr/share/${PN}
-	doins colprot.xml coldna.xml colprint.xml clustalx.hlp
-	make_desktop_entry ${PN} ClustalX
-}
diff --git a/sci-biology/clustalx/clustalx-2.1-r2.ebuild b/sci-biology/clustalx/clustalx-2.1-r2.ebuild
deleted file mode 100644
index 6e9643755b69..000000000000
--- a/sci-biology/clustalx/clustalx-2.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Graphical interface for the ClustalW multiple alignment program"
-HOMEPAGE="http://www.ebi.ac.uk/tools/clustalw2/"
-SRC_URI="
-	http://www.clustal.org/download/current/${P}.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	>=sci-biology/clustalw-${PV}"
-
-src_prepare() {
-	sed \
-		-e "s|colprot.xml|${EPREFIX}/usr/share/${PN}/colprot.xml|" \
-		-e "s|coldna.xml|${EPREFIX}/usr/share/${PN}/coldna.xml|" \
-		-e "s|colprint.xml|${EPREFIX}/usr/share/${PN}/colprint.xml|" \
-		-i ClustalQtParams.h || \
-		die "Failed to patch shared files location."
-	sed \
-		-e "s|clustalx.hlp|${EPREFIX}/usr/share/${PN}/clustalx.hlp|" \
-		-i HelpDisplayWidget.cpp || \
-		die "Failed to patch help file location."
-	rm -rf usr || die
-	default
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin clustalx
-	insinto /usr/share/${PN}
-	doins colprot.xml coldna.xml colprint.xml clustalx.hlp
-	make_desktop_entry ${PN} ClustalX
-	doicon "${WORKDIR}"/${PN}.png
-}
diff --git a/sci-biology/clustalx/clustalx-2.1-r3.ebuild b/sci-biology/clustalx/clustalx-2.1-r3.ebuild
index 5fe34efb5f8a..4a3199f352c9 100644
--- a/sci-biology/clustalx/clustalx-2.1-r3.ebuild
+++ b/sci-biology/clustalx/clustalx-2.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="