sci-libs/libsc: remove USE=static-libs

Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 36 insertions, 38 deletions

diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
index e84c20273cf0..667c713b0096 100644
--- a/sci-libs/libsc/libsc-2.3.1.ebuild
+++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
@@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -22,35 +21,32 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
 	romio? ( mpi )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
 	"${FILESDIR}"/${PN}-2.3-add_soname.patch
 )
 
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -65,11 +61,11 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable mpi)
 		$(use_enable openmp openmp)
 		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
 		$(use_enable threads pthread)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
@@ -98,4 +94,7 @@ src_install() {
 	rmdir "${ED}"/etc/ || die "rmdir failed"
 	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
 	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index b99e72325210..00143eccd873 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -22,34 +21,31 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
 	romio? ( mpi )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch
 )
 
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -64,11 +60,11 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable mpi)
 		$(use_enable openmp openmp)
 		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
 		$(use_enable threads pthread)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
@@ -97,4 +93,7 @@ src_install() {
 	rmdir "${ED}"/etc/ || die "rmdir failed"
 	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
 	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }