[gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/

[Lars Wendler]

commit:     4c7e508a41e423ad32ca4eb512dc103c378cd37f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 21:54:09 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 21:54:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7e508a

sys-libs/gdbm: Make readline dependency optional (bug #621488).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-libs/gdbm/gdbm-1.13.ebuild | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys-libs/gdbm/gdbm-1.13.ebuild b/sys-libs/gdbm/gdbm-1.13.ebuild
index 4748ea36361..429402ae26e 100644
--- a/sys-libs/gdbm/gdbm-1.13.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13.ebuild
@@ -14,15 +14,13 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb exporter nls static-libs"
+IUSE="+berkdb exporter nls +readline static-libs"
 
 RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       readline? ( sys-libs/readline:0= )
+"
 
-EX_S="${WORKDIR}"/${EX_P}
+EX_S="${WORKDIR}/${EX_P}"
 
 src_prepare() {
        elibtoolize
@@ -39,15 +37,17 @@ multilib_src_configure() {
                popd >/dev/null
        fi
 
-       ECONF_SOURCE=${S} \
-       econf \
-               --includedir="${EPREFIX}"/usr/include/gdbm \
-               --with-gdbm183-libdir="${EX_S}/.libs" \
-               --with-gdbm183-includedir="${EX_S}" \
-               $(use_enable berkdb libgdbm-compat) \
-               $(multilib_native_use_enable exporter gdbm-export) \
-               $(use_enable nls) \
+       local myeconfargs=(
+               --includedir="${EPREFIX}"/usr/include/gdbm
+               --with-gdbm183-libdir="${EX_S}/.libs"
+               --with-gdbm183-includedir="${EX_S}"
+               $(use_enable berkdb libgdbm-compat)
+               $(multilib_native_use_enable exporter gdbm-export)
+               $(use_enable nls)
                $(use_enable static-libs static)
+               $(use_with readline)
+       )
+       ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -59,7 +59,7 @@ multilib_src_install_all() {
        einstalldocs
 
        use static-libs || find "${ED}" -name '*.la' -delete
-       mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
+       mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die
 }
 
 pkg_preinst() {