From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 9 Mar 2018 16:53:27 +0000
Subject: gentoo resync : 09.03.2018

---
 sci-biology/amos/Manifest             |  2 +-
 sci-biology/amos/amos-3.1.0-r3.ebuild | 53 -----------------------------------
 sci-biology/amos/amos-3.1.0-r4.ebuild | 52 ++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 54 deletions(-)
 delete mode 100644 sci-biology/amos/amos-3.1.0-r3.ebuild
 create mode 100644 sci-biology/amos/amos-3.1.0-r4.ebuild

(limited to 'sci-biology/amos')

diff --git a/sci-biology/amos/Manifest b/sci-biology/amos/Manifest
index cf9af10bddd2..0749a737c777 100644
--- a/sci-biology/amos/Manifest
+++ b/sci-biology/amos/Manifest
@@ -4,5 +4,5 @@ AUX amos-3.1.0-goBambus2.py-indent-and-cleanup.patch 1057 BLAKE2B fde1011da76275
 AUX amos-3.1.0-qa-Wformat.patch 4511 BLAKE2B 64064175db625a098a528f0c8036196968c58dae445edd3c98fc5627e3a84d593abc438958573ef7a28193d0d2fc76db30fe16a180a383dec9bae5084305505d SHA512 de0382f9128b46fef8e87d14de75bbc9f0af3e8bcbb915edab26a883186109ab29ddbb31c5cf70fc8d37700abe36fb73a7bdca46c29672052d01ebebffd52abe
 DIST amos-3.1.0-fix-c++14.patch.bz2 8033 BLAKE2B 942248f64906253205392df71010bf41105d2985fc8112e7443975d776cc484a4e2b6cf34284d4c384145bf32601892c06f156a0b0ccf0f2ce721de242e02e9b SHA512 76e26ca48a009cbf637d9462878223633e9b21cbd12d58a19e9a561f2cf4805791becc0b5f7aaf81975ca1e02b263cdd9d5ff310c4594670922ea65885ad9634
 DIST amos-3.1.0.tar.gz 2094268 BLAKE2B b9fb80d4e7b7e9e7769081c2680a3cba26591f00a4d9fdb17ad602e581dea5e8e2add4b0d9d3821a7f8a4ec1a45dfd867037baf35ecd401584f030c86b2b0f83 SHA512 7a416b9a0438b47425355383b709491a58f38c8d834df29e43c942170e710c6ea7e3bc8c509a58421b1340ad6eece9ea2da357ce5cd1d41ce08375676ee30491
-EBUILD amos-3.1.0-r3.ebuild 1189 BLAKE2B d0e36265d14eb3b3c0da7e21edc63bc75e3176d52ec0a117fefa394d234f29954809626bd0517a9210b7fa104dae9c72f962b3cde12386da04890f039a5af8a2 SHA512 b2e0386fc5bd65884f4f9ccbdb74ec0f42c37c157cf52c17195fbf390156f242f9c77780323b40fa33e6f5be52863fb0beddd23048695c3e40a65f2272dce7c7
+EBUILD amos-3.1.0-r4.ebuild 1110 BLAKE2B 4730d6a04ba727fd72ea825c6c57d65079ae9ddb29411f0a26aa94653309364ddec742104783044549adc2a60f06a7452f76e392145aa02db472042dde05e1d5 SHA512 7cb40d45dabc4e6cc188d3edf8347f34578d1f955b2d522273f3b551be6974023145e35a443f0e4495d70746aa40b6c451cedf999c102f1f8f7ffbab09748d61
 MISC metadata.xml 345 BLAKE2B 750928cf3e96c24e2af8e84d5889100c1954eb140596368dc00d479f63898c82e3bb0e07a9e970c6c12eb36ed3ae84c6bcc7913cf3ed56e2d71120185d24a4f0 SHA512 a31ba5660e524b70517f2644bb929d4bc0428d1ea682752ca2ddefd3b5a8a5c8aabf7a9877fa61e8fe12599da65e9f0a6c1e7db90d61729e26c33b76303ff497
diff --git a/sci-biology/amos/amos-3.1.0-r3.ebuild b/sci-biology/amos/amos-3.1.0-r3.ebuild
deleted file mode 100644
index 33c30995b11b..000000000000
--- a/sci-biology/amos/amos-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 qmake-utils
-
-DESCRIPTION="A Modular, Open-Source whole genome assembler"
-HOMEPAGE="http://amos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-3.1.0-fix-c++14.patch.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="qt4? ( dev-qt/qtcore:4 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	dev-perl/DBI
-	dev-perl/Statistics-Descriptive
-	sci-biology/mummer"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-	"${FILESDIR}"/${P}-goBambus2.py-indent-and-cleanup.patch
-	"${WORKDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-qa-Wformat.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# prevent GCC 6 log pollution due
-	# to hash_map deprecation in C++11
-	append-cxxflags -Wno-cpp
-}
-
-src_configure() {
-	econf \
-		--with-qmake-qt4=$(usex qt4 $(qt4_get_bindir)/qmake no)
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/goBambus2
-}
diff --git a/sci-biology/amos/amos-3.1.0-r4.ebuild b/sci-biology/amos/amos-3.1.0-r4.ebuild
new file mode 100644
index 000000000000..0dbcaffd81da
--- /dev/null
+++ b/sci-biology/amos/amos-3.1.0-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A Modular, Open-Source whole genome assembler"
+HOMEPAGE="http://amos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${PN}-3.1.0-fix-c++14.patch.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	dev-perl/DBI
+	dev-perl/Statistics-Descriptive
+	sci-biology/mummer"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+	"${FILESDIR}"/${P}-goBambus2.py-indent-and-cleanup.patch
+	"${WORKDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-qa-Wformat.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# prevent GCC 6 log pollution due
+	# to hash_map deprecation in C++11
+	append-cxxflags -Wno-cpp
+}
+
+src_configure() {
+	econf --with-qmake-qt4=no
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/goBambus2
+}
-- 
cgit v1.2.3