summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2015-05-12 07:54:24 +0000
committerLars Wendler <polynomial-c@gentoo.org>2015-05-12 07:54:24 +0000
commit60798b96fe52bde3b4a8d72d5073ab4868c47cdf (patch)
tree1ade94049598f1e404c3ec627c4a053867bec2cd /dev-vcs
parentDrop old (diff)
downloadhistorical-60798b96fe52bde3b4a8d72d5073ab4868c47cdf.tar.gz
historical-60798b96fe52bde3b4a8d72d5073ab4868c47cdf.tar.bz2
historical-60798b96fe52bde3b4a8d72d5073ab4868c47cdf.zip
Fixed configure run with USE="-ruby"
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/subversion/ChangeLog5
-rw-r--r--dev-vcs/subversion/Manifest22
-rw-r--r--dev-vcs/subversion/subversion-1.8.13.ebuild5
3 files changed, 22 insertions, 10 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index b0aa64700f6f..9dfc7556995b 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/subversion
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.226 2015/04/23 11:51:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.227 2015/05/12 07:54:21 polynomial-c Exp $
+
+ 12 May 2015; Lars Wendler <polynomial-c@gentoo.org> subversion-1.8.13.ebuild:
+ Fixed configure run with USE="-ruby".
*subversion-1.7.20 (23 Apr 2015)
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index ad90a6411d3f..45cfceccbef4 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -21,16 +21,24 @@ DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afb
EBUILD subversion-1.7.19.ebuild 14608 SHA256 d0ff73e3a72c5ac0435d05c59198ec4193b6c61eefa33aedf9ffd8dd157eaa34 SHA512 9af32ad2975fc376a98ba252ab72e1564afb0bccfd66e4b303e2eea159fe76435f701762dfc12fae37e2c4971bb180ee4e017745f200eec4060c293c36d0a3bd WHIRLPOOL c547498bc76e492b96ba4ede96b017c1991201e564715bb082c7e33dc6d73a2cd9a7ce4d30d64b4b2655a5beae906d59dbaa31f03a96d1c3f02654da87208a14
EBUILD subversion-1.7.20.ebuild 14614 SHA256 833a4d95d68213b1d89f070b72608b675e641058840cab7a3351775169728bb5 SHA512 0cfaea56c3777470b9f9109297db1c136a49a48235d11d8dfa8eff5e7ec0f38bbe3ba44b9fff7d5f87700090312ec1b42bb3e7751b4c7ffc4c96ee665afcef6a WHIRLPOOL c079d59d594ba74ecf2a978ea56370e224552fee11f526193495aebdaea78e32d29bfb5bcdf948be12f1e2036d33277187af2a0d7206c2906a907490033d65e6
EBUILD subversion-1.8.11.ebuild 15388 SHA256 ea82b12437232594b6416b3448299ac99f87aafb2e1d606f0ce30e51e85c3ccb SHA512 4fe168bb6899dcb6502d8d272573fca27302c6215bddc8007e751b3332d0c6998cca43e3b34ebc224eca0e3b4b8e1cea72ce5a0e3edfa777b259fd90793f0a1f WHIRLPOOL 8c2d4d80b347c78640c49430fefca635f49c72c47819a7de8fff5d7f3703919a504ac9ac19f61b8f2d496c724fc542e7daf1dd2c445b316f800d1ab34e5bb73f
-EBUILD subversion-1.8.13.ebuild 15417 SHA256 78b675327d360aebe3f326cbf96e36db51a975eefe5c8c3a6adb42779aab881c SHA512 e1cdcf04d05ca27c0996e1efefef559f82e7971398109b6ada3892697cd7e79c9227610f0b3aad474e1bf5334eb8b58864583f006c579ce7eb71a5c23d283da5 WHIRLPOOL 6762aeef1570bee0f224c03a7e62707947fcbb1b2f64f0e31a7dace1befa3d8c8ffafc19f6234f349992c89b9dc1100961f3d8d69c176c35a7eb52d392f9798f
-MISC ChangeLog 1440 SHA256 476767e44f4ebc38b142d43234eee9da5a3b5880a315fdd8bd28cc5d30de426d SHA512 8cc9bd8b9f3251453d75809a11aceb26783b32103260e441d0e088af7de6ccfc201b9dd7619de29d861965dfe2bf06799e179853743c584bfba42ab8796cf07b WHIRLPOOL e5e1f9922bff0b72b29edfed20fd7f38023c4b19ec2717dea6e1a0a984a52bb070c5ace07805872e9edc78829be3075e952c8d6aee06d170a05a77df0c6a8d86
+EBUILD subversion-1.8.13.ebuild 15460 SHA256 814697a6e44b4ebb87805005d04285d53a0365d86180e893e358b5549458a0c1 SHA512 1059052f67c64c69b60785511e05e3c6c741a0d3d74a2bca172e860d4cc7cb4f470c02cd0ad067e2cf9cccf7fbcda844903e3223bb1473a86b2922cc496d8393 WHIRLPOOL 037456be490072f6082eff018756c98da5ca720c2c83e3e1e3be4069832aaa362b161dcaf5d737baaaedb933a038ba3b311a84bcc0ee49fa119d12659feda5a7
+MISC ChangeLog 1568 SHA256 23a2d3c07f362016985cce0a2c4d062455b66f679e8bb27c3dab3461de2408b1 SHA512 7013e178763c86fbc817fc375992b796d83128c8fcd00f9853350862d358ea57541738c702912b38d6311f2417ddef9b14172c26942666521a3c6d687868d376 WHIRLPOOL afea644cf068b11616b1ab4f8b38fa2318d0cc80fca50b9e7a00108891fcc516de9f3e7d1ac51c9fde28f3249c7d5465a29abeaf26da974fe56cfba92cde2aae
MISC ChangeLog-2014 104501 SHA256 896e4b8534542aeb582ae3a2e1fcbabd0dacf246fb1f5090161d690164d4ee05 SHA512 6e188d0437e11b908983a6093afa19d17e4c7dce7763fb26ea9a94a70c520ab31ad78829f03443347db0d199c3d30d5a92d73d1e32827e82a1e58535b1808644 WHIRLPOOL 6ecb4ed382b6466e6fa2143b8e9133fce01fcbd57485533637b4cc13663a216c853dbd3c2b3af0d5fcfce0dd1aece589b5c5d9f3275caf89fd0200e64fcad947
MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iJwEAQEIAAYFAlU43WEACgkQG7kqcTWJkGc4VQQAictd3AUaVFeYq7eAs7xoRlPy
-BnsfCR8lnskMa4zN+Cc8LHVcW8lte7Or9SidKJAVSWCwSKg1QZQY7UTHrm9+4oKu
-0RK1u3CK246D3JOiOM2BwkGNwVCxZqcrShlSXGt6rRwdixZ8tj6HPGNgZJhqYo4P
-xLEKCkkXXSwABFuHOuI=
-=QENe
+iQIcBAEBCAAGBQJVUbGvAAoJEPiazRVxLXTFpJAQANXYJQ+Epj6JdZHbktifhnJj
+YWd3zd7t2zj62MUoW496vJoiMQ4PUi/uOuCWwOf62IPARunOkzSjX+mqpQK3zx9t
+QCyTbH9b9ZDurXXy6eyuZ+wqWHNLAqTTiYfaZxEvZHKFxiXwU4bwg3mzHkEDw4S2
+lxrWz3HSklQlpnMTNrv23i706LqBT84YPpoYHgpNYGytFk91r7iPWbPCG71RJLA+
+PTMLqsbMob7gms6sTwd+qMywE3QyK4Rt5i03pf2xV14IiKseGyzP1u26kU8rtMEA
+Wy18GSRn7aubsd7CEfFIKwazoYsZTNKPVakut/Z5ytJof2Q/Nuk1jamUVuPbk0dI
+luj+VJS4ezlEV6f7iAulJGj597PARjj0G+OKSgY9ia/eOCRUO845QyaflE0/NDj9
+97j65msJYp5mmRjDeOWt5oPlbGdNDehgQ3V1y/bCe4Iu1kayLohcGNi3WwLPGDpa
+FD2vu55N3z2L0uM1+r8Ex+InpqX6Rc6TXdCYqFbbh9xM+1LFk02mrK+7h/o0ZTqI
+h9Op7ASkfUlQgrds4fLOzZkGkrTswudl/YhKh9av9/wzLGXgo8ZISAM0MumW7G16
+cFvSmCZVmNAUpMJt3/7sLLmbjd0zL+Kiy6ShfOcXRARLMSKBUiu36aN0QWzCUJHP
+DrCrbSWldHUBGThj/K99
+=aobg
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild
index eace8e5bc4cd..5efee24b5b10 100644
--- a/dev-vcs/subversion/subversion-1.8.13.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13.ebuild,v 1.3 2015/04/15 11:19:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13.ebuild,v 1.4 2015/05/12 07:54:21 polynomial-c Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -208,7 +208,8 @@ src_configure() {
# force ruby-2.1
# allow overriding Python include directory
- ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \
+ ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
+ ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \
ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use_with apache2 apache-libexecdir) \