dev-vcs/subversion: [QA] Fix UnnecessarySlashStrip
authorDavid Seifert <soap@gentoo.org>
Sat, 8 Feb 2020 16:51:36 +0000 (17:51 +0100)
committerDavid Seifert <soap@gentoo.org>
Sat, 8 Feb 2020 16:51:36 +0000 (17:51 +0100)
Signed-off-by: David Seifert <soap@gentoo.org>
dev-vcs/subversion/subversion-1.12.2.ebuild
dev-vcs/subversion/subversion-1.13.0.ebuild

index 133e7dedbf40289aae526efcea18173f2bdb4657..3f53e0cbd3915985fb2a245c68b18c79bef19ce1 100644 (file)
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
        local myconf=(
-               --libdir="${EPREFIX%/}/usr/$(get_libdir)"
+               --libdir="${EPREFIX}/usr/$(get_libdir)"
                $(use_with apache2 apache-libexecdir)
                $(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_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)
                $(use_with gnome-keyring)
                $(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
                $(use_enable nls)
                $(use_with sasl)
                $(use_with http serf)
-               --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-               --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+               --with-apr="${EPREFIX}/usr/bin/apr-1-config"
+               --with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
                --disable-experimental-libtool
                --without-jikes
                --disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
        fi
 
        # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+       ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+       ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
        ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
        econf "${myconf[@]}"
 }
index 030f599495719ac8e42f97d57f35bb4e44f2fe84..e1cb5bd947d90c9a915717d1426215c46f0d0f0d 100644 (file)
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
        local myconf=(
-               --libdir="${EPREFIX%/}/usr/$(get_libdir)"
+               --libdir="${EPREFIX}/usr/$(get_libdir)"
                $(use_with apache2 apache-libexecdir)
                $(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_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)
                $(use_with gnome-keyring)
                $(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
                $(use_enable nls)
                $(use_with sasl)
                $(use_with http serf)
-               --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-               --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+               --with-apr="${EPREFIX}/usr/bin/apr-1-config"
+               --with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
                --disable-experimental-libtool
                --without-jikes
                --disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
        fi
 
        # allow overriding Python include directory
-       ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-       ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+       ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+       ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
        ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
        econf "${myconf[@]}"
 }