summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-05-18 05:47:53 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-05-18 05:47:53 +0000
commit9512a2e1773a22ff811ac5b96f76f52de6a70a7a (patch)
tree7b32ea24a3cf05309c1ff7625ebb48384c30c51d /dev-util
parentadd ~x86 keyword, bug #270222 (diff)
downloadhistorical-9512a2e1773a22ff811ac5b96f76f52de6a70a7a.tar.gz
historical-9512a2e1773a22ff811ac5b96f76f52de6a70a7a.tar.bz2
historical-9512a2e1773a22ff811ac5b96f76f52de6a70a7a.zip
Update some messages and handling of tests.
Package-Manager: portage-13623-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/subversion/ChangeLog6
-rw-r--r--dev-util/subversion/Manifest4
-rw-r--r--dev-util/subversion/subversion-1.6.2.ebuild46
3 files changed, 43 insertions, 13 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index d2141df6990c..f6d335661d5a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/subversion
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.376 2009/05/12 16:23:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.377 2009/05/18 05:47:53 arfrever Exp $
+
+ 18 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ subversion-1.6.2.ebuild:
+ Update some messages and handling of tests.
*subversion-1.6.2 (12 May 2009)
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index c29f733d2c6a..8b19697cefac 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -18,6 +18,6 @@ DIST subversion-1.6.2.tar.bz2 5470969 RMD160 b20b4950188f2482984a1e7b0e5e0bdfccb
EBUILD subversion-1.5.5.ebuild 13389 RMD160 7919e6076dc2340f69a53b263eef90b752d5ad75 SHA1 c1daa6c240f93b5e4865a09568645e026df2233d SHA256 1d4b0e1cd10f7e61bcee2aa4fefbb62ee7d1ec972f951d2fc0af6b3f976ac072
EBUILD subversion-1.5.6.ebuild 13425 RMD160 624622f7a952843d9548866c4591843a8cb70b9a SHA1 4f7cf75b1b5f0d404c9f38f38c1aee2a705a8797 SHA256 fc46fe2ecfb09717d1c233b85716ebb35166a262a98429703edca343ee9d474f
EBUILD subversion-1.6.1.ebuild 17067 RMD160 55ebc3467c8fad3869aa741293a1ac0790c61687 SHA1 fdf01e1c4031910066c232aa069c94416b7a6bce SHA256 34b0627bcdcddfc41323def494e963b5baafd3eb2037395706e4dc5eabb98521
-EBUILD subversion-1.6.2.ebuild 24985 RMD160 58ee5a0545dda7046164099d7359b852c725ce80 SHA1 85c7f0245320e45f760ffb200bb2c3ae23432def SHA256 e2d63b4a95d6217a6934ffa514ba03f3b908122f6e5556547f0cfc7fa125b3b6
-MISC ChangeLog 62951 RMD160 571ea982bbd121f952c4999d446f8d7b79798a05 SHA1 a3f40948cce6f2f4583e0b2dfb16d3231e834288 SHA256 ad02529b4feb5737965d9574da418c66ea6a1d28b9a08acdc7ba384d2ec2a437
+EBUILD subversion-1.6.2.ebuild 26092 RMD160 6bfe60cc78668a5f6b423dfdf4b603a6e7513626 SHA1 67aa298a0d5b2493cf58cdff83f1cfd79475de70 SHA256 12d492c1e91253931fb3e9ee9e46d50b56c001c6f7bd2e4f5745f485b1b3ce0b
+MISC ChangeLog 63098 RMD160 d50066f54b65841a2e27bddd58876c9a8c768c86 SHA1 c4c5ec1afcc4fda9d773d2bdac6783a4184f00b7 SHA256 41ed0eb842bd968c0be1d019c84c9311d663edf3c1f3f4974c1539a35ac2fcfd
MISC metadata.xml 794 RMD160 6e8968481ac256000ec54f71bac21c7b4cbde1cc SHA1 c753273c54c52d52187cb886e35dc08726f1b97e SHA256 3d7a28065aaf0e28837de71ccde29de53a074b5b3ede715c1b412cf5a43aaeac
diff --git a/dev-util/subversion/subversion-1.6.2.ebuild b/dev-util/subversion/subversion-1.6.2.ebuild
index 53c716ca5e8d..525010ce55d6 100644
--- a/dev-util/subversion/subversion-1.6.2.ebuild
+++ b/dev-util/subversion/subversion-1.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.1 2009/05/12 16:23:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.2 2009/05/18 05:47:53 arfrever Exp $
EAPI="2"
@@ -98,11 +98,16 @@ pkg_setup() {
if use test; then
elog
- elog "You can set the following variables to enable testing of some features:"
+ elog "\e[31m************************************************************************************************\e[0m"
+ elog
+ elog "NOTES ABOUT TESTS"
+ elog
+ elog "You can set the following variables to enable testing of some features and configure testing:"
if use webdav-neon || use webdav-serf; then
elog " SVN_TEST_APACHE=1 - Enable testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf"
elog " (See \"Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf\")"
fi
+ elog " SVN_TEST_SVNSERVE_PORT=integer - Set svnserve port number (Default value: 3690)"
elog " SVN_TEST_FSFS_MEMCACHED=1 - Enable using of Memcached for FSFS repositories"
elog " SVN_TEST_FSFS_MEMCACHED_PORT=integer - Set Memcached port number (Default value: 11211)"
elog " SVN_TEST_FSFS_SHARDING=integer - Enable sharding of FSFS repositories and set default shard size for FSFS repositories"
@@ -112,7 +117,7 @@ pkg_setup() {
# elog " SVN_TEST_SASL=1 - Enable SASL authentication"
# fi
if use ctypes-python || use java || use perl || use python || use ruby; then
- elog " SVN_TEST_BINDINGS=1 - Enable testing of bindings"
+ elog " SVN_TEST_BINDINGS=1 - Enable testing of bindings"
fi
if use java || use perl || use python || use ruby; then
elog " (Testing of bindings requires ${CATEGORY}/${PF})"
@@ -121,11 +126,20 @@ pkg_setup() {
elog " (Testing of JavaHL library requires dev-java/junit:4)"
fi
elog
+ if ! use webdav-neon && ! use webdav-serf; then
+ elog "\e[31m************************************************************************************************\e[0m"
+ elog
+ epause 24
+ fi
if { use webdav-neon || use webdav-serf; } && [[ -n "${SVN_TEST_APACHE}" ]] && ! has_version "${CATEGORY}/${PN}[apache2]"; then
die "${CATEGORY}/${PN} must be installed with USE=\"apache2\""
fi
+ if [[ -n "${SVN_TEST_SVNSERVE_PORT}" ]] && ! ([[ "$((${SVN_TEST_SVNSERVE_PORT}))" == "${SVN_TEST_SVNSERVE_PORT}" ]]) &>/dev/null; then
+ die "Value of SVN_TEST_SVNSERVE_PORT must be an integer"
+ fi
+
if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && ! has_version net-misc/memcached; then
die "net-misc/memcached must be installed"
fi
@@ -164,10 +178,13 @@ src_unpack() {
elog "Testing of mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf:"
elog " If you want to test mod_dav_svn, mod_authz_svn and libsvn_ra_neon / libsvn_ra_serf,"
elog " ensure that ${CATEGORY}/${PN} is installed with USE=\"apache2\","
- elog " copy \"${T}/99_subversion_tests.conf\" to /etc/apache2/modules.d directory,"
- elog " define DAV, SVN, SVN_AUTHZ and SVN_TESTS in APACHE2_OPTS variable in /etc/conf.d/apache2,"
+ elog " copy \"${T}/99_subversion_tests.conf\""
+ elog " to \"/etc/apache2/modules.d\" directory, add definitions of DAV, SVN, SVN_AUTHZ"
+ elog " and SVN_TESTS to APACHE2_OPTS variable in \"/etc/conf.d/apache2\" configuration file,"
elog " (re)start Apache and run \`SVN_TEST_APACHE=1 emerge ${CATEGORY}/${PN}\`."
elog
+ elog "\e[31m************************************************************************************************\e[0m"
+ elog
if [[ -z "${SVN_TEST_APACHE}" ]]; then
ebeep 24
@@ -178,6 +195,8 @@ src_unpack() {
if ! cmp -s "${T}/99_subversion_tests.conf" "/etc/apache2/modules.d/99_subversion_tests.conf"; then
die "/etc/apache2/modules.d/99_subversion_tests.conf mismatch"
fi
+
+ epause 24
fi
fi
@@ -349,12 +368,12 @@ EOF
}
initialize_tests_environment() {
- [[ "$1" == "local" ]] && base_url="file://${S}/subversion/tests/cmdline"
- [[ "$1" == "svn" ]] && base_url="svn://127.0.0.1"
+ [[ "$1" == "local" ]] && base_url="file://${S}/subversion/tests/cmdline" http_library=""
+ [[ "$1" == "svn" ]] && base_url="svn://127.0.0.1" http_library=""
[[ "$1" == "neon" ]] && base_url="http://localhost" http_library="neon"
[[ "$1" == "serf" ]] && base_url="http://localhost" http_library="serf"
- [[ "$1" == "svn" ]] && LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --pid-file "${T}/svnserve.pid"
+ [[ "$1" == "svn" ]] && LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --pid-file "${T}/svnserve.pid"
[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"
}
@@ -375,6 +394,7 @@ src_test() {
use webdav-serf && ra_types+=" serf"
fi
+ [[ -z "${SVN_TEST_SVNSERVE_PORT}" ]] && SVN_TEST_SVNSERVE_PORT="3690"
if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then
[[ -z "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && SVN_TEST_FSFS_MEMCACHED_PORT="11211"
sed -e "/\[memcached-servers\]/akey = 127.0.0.1:${SVN_TEST_FSFS_MEMCACHED_PORT}" -i subversion/tests/tests.conf
@@ -396,7 +416,7 @@ src_test() {
einfo "\e[1;34mTesting of ra_${ra_type} + $(echo ${fs_type} | tr '[:lower:]' '[:upper:]')\e[0m"
einfo
initialize_tests_environment ${ra_type}
- emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="true" ${options} || failed_tests="1"
+ emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
terminate_tests_environment ${ra_type}
mv tests.log tests-ra_${ra_type}-${fs_type}.log
done
@@ -565,7 +585,13 @@ EOF
einfo
einfo "Installation of contrib and tools"
einfo
- doenvd "${FILESDIR}/1.5.0/80subversion-extras"
+
+ cat << EOF > 80subversion-extras
+PATH=/usr/$(get_libdir)/subversion/bin
+ROOTPATH=/usr/$(get_libdir)/subversion/bin
+EOF
+ doenvd 80subversion-extras
+
emake DESTDIR="${D}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"