From fb6478a38193a264acef21252b8d77169e83bab2 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 23 Feb 2010 21:47:51 +0000 Subject: [PATCH] Transfer changes from Prefix tree, use PYTHON_DEPEND variable Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- dev-util/bzr/ChangeLog | 6 +++++- dev-util/bzr/Manifest | 16 +++++++++++++--- dev-util/bzr/bzr-2.0.4.ebuild | 12 ++++++------ dev-util/bzr/bzr-2.1.0_beta4.ebuild | 26 +++++++++++++------------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog index 8c2827572ebc..acb05b997441 100644 --- a/dev-util/bzr/ChangeLog +++ b/dev-util/bzr/ChangeLog @@ -1,6 +1,10 @@ # 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.125 2010/02/13 18:21:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.126 2010/02/23 21:47:51 fauli Exp $ + + 23 Feb 2010; Christian Faulhammer bzr-2.0.4.ebuild, + bzr-2.1.0_beta4.ebuild: + Transfer changes from Prefix tree, use PYTHON_DEPEND variable 13 Feb 2010; Raúl Porcel bzr-2.0.1.ebuild, bzr-2.0.3.ebuild, bzr-2.0.4.ebuild, bzr-2.1.0_beta4.ebuild: diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest index d7bba0a2cd5b..cee62d6abd4e 100644 --- a/dev-util/bzr/Manifest +++ b/dev-util/bzr/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 71bzr-gentoo.el 124 RMD160 d85713f80f9be8685bf56979626003f46ebbc22f SHA1 150e54685444e444e2328bb5cb9dbb1c68c066e0 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc @@ -9,7 +12,14 @@ DIST bzr-2.0.4.tar.gz 6613732 RMD160 e6159191e384ccc28e21bf30f1b5eb2937759310 SH DIST bzr-2.1.0b4.tar.gz 6733196 RMD160 7a83800cd57278aac7c1dbd82a7f2b6e9e07e7cc SHA1 56b65d0e78f5ed692d17358514041e66809ec7cc SHA256 ba91bd6ada8e5dcc26ff5fccdd89dab4d4eebefe69824f759ce59c58cccc4118 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 3550 RMD160 a77b4fa3caca881975129fd8d854a8611b176231 SHA1 2d5542cd1923654a251a2814a212dd378dfab2cb SHA256 d211c8072cbed9d635ec16a819fd717d147066d6f1bce1b89bf6eabb71de5f71 -EBUILD bzr-2.1.0_beta4.ebuild 3535 RMD160 ddca792615ba7b7e5aaaae2f28b269659e4841b3 SHA1 6d2014b1cd412984dc911ea92a912c221df1bc89 SHA256 03286e6abba38a31c77f14149ff9ce5fce0743eca31f7f6fca831caec0dc0469 -MISC ChangeLog 18338 RMD160 9a64856e905b264cd6b9838ea0088e8be2e658e3 SHA1 0a77c560676c90bb5b990c727c9e310cc1b5dce2 SHA256 f4ea719d5fdb8aa33a42910cff2c17f8d79a5417538b3f55a581362297f9e496 +EBUILD bzr-2.0.4.ebuild 3628 RMD160 e8d228463570fff349e5487e44b004bf8abd88f1 SHA1 e8cd116b9193d5dc23b0fc3ceed6e3bcb9cc4e28 SHA256 a8c43119135d196ad47b73831923cd740f21bdeb0cc0ab84e27c203f3cb70412 +EBUILD bzr-2.1.0_beta4.ebuild 3466 RMD160 b147ae9636388f23e11bb4da4c5cdd34de327050 SHA1 1dff6cd19a256ac046b5a5acca644f2ebee0cc19 SHA256 0bc34f7bdd9c424c7805a4dab21f045d9db02567f7b8a70356b3fc49fa6f5c4e +MISC ChangeLog 18500 RMD160 d2fe7c8c390af5a22067b81085b56a5d54074da2 SHA1 288b59d82a8e824cec2fd41285979560919d0d66 SHA256 762f3674a16fad94cb47b4b53538ca5630a77d8f41cd2a40ddf22bcf7a467bc2 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuETRIACgkQNQqtfCuFneMWtACfb9LCNtxJeaCKDz4704wkRC5z +SzwAoI3OBKFJuYtdp+mZl99WivQ1kZr3 +=4TLa +-----END PGP SIGNATURE----- diff --git a/dev-util/bzr/bzr-2.0.4.ebuild b/dev-util/bzr/bzr-2.0.4.ebuild index 1a275066dc64..9ff1011ae54d 100644 --- a/dev-util/bzr/bzr-2.0.4.ebuild +++ b/dev-util/bzr/bzr-2.0.4.ebuild @@ -1,10 +1,10 @@ # 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.4.ebuild,v 1.3 2010/02/13 18:21:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild,v 1.4 2010/02/23 21:47:51 fauli Exp $ -EAPI=1 +EAPI=3 -NEED_PYTHON=2.4 +PYTHON_DEPEND=2:2.4 inherit distutils bash-completion elisp-common eutils versionator @@ -19,7 +19,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris" IUSE="curl doc emacs +sftp test" RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree ) @@ -57,7 +57,7 @@ src_compile() { } src_install() { - distutils_src_install --install-data /usr/share + distutils_src_install --install-data "${EPREFIX}"/usr/share if use doc; then docinto developers @@ -74,7 +74,7 @@ src_install() { # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${D}${SITELISP}/${PN}/.nosearch" + touch "${ED}${SITELISP}/${PN}/.nosearch" fi insinto /usr/share/zsh/site-functions diff --git a/dev-util/bzr/bzr-2.1.0_beta4.ebuild b/dev-util/bzr/bzr-2.1.0_beta4.ebuild index 1e65eb65b0cd..50d53d2f87d5 100644 --- a/dev-util/bzr/bzr-2.1.0_beta4.ebuild +++ b/dev-util/bzr/bzr-2.1.0_beta4.ebuild @@ -1,10 +1,10 @@ # 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.1.0_beta4.ebuild,v 1.3 2010/02/13 18:21:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.4 2010/02/23 21:47:51 fauli Exp $ -EAPI=1 +EAPI=3 -NEED_PYTHON=2.4 +PYTHON_DEPEND=2:2.4 inherit distutils bash-completion elisp-common eutils versionator @@ -20,7 +20,7 @@ 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris" IUSE="curl doc emacs +sftp test" RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree ) @@ -53,29 +53,29 @@ src_compile() { distutils_src_compile if use emacs; then - elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!" + elisp-compile contrib/emacs/bzr-mode.el || die fi } src_install() { - distutils_src_install --install-data /usr/share + distutils_src_install --install-data "${EPREFIX}"/usr/share if use doc; then docinto developers - dodoc doc/developers/* || die "dodoc failed" + dodoc doc/developers/* || die for doc in mini-tutorial tutorials user-{guide,reference}; do docinto $doc - dodoc doc/en/$doc/* || die "dodoc failed" + dodoc doc/en/$doc/* || die 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" + elisp-install ${PN} contrib/emacs/*.el* || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${D}${SITELISP}/${PN}/.nosearch" + touch "${ED}${SITELISP}/${PN}/.nosearch" fi insinto /usr/share/zsh/site-functions @@ -115,9 +115,9 @@ src_test() { 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" + "${python}" bzr --no-plugins selftest -x ${skip_tests} || die else - "${python}" bzr --no-plugins selftest || die "bzr selftest failed" + "${python}" bzr --no-plugins selftest || die fi # Just to make sure we don't hit any errors on later stages. python_disable_pyc -- 2.26.2