version bump

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 141 insertions, 5 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 32998f38129d..5a5667a289f8 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/bzr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.105 2009/08/18 11:04:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.106 2009/08/27 14:16:41 fauli Exp $
+
+*bzr-1.18 (27 Aug 2009)
+
+  27 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +bzr-1.18.ebuild:
+  version bump
 
 *bzr-1.17 (18 Aug 2009)
 
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 6824d8234458..6ec8454ad9d1 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -8,15 +8,17 @@ AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 S
 DIST bzr-1.15.1.tar.gz 4298555 RMD160 ed791a02d39a4aec1aa1ae0aef25e887da27ad6e SHA1 d340aea77e7a0a7c69b03ceb62b34f27a69c0568 SHA256 e7f5257cbfbca29f10ebf89d8b1a3d8e46ab699c71627d4417bd08167c875b93
 DIST bzr-1.16.1.tar.gz 5080912 RMD160 347ae85e08e15b0e4e3583c3157a7e82439b2bcc SHA1 9118b3b74d37eab775d80e3060d63224399bcb02 SHA256 97bd05b9859b214bb0811d2d7a93de96004aa97127c02adc58b12d630a268b50
 DIST bzr-1.17.tar.gz 5913890 RMD160 422d4c5b47b003fe35491ce01ea55bae2f28f004 SHA1 32dce4d48768c32c4a62595249fe37534179a116 SHA256 b80413b7d543561b08de54ea988145982737d52f4fcd3dc8084b9294735619dc
+DIST bzr-1.18.tar.gz 5977774 RMD160 307fe8770b96b1cc67c97ec7bc62ba915a0238bb SHA1 0e738c089ad769eeea6f67befd3de93a402200a7 SHA256 80536a3b7980898f234d971a5b30c5f7d3233b1162a7920c6a1aeb845e32a949
 EBUILD bzr-1.15.1.ebuild 3981 RMD160 5869db529bc2be50cdb3dbb7aac8dc90ab610690 SHA1 5ae2c647fdf09a0d2093c0cb233c13484cba9722 SHA256 f246e5f522fc24c7f383a41b8c0ee5f109d44cd8c9f78abd283d6dc9d4c53cd3
 EBUILD bzr-1.16.1.ebuild 3834 RMD160 28f100e7061629fe08d36e3c6e58a0dbb562a8e0 SHA1 2ffb1673b8cbab2412ce43bc5c285b3a2d3175be SHA256 fd6b2b84d117d0889d009286c3536d428d5e1a5cd894be361c3d40bf7805f5fa
 EBUILD bzr-1.17.ebuild 3834 RMD160 1f1119202ec239c0044495d076c95c3c44b7da37 SHA1 04a3c6490abc6a73b603108d696ac2ea4115a6ba SHA256 622b6b27fae07393a41eae0d51cb2ecac700df8283a1d7476646326300ddcbdb
-MISC ChangeLog 15719 RMD160 9dc580c99081672e66340c73cf712797ec61d391 SHA1 cf6e74c5da9225762e279cf3227812e8ee00001f SHA256 96fce154fcfd4e87154e361c14082d3b75739d09e581e1d44c618c995c97cfc3
+EBUILD bzr-1.18.ebuild 3834 RMD160 41bccdca29093b3415c27a4a24cba8f387756bce SHA1 d9be9a28893225f9a67bb67505acc51526abbb8c SHA256 f7f76365326ca8f133d4be9ec1f9397c5b661b0eddfe79fd2dd94fe999088d1f
+MISC ChangeLog 15833 RMD160 4d8d4d2ec0b611de26c69427a08d16ebd4c8ba33 SHA1 ef018313829f449c047ffeb4dbe842933ae21a6a SHA256 27d37ccc86a747f8d37c39263448dfec5767d02e5177d77b91c0e6b24439be3b
 MISC metadata.xml 890 RMD160 20a0b377b9d83d4a59813fc61237ac1ae3a163b8 SHA1 3f06ccc8ac2d3bff0e47bda1b85c10015a86410e SHA256 5f7a2215128eaa41f1e121036f4b3af779deeaa4a8476d0d0219f9a46c089cb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqKir8ACgkQNQqtfCuFneOa8wCdHSAf32Vk4swr/JHZoZwWZ20f
-absAnRdhWDFK7R/2VDDS3gfywlaXZo8i
-=UK0d
+iEYEARECAAYFAkqWlVAACgkQNQqtfCuFneNAeACfZK10suktuTB1qAUVuq13Xnpx
+IxgAn2dmutjHZXDDduNjjC8VF6KS1qkm
+=hpNS
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-1.18.ebuild b/dev-util/bzr/bzr-1.18.ebuild
new file mode 100644
index 000000000000..b9e9bde5f8d7
--- /dev/null
+++ b/dev-util/bzr/bzr-1.18.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.18.ebuild,v 1.1 2009/08/27 14:16:41 fauli Exp $
+
+EAPI=1
+
+NEED_PYTHON=2.4
+
+inherit distutils bash-completion elisp-common eutils versionator
+
+MY_PV=${PV/_rc/rc}
+MY_P=${PN}-${MY_PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/bzr/${SERIES}/${MY_PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs +sftp test"
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		$RDEPEND
+		dev-python/medusa
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="bzrlib"
+SITEFILE=71bzr-gentoo.el
+DOCS="doc/*.txt"
+
+src_unpack() {
+	distutils_src_unpack
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-1.8-no-pyrex.patch"
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
+	fi
+}
+
+src_install() {
+	distutils_src_install --install-data /usr/share
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die "dodoc failed"
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die "dodoc failed"
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+
+	if use emacs; then
+		elisp-site-regen
+		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
+		elog "is already included.  This ebuild does not automatically activate bzr support"
+		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
+		elog "file by adding"
+		elog "       (load \"bzr-mode\")"
+	fi
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	export LC_ALL=C
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/306264
+	skip_tests+="test_http.SmartHTTPTunnellingTest*|"
+	skip_tests+="test_http.TestWallServer.test_http_*|"
+	skip_tests+="blackbox.test_too_much.SFTPTestsRelative.test_*|"
+	# !!! FIXED in 1.17 https://bugs.launchpad.net/bzr/+bug/383920
+	skip_tests+="test_transport_implementations.TransportTests.test_get*|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*|"
+	#https://bugs.launchpad.net/bzr/+bug/341648
+	skip_tests+="test_osutils.TestWalkDirs.test_walkdirs_os_error"
+	skip_tests+=")"
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+		"${python}" bzr --no-plugins selftest -x ${skip_tests} || die "bzr selftest failed"
+	else
+		"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}