From 681cc78fe0a09b765b689b82117c09659ae50944 Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Thu, 15 Jan 2015 05:47:54 +0000 Subject: [PATCH] Disable broken tests, fix python handling #536552 Package-Manager: portage-2.2.15/cvs/Linux x86_64 --- dev-libs/libmacaroons/ChangeLog | 8 +++++++- dev-libs/libmacaroons/Manifest | 4 ++-- ...-0.2.0.ebuild => libmacaroons-0.2.0-r1.ebuild} | 15 +++++++++++---- 3 files changed, 20 insertions(+), 7 deletions(-) rename dev-libs/libmacaroons/{libmacaroons-0.2.0.ebuild => libmacaroons-0.2.0-r1.ebuild} (68%) diff --git a/dev-libs/libmacaroons/ChangeLog b/dev-libs/libmacaroons/ChangeLog index 0f18e0d535cf..e71077c52643 100644 --- a/dev-libs/libmacaroons/ChangeLog +++ b/dev-libs/libmacaroons/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libmacaroons # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmacaroons/ChangeLog,v 1.3 2015/01/13 02:45:19 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmacaroons/ChangeLog,v 1.4 2015/01/15 05:47:45 patrick Exp $ + +*libmacaroons-0.2.0-r1 (15 Jan 2015) + + 15 Jan 2015; Patrick Lauer +libmacaroons-0.2.0-r1.ebuild, + -libmacaroons-0.2.0.ebuild: + Disable broken tests, fix python handling #536552 13 Jan 2015; Patrick Lauer libmacaroons-0.2.0.ebuild: Fix parallel test failure diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest index 797d5fa33ea6..18c30abd2168 100644 --- a/dev-libs/libmacaroons/Manifest +++ b/dev-libs/libmacaroons/Manifest @@ -1,4 +1,4 @@ DIST libmacaroons-0.2.0.tar.gz 423629 SHA256 5fcbfcec06749fccef3f8741ddf4680d032cc55eccdfaa0c9b73429a1df38c33 SHA512 4bc5f83b57c6a8080e646141a3c8b90c0025a894449dea4cb0ab15d1423a067b9833e70014468437d9edfe875e12ea90cae6f715893ded1eefa34f2f6506ecbe WHIRLPOOL 835d15b21c77a97ea1ba717a09356c8b87d27f88dc6bac0da05f21b9977e58affba508c4c123fa6d4139c5090aa1d3dc4e2a88d9fa8b8fa84195c0e44568f841 -EBUILD libmacaroons-0.2.0.ebuild 704 SHA256 21ac871741ce1d3b804358aa41bd1c9a754659f060ab35a24c17131995d7c520 SHA512 703f84250f002c521a196085d2ad290d68c941a996fe70ddf4945939ae4b2da23a00c333443bbf243881d3f3690d943ff6f0642e453c558859bcb386c618039f WHIRLPOOL f55bfb7df261d7b8211daa9d13ff448dcb921594d575ed3e926d61b1d426ccb1e8d55f0b195dbbc8eca3109c6e57e3c6d97fec04af82bf4e87edfe033438dbb3 -MISC ChangeLog 598 SHA256 d3855bd5988c503e3aad83ae71c2d3f2c1660e467d28bd9268652ef79cce979c SHA512 a27779991b4474105d4ff1ad074f958a881997a6a2c1f5d468063c27df284c8947b5713d8c09611e8f5b3440f0dfcecb1cc516e2f03f9ac80990ed47b53f1cf4 WHIRLPOOL 817f9b5410d09d16d8ad2ee43f7888b454a9fe527c7fe565d485bb3debee0b697dcff079d64b7b7013bca8633191989d9a05634a450d3a28f3ff8ca12423a3d7 +EBUILD libmacaroons-0.2.0-r1.ebuild 839 SHA256 6a694caf7525a41077f0ad965038ed697931e51aef60a4e3b561bac0eeaa1a6f SHA512 805711985d1f0a36181de022f22b88a5e5e549b10b6c9470e3823376215b1213228c85d3b935a5cf49eb797163f9e101039a091b02f4cb7524f5df61e55e6a5a WHIRLPOOL 30f925f2aac87a87aef0f7e7c885c588dec762e508ee95e9b1dcbfdc8ff2e413498a363ac726027fa1a7c8ff78e88fabe7f079f6a3a4ed2cfdd8191265a974b3 +MISC ChangeLog 800 SHA256 14375228aef1ef4576c76ceb46d6b7b15323975e56aa1bf268efbfa3f8ca3eea SHA512 e8b057240a6ab0c50c77ae61374e435b3227e00c552922af7bbd591d52a51829b2201e6f29a154a36375d6f13cf6ed2187e10679b865233f179cb98797b5ea97 WHIRLPOOL 643039e4249b0d2519384786f29cf7b9327178ec5fab6f847ad3cee0ef258f15356b04a48ac10fa99c974eb8e3b133242aee76184b30fde4d1a148cc5e3ad9c1 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480 diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild similarity index 68% rename from dev-libs/libmacaroons/libmacaroons-0.2.0.ebuild rename to dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild index 3656cc911353..3bab7485d460 100644 --- a/dev-libs/libmacaroons/libmacaroons-0.2.0.ebuild +++ b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmacaroons/libmacaroons-0.2.0.ebuild,v 1.3 2015/01/13 02:45:19 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild,v 1.1 2015/01/15 05:47:45 patrick Exp $ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python-r1 +inherit eutils python-single-r1 + +# Tests can't function after 2014-12-31 ... +RESTRICT="test" DESCRIPTION="Hyperdex macaroons support library" @@ -25,10 +28,14 @@ DEPEND="${RDEPEND} REQUIRED_USE="test? ( python )" +src_prepare() { + use python && python-single-r1_pkg_setup +} + src_configure() { econf $(use_enable python python-bindings) } src_test() { - emake -j1 test || die + emake -j1 check || die } -- 2.26.2