[gentoo-commits] repo/gentoo:master commit in: app-text/libetonyek/

[Andreas Sturmlechner]

commit:     dfddd92e53aabb73bfb757f9d464277ab08f774e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 10:30:41 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 10:31:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfddd92e

app-text/libetonyek: Dumb down dev-util/mdds pseudo slot detection

The previous solution was not that smart after all.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-text/libetonyek/libetonyek-0.1.8-r1.ebuild | 20 ++++++++++++--------
 app-text/libetonyek/libetonyek-9999.ebuild     | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
index 2d13eaf89aa..e58d47644ac 100644
--- a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
@@ -46,15 +46,19 @@ src_prepare() {
 }
 
 src_configure() {
-	# mdds installs versioned pkgconfig files
-	local p=$(best_version dev-util/mdds)
-	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	econf \
-		--disable-werror \
-		--with-mdds=$(ver_cut 1-2 ${pv}) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
 		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {

diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 682cf934b09..434fddd7f1a 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -39,15 +39,19 @@ src_prepare() {
 }
 
 src_configure() {
-	# mdds installs versioned pkgconfig files
-	local p=$(best_version dev-util/mdds)
-	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	econf \
-		--disable-werror \
-		--with-mdds=$(ver_cut 1-2 ${pv}) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
 		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {