commit: ee3465dfd92734e4924e41e9132866b6a4f16f54
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 09:13:43 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 09:19:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3465df
dev-vcs/subversion: Bump to version 1.9.2
Added new logic to find and use best installed ruby version.
Added the same logic to latest unstable 1.8 version as well.
Package-Manager: portage-2.2.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-vcs/subversion/Manifest | 1 +
dev-vcs/subversion/subversion-1.8.14-r1.ebuild | 23 ++++++++++++-----
...on-1.8.14-r1.ebuild => subversion-1.9.2.ebuild} | 30 ++++++++++++----------
3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 8f0c00e..36092d6 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -2,3 +2,4 @@ DIST subversion-1.7.21.tar.bz2 5996788 SHA256
efeb349c5ba6d529ff8e9730a2abd9cb70
DIST subversion-1.8.14.tar.bz2 6850562 SHA256
7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512
95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987
WHIRLPOOL
0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56
DIST subversion-1.9.0.tar.bz2 7743404 SHA256
fcb11db07e132cac6c72a969e222a592f849ef34dd8bd1c2f99fa1ad267a3fe6 SHA512
3f1100802cd11f268a5247f5eebd9be9a8a15488fab3e396c4e0364abbaadd611bbcccc0a5d4c6ca3eee3911e70f2cec0ff660259bb225be47f1909fd6367b3e
WHIRLPOOL
dc2875ee6fa911babdac86455b67af618056d72a709170666e21e826bb3a465a60f9e5b5df02170107208cbded4aecd49cb7e805d3713c671dabfb884f7abbb7
DIST subversion-1.9.1.tar.bz2 7747098 SHA256
91548f9fce38bdb2958848f54fd8007e357c22db09b7ef4763fc85cbcbc2c913 SHA512
57b8f913aefb06bbeac065ae6bb8113853018bdaefdb80c74a337479b9f3cf89834e8656591dbe8ab66b2cadf5f99f1036ff826a886ed6a9f643d6e5adb6a972
WHIRLPOOL
58bd1e41a7643befe6e9800ce0a270379b980746b14eda2c2230f96ea9e07b17ab115959e5b61f324f51055697c898526ac3b4be9b883147b1156f7c20b1f010
+DIST subversion-1.9.2.tar.bz2 7910994 SHA256
023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb SHA512
debe1be153a7abd89d1c0c8d665725a9003e280a7fcde666c21818627bef0c47c30b27560aaa5a9a75251ba0d9c1490613cc79237704f4777a3cad0def52f08a
WHIRLPOOL
3a5ff8067079d7e81f9414e3858afb98839cbdcb989b086d1696b4f0eac46ae2ed7c9933d3fa232431ad32578bf2fab986052a05dac7c528415bb5057fa5d213
diff --git a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
b/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
index 655a7eb..0569414 100644
--- a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
@@ -4,11 +4,12 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby21 ruby20 ruby19"
DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1
elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1
elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module
ruby-single
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
@@ -34,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4
>=kde-base/kdelibs-4:4 )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
- ruby? ( >=dev-lang/ruby-2.1:2.1
- dev-ruby/rubygems[ruby_targets_ruby21] )
+ ruby? ( ${RUBY_DEPS} )
sasl? ( dev-libs/cyrus-sasl )
http? ( >=net-libs/serf-1.2.1 )"
RDEPEND="${COMMON_DEPEND}
@@ -113,6 +113,18 @@ pkg_setup() {
# Allow for custom repository locations.
SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+ if use ruby ; then
+ local rbslot
+ RB_VER=""
+ for rbslot in 2.2 2.1 2.0 1.9 ; do
+ if has_version dev-lang/ruby:${rbslot} ; then
+ RB_VER="${rbslot/.}"
+ break
+ fi
+ done
+ [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+ fi
}
src_prepare() {
@@ -206,10 +218,9 @@ src_configure() {
export ac_cv_python_compile="$(tc-getCC)"
fi
- # force ruby-2.1
# allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "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 --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use_with apache2 apache-libexecdir) \
diff --git a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
b/dev-vcs/subversion/subversion-1.9.2.ebuild
similarity index 95%
copy from dev-vcs/subversion/subversion-1.8.14-r1.ebuild
copy to dev-vcs/subversion/subversion-1.9.2.ebuild
index 655a7eb..91c431a 100644
--- a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.2.ebuild
@@ -4,11 +4,12 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby21 ruby20 ruby19"
DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1
elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1
elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module
ruby-single
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
@@ -34,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4
>=kde-base/kdelibs-4:4 )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
- ruby? ( >=dev-lang/ruby-2.1:2.1
- dev-ruby/rubygems[ruby_targets_ruby21] )
+ ruby? ( ${RUBY_DEPS} )
sasl? ( dev-libs/cyrus-sasl )
http? ( >=net-libs/serf-1.2.1 )"
RDEPEND="${COMMON_DEPEND}
@@ -113,6 +113,18 @@ pkg_setup() {
# Allow for custom repository locations.
SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+ if use ruby ; then
+ local rbslot
+ RB_VER=""
+ for rbslot in 2.2 2.1 2.0 1.9 ; do
+ if has_version dev-lang/ruby:${rbslot} ; then
+ RB_VER="${rbslot/.}"
+ break
+ fi
+ done
+ [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+ fi
}
src_prepare() {
@@ -140,13 +152,6 @@ src_prepare() {
-i build-outputs.mk || die "sed failed"
if use python ; then
- if [[ ${CHOST} == *-darwin* ]] ; then
- #
http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%[email protected]%3E
- # in short, we don't have gnome-keyring stuff here,
patch
- # borrowed from MacPorts
- epatch
"${FILESDIR}"/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
- fi
-
# XXX: make python_copy_sources accept path
S=${S}/subversion/bindings/swig/python python_copy_sources
rm -r "${S}"/subversion/bindings/swig/python || die
@@ -206,10 +211,9 @@ src_configure() {
export ac_cv_python_compile="$(tc-getCC)"
fi
- # force ruby-2.1
# allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "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 --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use_with apache2 apache-libexecdir) \
