summaryrefslogtreecommitdiff
path: root/dev-vcs/subversion
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-23 10:22:15 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-23 10:22:15 +0100
commit8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree230f3135ceaace633cf93e9838b185c4a6664c2e /dev-vcs/subversion
parent9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
gentoo resync : 23.09.2020
Diffstat (limited to 'dev-vcs/subversion')
-rw-r--r--dev-vcs/subversion/Manifest6
-rw-r--r--dev-vcs/subversion/metadata.xml1
-rw-r--r--dev-vcs/subversion/subversion-1.13.0-r2.ebuild (renamed from dev-vcs/subversion/subversion-1.13.0-r1.ebuild)108
-rw-r--r--dev-vcs/subversion/subversion-1.14.0-r1.ebuild (renamed from dev-vcs/subversion/subversion-1.14.0.ebuild)108
4 files changed, 15 insertions, 208 deletions
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 99ddebb7d9ff..288ff8cdc899 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,6 +5,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60
DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
-EBUILD subversion-1.13.0-r1.ebuild 15766 BLAKE2B 10c9688414713da03840f7ccee255156f50a1faad64c0513fbc39820bf21d42e1ff6c87cb8bd40270595cf795c0de0d41d3cdabd95b5eb40711826eb2dc2ec7a SHA512 e467b90ff4e7636cafcce5f60387c1a1446937b7fc6abf464bcfa2252c41e7117d9f0717f29c6d89c60c2185e9050c642667827fcb6a8805e13cda0bab02ea24
-EBUILD subversion-1.14.0.ebuild 15293 BLAKE2B 7d6d2377b26f6a17894f07335b1ef56f97f46595c4bfe1d4291ccfdd511d60428c8ba2a66c2b56a8da23e362bb34394756c63064df2087a5208a72caa5118095 SHA512 ae1781c78c6d17117f2c93af19f7308ae34d4e862e5f27d49c9aa3667a63d0ebc32f6ee3a0cf9ac05210555300e964b1b895335b835b682a99de678f5f733e68
-MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff
+EBUILD subversion-1.13.0-r2.ebuild 13081 BLAKE2B 99250f98b677b87f9f1b194c2673fd8c0f4c837c3201aa03c522753c71f875bb907c7532f1da7281209361ddfb633e2c1b3c3fb567fc48a9bbb7063818964229 SHA512 23e99c3f743d061cc2ed01b6632e52fa04d7bff3fdd6760dce797fa3acde36ee973dd50fd809fa62ad22460f39c0152c7646c0da3e03ace8764679a2400c01ed
+EBUILD subversion-1.14.0-r1.ebuild 12626 BLAKE2B 07756d526cd4a0747f9a4a9a41708b521f5415622c6e1d45a04a6715ac3a7d5eaa87c4b26d4f77ee2a80c44f8eacd9ef5fdeb9c2a90f931d0205b3d2bda71eb0 SHA512 d75fa62eafd61865f3fd659a6e4bdb7b40ec083e53aa7f36b5dd5a0b2b354d8a08a7a43d11a165afcf77650f1ad0641230c5185f3e22e77f508672c997f933eb
+MISC metadata.xml 693 BLAKE2B f9384d6683c910b74391176650014192d0893aaea9f45da26940212ea9d2f0121c30d85dc6a6400715655bca11f580a1255616f6c1663d93cfcf592fb50992e2 SHA512 14d47f3a97ff2d83ae573070022dfbf0622ef09abda125d9a4db95a2b48762ffbde47da09ba32df1a49e9a0dc207f1b66d5440d847392b6e62c8732abc407670
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index b2b200e9148b..90882d9cd881 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -10,7 +10,6 @@
<name>Mikle Kolyada</name>
</maintainer>
<use>
- <flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
<flag name="dso">Enable runtime module search</flag>
<flag name="extras">Install extra scripts (examples, tools, hooks)</flag>
<flag name="http">Enable http support using <pkg>net-libs/serf</pkg></flag>
diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
index a0276cada505..4d9e70f3d1a9 100644
--- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
@@ -22,7 +22,7 @@ LICENSE="Subversion GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+IUSE="apache2 berkdb debug doc +dso extras gnome-keyring +http java kwallet nls perl ruby sasl test vim-syntax"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -36,7 +36,6 @@ COMMON_DEPEND="
sys-apps/file
sys-libs/zlib
berkdb? ( >=sys-libs/db-4.0.14:= )
- ctypes-python? ( ${PYTHON_DEPS} )
gnome-keyring? (
dev-libs/glib:2
app-crypt/libsecret
@@ -53,7 +52,6 @@ COMMON_DEPEND="
sys-apps/dbus
)
perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )
sasl? ( dev-libs/cyrus-sasl )"
RDEPEND="${COMMON_DEPEND}
@@ -64,7 +62,6 @@ RDEPEND="${COMMON_DEPEND}
# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
DEPEND="${COMMON_DEPEND}
!!<sys-apps/sandbox-1.6
- ctypes-python? ( dev-python/ctypesgen )
doc? ( app-doc/doxygen )
gnome-keyring? ( virtual/pkgconfig )
http? ( virtual/pkgconfig )
@@ -75,17 +72,11 @@ DEPEND="${COMMON_DEPEND}
)
nls? ( sys-devel/gettext )
perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
ruby? ( dev-lang/swig )
test? ( ${PYTHON_DEPS} )"
REQUIRED_USE="
- ctypes-python? ( ${PYTHON_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- !dso
- )"
+ test? ( !dso )"
want_apache
@@ -176,12 +167,6 @@ src_prepare() {
sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-i build-outputs.mk || die "sed failed"
- if use python ; then
- # XXX: make python_copy_sources accept path
- S=${S}/subversion/bindings/swig/python python_copy_sources
- rm -r "${S}"/subversion/bindings/swig/python || die
- fi
-
xdg_environment_reset
}
@@ -191,7 +176,7 @@ src_configure() {
$(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")
+ --without-ctypesgen
$(use_enable dso runtime-module-search)
$(use_with gnome-keyring)
$(use_enable java javahl)
@@ -209,7 +194,7 @@ src_configure() {
--enable-svnxx
)
- if use python || use perl || use ruby; then
+ if use perl || use ruby; then
myconf+=( --with-swig )
else
myconf+=( --without-swig )
@@ -253,56 +238,22 @@ src_configure() {
#myconf+=( --disable-disallowing-of-undefined-references )
# for build-time scripts
- if use ctypes-python || use python || use test; then
+ if use test; then
python_setup
fi
- if use python && [[ ${CHOST} == *-darwin* ]] ; then
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_compile="$(tc-getCC)"
- fi
-
# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
# https://bugs.gentoo.org/721300
append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
- # 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_python_includes='-I$(PYTHON_INCLUDEDIR)' \
econf "${myconf[@]}"
}
src_compile() {
emake local-all
- if use ctypes-python ; then
- # pre-generate .py files
- use ctypes-python && emake ctypes-python
-
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_compile() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- python_export PYTHON_INCLUDEDIR
- emake swig-py \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn"
- }
-
- # this will give us proper BUILD_DIR for symlinking
- BUILD_DIR=python \
- python_foreach_impl swig_py_compile
- fi
-
if use perl ; then
emake swig-pl
fi
@@ -331,26 +282,6 @@ src_compile() {
src_test() {
if has_version ~${CATEGORY}/${P} ; then
default
-
- if use ctypes-python ; then
- python_test() {
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
- || die "ctypes-python tests fail with ${EPYTHON}"
- }
-
- distutils-r1_src_test
- fi
-
- if use python ; then
- swig_py_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
- popd >/dev/null || die
- }
-
- BUILD_DIR=subversion/bindings/swig/python \
- python_foreach_impl swig_py_test
- fi
else
ewarn "The test suite shows errors when there is an older version of"
ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
@@ -362,29 +293,6 @@ src_test() {
src_install() {
emake -j1 DESTDIR="${D}" local-install
- if use ctypes-python ; then
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_install() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- emake \
- DESTDIR="${D}" \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn" \
- install-swig-py
- }
-
- BUILD_DIR=python \
- python_foreach_impl swig_py_install
- fi
-
if use perl ; then
emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
perl_delete_localpod
@@ -453,10 +361,6 @@ src_install() {
rm -fr tools/client-side/svnmucc
rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
rm -fr tools/{buildbot,dev,diff,po}
-
- insinto /usr/share/${PN}
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
- doins -r tools
fi
if use doc ; then
diff --git a/dev-vcs/subversion/subversion-1.14.0.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
index 7e77db66d8d0..aa394f63def1 100644
--- a/dev-vcs/subversion/subversion-1.14.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool perl-module ruby-single toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
@@ -21,8 +21,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb ctypes-python debug doc extras gnome-keyring java kwallet nls perl python ruby sasl test"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -37,7 +37,6 @@ COMMON_DEPEND="
sys-apps/file
sys-libs/zlib
berkdb? ( >=sys-libs/db-4.0.14:= )
- ctypes-python? ( ${PYTHON_DEPS} )
gnome-keyring? (
dev-libs/glib:2
app-crypt/libsecret
@@ -53,7 +52,6 @@ COMMON_DEPEND="
sys-apps/dbus
)
perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )
sasl? ( dev-libs/cyrus-sasl )
"
@@ -75,7 +73,6 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
!!<sys-apps/sandbox-1.6
- ctypes-python? ( dev-python/ctypesgen )
doc? ( app-doc/doxygen )
gnome-keyring? ( virtual/pkgconfig )
java? ( >=virtual/jdk-1.8 )
@@ -85,17 +82,10 @@ DEPEND="${COMMON_DEPEND}
)
nls? ( sys-devel/gettext )
perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
ruby? ( dev-lang/swig )
test? ( ${PYTHON_DEPS} )
"
-REQUIRED_USE="
- ctypes-python? ( ${PYTHON_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-
want_apache
pkg_setup() {
@@ -178,12 +168,6 @@ src_prepare() {
sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-i build-outputs.mk || die "sed failed"
- if use python ; then
- # XXX: make python_copy_sources accept path
- S=${S}/subversion/bindings/swig/python python_copy_sources
- rm -r "${S}"/subversion/bindings/swig/python || die
- fi
-
xdg_environment_reset
}
@@ -193,7 +177,7 @@ src_configure() {
$(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")
+ --without-ctypesgen
--disable-runtime-module-search
$(use_with gnome-keyring)
$(use_enable java javahl)
@@ -211,7 +195,7 @@ src_configure() {
--enable-svnxx
)
- if use python || use perl || use ruby; then
+ if use perl || use ruby; then
myconf+=( --with-swig )
else
myconf+=( --without-swig )
@@ -255,16 +239,10 @@ src_configure() {
#myconf+=( --disable-disallowing-of-undefined-references )
# for build-time scripts
- if use ctypes-python || use python || use test; then
+ if use test; then
python_setup
fi
- if use python && [[ ${CHOST} == *-darwin* ]] ; then
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_compile="$(tc-getCC)"
- fi
-
# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
# https://bugs.gentoo.org/721300
append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
@@ -272,39 +250,12 @@ src_configure() {
# 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_python_includes='-I$(PYTHON_INCLUDEDIR)' \
econf "${myconf[@]}"
}
src_compile() {
emake local-all
- if use ctypes-python ; then
- # pre-generate .py files
- use ctypes-python && emake ctypes-python
-
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_compile() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- python_export PYTHON_INCLUDEDIR
- emake swig-py \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn"
- }
-
- # this will give us proper BUILD_DIR for symlinking
- BUILD_DIR=python \
- python_foreach_impl swig_py_compile
- fi
-
if use perl ; then
emake swig-pl
fi
@@ -333,26 +284,6 @@ src_compile() {
src_test() {
if has_version ~${CATEGORY}/${P} ; then
default
-
- if use ctypes-python ; then
- python_test() {
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
- || die "ctypes-python tests fail with ${EPYTHON}"
- }
-
- distutils-r1_src_test
- fi
-
- if use python ; then
- swig_py_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
- popd >/dev/null || die
- }
-
- BUILD_DIR=subversion/bindings/swig/python \
- python_foreach_impl swig_py_test
- fi
else
ewarn "The test suite shows errors when there is an older version of"
ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
@@ -364,29 +295,6 @@ src_test() {
src_install() {
emake -j1 DESTDIR="${D}" local-install
- if use ctypes-python ; then
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_install() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- emake \
- DESTDIR="${D}" \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn" \
- install-swig-py
- }
-
- BUILD_DIR=python \
- python_foreach_impl swig_py_install
- fi
-
if use perl ; then
emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
perl_delete_localpod
@@ -455,10 +363,6 @@ src_install() {
rm -fr tools/client-side/svnmucc
rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
rm -fr tools/{buildbot,dev,diff,po}
-
- insinto /usr/share/${PN}
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
- doins -r tools
fi
if use doc ; then