From 69e7e30131545b62f93b5b5cc2ba1a905fdb8f01 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Wed, 3 Mar 2010 08:24:44 +0000 Subject: [PATCH] clean up Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- dev-util/bzr/ChangeLog | 5 +- dev-util/bzr/Manifest | 10 ++- dev-util/bzr/bzr-2.0.3.ebuild | 124 ---------------------------------- 3 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 dev-util/bzr/bzr-2.0.3.ebuild diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog index a5e82544ad95..42a652687ffc 100644 --- a/dev-util/bzr/ChangeLog +++ b/dev-util/bzr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/bzr # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.128 2010/03/02 15:59:57 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.129 2010/03/03 08:24:44 fauli Exp $ + + 03 Mar 2010; Christian Faulhammer -bzr-2.0.3.ebuild: + clean up *bzr-2.1.0 (02 Mar 2010) diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest index 5e21ffa36717..6b733cdfe1cb 100644 --- a/dev-util/bzr/Manifest +++ b/dev-util/bzr/Manifest @@ -7,19 +7,17 @@ AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb AUX bzr-2.1-no-pyrex-citon.patch 1123 RMD160 54a57f24f76e555cb77a39c86d6702b3a2ee86ee SHA1 d769bb2f561234e4cf6106b470567537de48daed SHA256 8304a5078ebcfbcdbafdf0e84119b46a289940b6748bff61b158a35d03211157 DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9 -DIST bzr-2.0.3.tar.gz 6616470 RMD160 3b33e5148ff47e66b0315e964d2b8e565d056675 SHA1 178fe6546d32a1752a9e9abca57db128463bb1e6 SHA256 757969b8bf97c049297bd041b783c197bb3983b05629a4fb07cf75c2def7780b DIST bzr-2.0.4.tar.gz 6613732 RMD160 e6159191e384ccc28e21bf30f1b5eb2937759310 SHA1 5f2c8558aceef2a790b1e65b1fa48577582446cd SHA256 6f601e4103b88cf3022add33e35d94408adc69fd9604a79e528c7bf036a1f72f DIST bzr-2.1.0.tar.gz 6787494 RMD160 c54ca16aca7811fc34b71ff852199afab3f19519 SHA1 cc7137c657d7918e833e64d77a267f8162d3a05d SHA256 7a1e9353eeabdc0f7ff540fb095994a93a6022e03063c9750faaf2d459277125 EBUILD bzr-2.0.1.ebuild 3544 RMD160 ff4d64b2c1eca74d2952c017fe645cdfaba1a059 SHA1 7ca361c0f34809d8a0e3667df7b85bdae8f75d82 SHA256 ebaf2ef45992c6b69751ef8ddba631ae2d7f7b29c779361fb43c4cedb44f5135 -EBUILD bzr-2.0.3.ebuild 3550 RMD160 b722eea162d2364d56b18a55e29b9dac42f498d2 SHA1 b471cd755d064b738488bd4d51b491bea13874a8 SHA256 80e8ef5c4cae46fee9f00295416704dfe606eeba804713d21f51fe7c96ee37a3 EBUILD bzr-2.0.4.ebuild 3629 RMD160 2858f1b9fc80fac5b7df873fcd694c6084b70f3c SHA1 ba25e2bf2227e29abecf77995743250c2fd543c7 SHA256 573b5c9d39fe37b000ee69637e32e5f58172367f1e89c07f3826d1b39c92be84 EBUILD bzr-2.1.0.ebuild 3505 RMD160 59736284579fa478090b39b856bee0d4968d145a SHA1 31f49708f578624013c80b2676d2e81a28e86387 SHA256 ba00c5ba8903bb4746c5bc83ae73d7c4cb662f5a3a3d31c73c54acebb127dfb1 -MISC ChangeLog 18761 RMD160 b2e3336a381d2892f7e490a86df2d8e35ce5205d SHA1 f88fc1281b805e0f4424ef2ddff0d11d7dae27fd SHA256 1d515e63ed1fb0125d7d752cd51902947e777198672c8586073666d4e12121ee +MISC ChangeLog 18847 RMD160 6b7050a7a6d4c9379bccdbf57218103cb26b768f SHA1 a81b0e569f017139b12cfd35a3bd117dc9ab47d8 SHA256 104e9e94bc7683603092e405e336cd3401164125ec3ae5da1a4395a1c935135d MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuNNg8ACgkQNQqtfCuFneMfNwCglOwSjBLLhIyM9O5oDAxJ9she -mTQAnRaPJczjKcvUkv315aLDf+ui1Ksd -=hyk5 +iEYEARECAAYFAkuOHOQACgkQNQqtfCuFneNwjgCeJ/rs3/vLAs7NokdgjPVJJW1j +kX8An1OX8m9TfgTuAa/RbUcYglK7Jk4b +=HbsL -----END PGP SIGNATURE----- diff --git a/dev-util/bzr/bzr-2.0.3.ebuild b/dev-util/bzr/bzr-2.0.3.ebuild deleted file mode 100644 index 7d89cedabebf..000000000000 --- a/dev-util/bzr/bzr-2.0.3.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.3.ebuild,v 1.3 2010/02/13 18:21:54 armin76 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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="(" - # Not reproducible in current dev version, so check and drop with version - # bump - skip_tests+="bzrlib.tests.test_osutils.TestWalkDirs|" - # https://bugs.launchpad.net/bzr/+bug/392127 - skip_tests+="test_http.*" - 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 -} -- 2.26.2