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 <[email protected]> Package-Manager: Portage-2.3.50, Repoman-2.3.11
johu · Oct 4, 2018 · dfddd92 · dfddd92
1 parent b0bb5fa
commit dfddd92
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git 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
@@ -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() {