From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 26 Feb 2010 19:09:26 +0000 (+0000) Subject: Simplify dependencies. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c8b03ae8a47693fb62a38f6320fd96225377739;p=gentoo.git Simplify dependencies. Package-Manager: portage-15458-svn/cvs/Linux x86_64 --- diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest index 32e14cdb7667..3c87dc3289fb 100644 --- a/dev-util/bzr/Manifest +++ b/dev-util/bzr/Manifest @@ -1,6 +1,3 @@ ------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 @@ -12,14 +9,7 @@ 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 3628 RMD160 e8d228463570fff349e5487e44b004bf8abd88f1 SHA1 e8cd116b9193d5dc23b0fc3ceed6e3bcb9cc4e28 SHA256 a8c43119135d196ad47b73831923cd740f21bdeb0cc0ab84e27c203f3cb70412 -EBUILD bzr-2.1.0_beta4.ebuild 3468 RMD160 298f944ee9abbb5e37e32cfb3965c55b59635586 SHA1 7e32fe84e68039662a105e540acad2af5b91aeef SHA256 f3ce28dbc3b734cd52bf4226add9dba3d959080541195bef5de11f9ee5992cff +EBUILD bzr-2.0.4.ebuild 3629 RMD160 2858f1b9fc80fac5b7df873fcd694c6084b70f3c SHA1 ba25e2bf2227e29abecf77995743250c2fd543c7 SHA256 573b5c9d39fe37b000ee69637e32e5f58172367f1e89c07f3826d1b39c92be84 +EBUILD bzr-2.1.0_beta4.ebuild 3467 RMD160 925da4c36183f69deefebe425e8234c49ee52b8e SHA1 f29920200a55144f9d795b57dd5467f52d8ced4c SHA256 b6e13cfa1fc134bd3f7e8e4d41bb0fe0b0da3b3064f941d73191cd5730b26584 MISC ChangeLog 18606 RMD160 f2ef2b88e0df7a1c78b6fa74bf75e53833bd33c9 SHA1 22615e5fded5dc9df9391399b74c6a2838d90e1f SHA256 f6eefc3c8178e907d6eb745dfc80dceb310909372eb3fb47d83140fa7bc288e6 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuETaAACgkQNQqtfCuFneO02gCgkwmu8I+NJotAskqQV0i0rZlg -jRoAn3rXFS2JzGHKxu71KYTjEddT9tP9 -=o+s2 ------END PGP SIGNATURE----- diff --git a/dev-util/bzr/bzr-2.0.4.ebuild b/dev-util/bzr/bzr-2.0.4.ebuild index 9ff1011ae54d..aeeeb9d6ecca 100644 --- a/dev-util/bzr/bzr-2.0.4.ebuild +++ b/dev-util/bzr/bzr-2.0.4.ebuild @@ -1,12 +1,12 @@ # 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.4 2010/02/23 21:47:51 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.4.ebuild,v 1.5 2010/02/26 19:09:26 arfrever Exp $ EAPI=3 -PYTHON_DEPEND=2:2.4 +PYTHON_DEPEND=2 -inherit distutils bash-completion elisp-common eutils versionator +inherit bash-completion distutils elisp-common eutils versionator MY_PV=${PV/_rc/rc} MY_P=${PN}-${MY_PV} @@ -37,8 +37,8 @@ PYTHON_MODNAME="bzrlib" SITEFILE=71bzr-gentoo.el DOCS="doc/*.txt" -src_unpack() { - distutils_src_unpack +src_prepare() { + distutils_src_prepare # Don't regenerate .c files from .pyx when pyrex is found. epatch "${FILESDIR}/${PN}-1.8-no-pyrex.patch" diff --git a/dev-util/bzr/bzr-2.1.0_beta4.ebuild b/dev-util/bzr/bzr-2.1.0_beta4.ebuild index 85ab7f32dddb..2987c076f11f 100644 --- a/dev-util/bzr/bzr-2.1.0_beta4.ebuild +++ b/dev-util/bzr/bzr-2.1.0_beta4.ebuild @@ -1,12 +1,12 @@ # 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.5 2010/02/23 21:50:18 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.6 2010/02/26 19:09:26 arfrever Exp $ EAPI=3 -PYTHON_DEPEND=2:2.4 +PYTHON_DEPEND=2 -inherit distutils bash-completion elisp-common eutils versionator +inherit bash-completion distutils elisp-common eutils versionator MY_PV=${PV/_rc/rc} MY_PV=${PV/_beta/b}