From dfddd92e53aabb73bfb757f9d464277ab08f774e Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 4 Oct 2018 12:30:41 +0200 Subject: [PATCH] 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 Package-Manager: Portage-2.3.50, Repoman-2.3.11 --- .../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 2d13eaf89aa8..e58d47644acf 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 682cf934b09f..434fddd7f1a7 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() { -- 2.26.2