From 34b41973a373fa404f514d3a5a795efadd94f92c Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 2 Jul 2009 16:36:50 +0000 Subject: version bump and clean up (Portage version: 2.1.6.13/cvs/Linux i686) --- dev-util/bzr/ChangeLog | 8 ++- dev-util/bzr/bzr-1.16.1.ebuild | 127 +++++++++++++++++++++++++++++++++++++++ dev-util/bzr/bzr-1.16_rc1.ebuild | 127 --------------------------------------- 3 files changed, 134 insertions(+), 128 deletions(-) create mode 100644 dev-util/bzr/bzr-1.16.1.ebuild delete mode 100644 dev-util/bzr/bzr-1.16_rc1.ebuild (limited to 'dev-util/bzr') diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog index d37837ed9974..3080378e334a 100644 --- a/dev-util/bzr/ChangeLog +++ b/dev-util/bzr/ChangeLog @@ -1,6 +1,12 @@ # 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.99 2009/07/02 14:36:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.100 2009/07/02 16:36:50 fauli Exp $ + +*bzr-1.16.1 (02 Jul 2009) + + 02 Jul 2009; Christian Faulhammer -bzr-1.16_rc1.ebuild, + +bzr-1.16.1.ebuild: + version bump and clean up 02 Jul 2009; Raúl Porcel bzr-1.15.1.ebuild: sparc stable wrt #274451 diff --git a/dev-util/bzr/bzr-1.16.1.ebuild b/dev-util/bzr/bzr-1.16.1.ebuild new file mode 100644 index 000000000000..b8f0b831b04e --- /dev/null +++ b/dev-util/bzr/bzr-1.16.1.ebuild @@ -0,0 +1,127 @@ +# 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.16.1.ebuild,v 1.1 2009/07/02 16:36:50 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_*|" + # https://bugs.launchpad.net/bzr/+bug/383920 + skip_tests+="test_transport_implementations.TransportTests.test_get*|" + #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 +} diff --git a/dev-util/bzr/bzr-1.16_rc1.ebuild b/dev-util/bzr/bzr-1.16_rc1.ebuild deleted file mode 100644 index 050821e9423a..000000000000 --- a/dev-util/bzr/bzr-1.16_rc1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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.16_rc1.ebuild,v 1.1 2009/06/17 07:24:37 pva 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_*|" - # https://bugs.launchpad.net/bzr/+bug/383920 - skip_tests+="test_transport_implementations.TransportTests.test_get*|" - #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 -} -- cgit v1.2.3-65-gdbad