dev-vcs/subversion: Provide correct path to apxs binary

Thanks-to:  Martin Mokrejš <mmokrejs@gmail.com>
Closes: https://bugs.gentoo.org/607832
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild
index ae74dc6cd3875dfa2a89b7cb497bcb9b378fc538..8e5430c0aa33c61f79d8a835e77238ca392489db 100644 (file)
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -187,7 +187,7 @@ src_configure() {
        local myconf=(
                --libdir="${EPREFIX%/}/usr/$(get_libdir)"
                $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${APXS}")
+               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
                $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
                $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
                $(use_enable dso runtime-module-search)

diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild
index 7c3f14bd27c1876a7256c135cd212a7146a1e453..bbde3cbe48f9fa04fb701ec3e2cef7aae84bcd9e 100644 (file)
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild
@@ -187,7 +187,7 @@ src_configure() {
        local myconf=(
                --libdir="${EPREFIX%/}/usr/$(get_libdir)"
                $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${APXS}")
+               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
                $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
                $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
                $(use_enable dso runtime-module-search)

diff --git a/dev-vcs/subversion/subversion-1.12.0.ebuild b/dev-vcs/subversion/subversion-1.12.0.ebuild
index df6ddf73f8a5aae9e62fa9545dd5df04dff25969..d7d1a24e733024b049e80df55a8a842e79d97dc5 100644 (file)
--- a/dev-vcs/subversion/subversion-1.12.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.0.ebuild
@@ -186,7 +186,7 @@ src_configure() {
        local myconf=(
                --libdir="${EPREFIX%/}/usr/$(get_libdir)"
                $(use_with apache2 apache-libexecdir)
-               $(use_with apache2 apxs "${APXS}")
+               $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
                $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
                $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
                $(use_enable dso runtime-module-search)