Keyword amd64-linux and x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

5 files changed, 19 insertions, 178 deletions

diff --git a/dev-python/pywcs/ChangeLog b/dev-python/pywcs/ChangeLog
index 5d43b4e55901..e7dc69f2ea9f 100644
--- a/dev-python/pywcs/ChangeLog
+++ b/dev-python/pywcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pywcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/ChangeLog,v 1.5 2012/05/04 15:12:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/ChangeLog,v 1.6 2012/08/02 17:41:02 bicatali Exp $
+
+  02 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/pywcs-1.9-wcslib.patch, -pywcs-1.9.ebuild, pywcs-1.11.ebuild:
+  Keyword amd64-linux and x86-linux
 
   04 May 2012; Patrick Lauer <patrick@gentoo.org> pywcs-1.11.ebuild,
   pywcs-1.9.ebuild:
@@ -60,4 +64,3 @@
   26 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org> +pywcs-1.4.2.ebuild,
   +metadata.xml:
   Initial import
-
diff --git a/dev-python/pywcs/Manifest b/dev-python/pywcs/Manifest
index 40893ede906a..98a786aa1a1b 100644
--- a/dev-python/pywcs/Manifest
+++ b/dev-python/pywcs/Manifest
@@ -1,8 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pywcs-1.11-wcslib.patch 4183 SHA256 8d7bafb81226060edeaecacb9dc4adb4e142cc64b97c4d53b8244087198438e6 SHA512 d1d5948b8ccebe318c18c43d2cc70dc6aa19b3b8d4b150c072c07e8b961a955102217a6e6433ca00ac312781a89e7cc9441e2f4489cfeadfc7849bbbd311f9dd WHIRLPOOL a8389c0d56e7ca0d13569bd811e0bff6ecfcb7f2c9e0925427ec19d16e45e848ac09532585dc8e296aad0f1dbbeb8796f3cb086f9c29d31302f1b5b606c3e7b4
-AUX pywcs-1.9-wcslib.patch 3950 SHA256 c523d9642300977dd1e69e5185ca176f799caa143eaa79fabb48c453667e9231 SHA512 c22fca6e7824effbeb38d7df4a99e65f2fac89dd21e06697b6495117661858015f0856dc4146e3f3deebfd4badad760ec27065e849be0410175388e9b01b5bd6 WHIRLPOOL 6ae097e99b02a793d7c1826b0a51013aaff54c8a27cea7e1929c5999de57e65f9325674c62a984bcc557d177f94011619e137e138082ded3de93b2c7969bb432
 DIST pywcs-1.11-4.8.2.tar.gz 2187116 SHA256 61b2d9abf90f4dce2071dfeed1628b487aa32e27b0c01e9983410557db96ac34 SHA512 595cdb910005ef8348eb84d1e0e3db7e5c925d8f44c8f84d8158729d2a9352811a1e1bee49049a91a033503bc9cc8b39c60b1acd526b2fccdd1a8764ec8a7c1e WHIRLPOOL d0c3cd2a428ab1d25594024f3db4f5b586cd1d3d82074828260942e74742602b8c4010cdcb4f73d32d20e71133dae9c7cb5af49e53aab880d404a9ebaf22cb08
-DIST pywcs-1.9-4.4.4.tar.gz 1971894 SHA256 b7e6d61280f62228c249e3ebf5799fe012d37a32df4e15eb3bb9d2b23f37f30d SHA512 12827d559df7c63eaf1ddfcd75b61eb2660aa6debd63efdaf665533820397ee7a8295aec6ff57d84060ede895e97b72efe1bbc24d0ac4040165a437ed9380626 WHIRLPOOL 79eb0a96d7db4cdef9fb737796da34c5991ee27bdaed27a613cce526886066f184f8d55480c7046e6fd34d984ee96c1e32551e9bd69648e0e3f9ca05da163772
-EBUILD pywcs-1.11.ebuild 1121 SHA256 8099b175fbe01f11b5bf76f2591baa61be9248c2108430cbede7d4a8a71eb473 SHA512 de834ec2537a43bd46098af861980a18d7f9346be510609889034fd5c182de0d26f11d3c2eb0eaa8039859787e6e4986b939950563fa4540ee0b7af3d31276d1 WHIRLPOOL f94152b9748eb34d0b20849ba1293f316fe4b1bd1a2841855cfe36c790cf2488f14809e3347e79bc9eade5f3b33e3abd69cb584e604529af7b7dde5f568bb467
-EBUILD pywcs-1.9.ebuild 1176 SHA256 517b60edd91318b727f07abcfb8cd85053859f7bf9e2cc4365610ff722174fb7 SHA512 44f100c676ca86ad88bcd9e92bbc51a5536a38064ee5e67bc0340ab763effdd51d2c183547b5046f59b519ae8d0a2c4c82f0e7daa08281772881f5a67fc6c4af WHIRLPOOL 1a1d1165cd3e96b6939b8ca809c957a96ba6ceac9a2482ea9d8bacf1686f76a0318c443619fb78c65bcf48e0065a4018ba093adf19a67e5e21e277e0067814f7
-MISC ChangeLog 1964 SHA256 27b854e983cb387ab604734190e9fbe3fdd33718be50647227ccd0bc349726b4 SHA512 8a1ebd0c02b390c5b5d7ed271d373896ecca790995a5f86da359a847e5f3ec3d7a891c9fa25d7dbd80f830d0702985d7b6c35d75bffce9efa0148f20b8da188a WHIRLPOOL 4f3a491a5065018e4d72cacb9a3d5e69a5c27fcc680a716663fd60c0be82ac32d93f8eaf3f2d8356217d64df8c4356c449ae571260dfee099ea781a52025adae
+EBUILD pywcs-1.11.ebuild 1146 SHA256 9369c76bcfe86be27a0fe3ab94c3cfb71d6f893aa726590bf6ef2ece188ca395 SHA512 ffb72adbe2d11258f39785abfcd71841cb71b245579626b466726345fafdf1586617bef63209e87382d2d62ead6b102db5d184c2c1599186275d4ae036353038 WHIRLPOOL 12a25ac3db8c147bd17b82a08062ae20acd374104105a4493eae8eae802a6435c7de082ac00db3007d8a8c85307c826478331520e35c770f4e47c355e9d296cc
+MISC ChangeLog 2127 SHA256 b2fb3bb816f9e2cbdc92ae227bc3f9ccdcb1da48633da6420a4da2f9ec299f92 SHA512 33724f7841f0e3d4cafe29848d6c34e98d0a9582f03ae88cae3139ad8ab261d0a139af3dfc1ddc0606aade32075f763c6b8a2776f0d5199d53b80a8e0882f8ce WHIRLPOOL a20bcad9e1732d916559bd15b46fb3d847305f0863b180b322ff28db5a312b767cc91565190cf1bd50d922c0555d30097572d1980359afd2913294bd83b7a19b
 MISC metadata.xml 384 SHA256 84cfdb26708fbfad4b807b2527dc4599d0e3b3e118ce07b85ee5638d8c5b6bc3 SHA512 076bdd39f540c32fcdd2e044707da79e62234781bd7b97db00553f6e5884c4f85b201037bf044e37cb58b8eb3244b9893f51f49c9c7319eb8559a092ac970ca6 WHIRLPOOL b2b8951825b905c44e078ef1060fef2c3674525761b318528d93e32660fd7abedd6cd755a5ccbe7a5fe6e8ddc8ad88ef5d25682e16939847b64adb15726662ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAau7MACgkQ1ycZbhPLE2AyDQCfWyqemI/3RTmm54FVoG5p/eCL
+bjQAnR97qz3mqj3AUsiHJRsNEp4JQ1my
+=/BEV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pywcs/files/pywcs-1.9-wcslib.patch b/dev-python/pywcs/files/pywcs-1.9-wcslib.patch
deleted file mode 100644
index 1ce9cf59a50a..000000000000
--- a/dev-python/pywcs/files/pywcs-1.9-wcslib.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- defsetup.py.orig	2010-07-21 16:01:17.000000000 +0200
-+++ defsetup.py	2010-08-17 17:20:16.761079432 +0200
-@@ -38,71 +38,26 @@
- 
- ######################################################################
- # WCSLIB
--WCSVERSION = "4.4.4"
--WCSLIB = "wcslib-%s" % WCSVERSION # Path to wcslib
--WCSLIBC = join(WCSLIB, "C") # Path to wcslib source files
--WCSFILES = [ # List of wcslib files to compile
--    'flexed/wcsbth.c',
--    'flexed/wcspih.c',
--    'flexed/wcsulex.c',
--    'flexed/wcsutrn.c',
--    'cel.c',
--    'lin.c',
--    'log.c',
--    'prj.c',
--    'spc.c',
--    'sph.c',
--    'spx.c',
--    'tab.c',
--    'wcs.c',
--    'wcsfix.c',
--    'wcshdr.c',
--    'wcsunits.c',
--    'wcsutil.c']
--WCSFILES = [join(WCSLIBC, x) for x in WCSFILES]
-+from subprocess import Popen, PIPE
-+from re import match
- 
--######################################################################
--# WCSLIB CONFIGURATION
--
--# The only configuration parameter needed at compile-time is how to
--# specify a 64-bit signed integer.  Python's ctypes module can get us
--# that information, but it is only available in Python 2.5 or later.
--# If we can't be absolutely certain, we default to "long long int",
--# which is correct on most platforms (x86, x86_64).  If we find
--# platforms where this heuristic doesn't work, we may need to hardcode
--# for them.
--def determine_64_bit_int():
--    try:
--        try:
--            import ctypes
--        except ImportError:
--            raise ValueError()
--
--        if ctypes.sizeof(ctypes.c_longlong) == 8:
--            return "long long int"
--        elif ctypes.sizeof(ctypes.c_long) == 8:
--            return "long int"
--        elif ctypes.sizeof(ctypes.c_int) == 8:
--            return "int"
--        else:
--            raise ValueError()
-+def pkgconfig(*packages, **kw):
-+    flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
-+    arg = "--libs --cflags --modversion %s" % ' '.join(packages) 
-+    for token in Popen(["pkg-config "+ arg],stdout=PIPE, shell=True).communicate()[0].split():
-+       if(match("[0-9]",token)):
-+          kw.setdefault("version",[]).append(token)
-+       else:
-+          kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
-+    return kw
- 
--    except ValueError:
--        return "long long int"
-+WCSLIB = pkgconfig('wcslib')
-+WCSVERSION = WCSLIB['version'][0]
- 
- if os.path.exists("pywcs"):
-     srcroot = 'pywcs'
- else:
-     srcroot = '.'
--fd = open(join(srcroot, 'src', 'wcsconfig.h'), "w")
--fd.write("""
--/* WCSLIB library version number. */
--#define WCSLIB_VERSION %s
--
--/* 64-bit integer data type. */
--#define WCSLIB_INT64 %s
--""" % (WCSVERSION, determine_64_bit_int()))
--fd.close()
- 
- ######################################################################
- # GENERATE DOCSTRINGS IN C
-@@ -191,7 +146,8 @@
- 
- ######################################################################
- # DISTUTILS SETUP
--libraries = []
-+libraries = WCSLIB['libraries']
-+include_dirs = [numpy_include, join(srcroot, "src")] + WCSLIB['include_dirs']
- define_macros = [('ECHO', None),
-                  ('WCSTRIG_MACRO', None),
-                  ('PYWCS_BUILD', None),
-@@ -234,13 +190,8 @@
- 
- PYWCS_EXTENSIONS = [
-     Extension('pywcs._pywcs',
--              WCSFILES + PYWCS_SOURCES,
--              include_dirs =
--              [numpy_include,
--               join(srcroot, WCSLIBC),
--               WCSLIBC,
--               join(srcroot, "src")
--               ],
-+              PYWCS_SOURCES,
-+              include_dirs=include_dirs,
-               define_macros=define_macros,
-               undef_macros=undef_macros,
-               extra_compile_args=extra_compile_args,
-@@ -260,7 +211,6 @@
-     'ext_modules' :                     PYWCS_EXTENSIONS,
-     'data_files' : [
-                     ( 'pywcs/include', ['src/*.h']),
--                    ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ),
-                     ],
-     'package_dir' : {pkg[0]: 'lib', pkg[1]: 'test'},
- }
diff --git a/dev-python/pywcs/pywcs-1.11.ebuild b/dev-python/pywcs/pywcs-1.11.ebuild
index b17bbc17668d..df7e698ef786 100644
--- a/dev-python/pywcs/pywcs-1.11.ebuild
+++ b/dev-python/pywcs/pywcs-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11.ebuild,v 1.3 2012/05/04 15:12:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11.ebuild,v 1.4 2012/08/02 17:41:02 bicatali Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=sci-astronomy/wcslib-${WCS_V}"
diff --git a/dev-python/pywcs/pywcs-1.9.ebuild b/dev-python/pywcs/pywcs-1.9.ebuild
deleted file mode 100644
index 52d36689455b..000000000000
--- a/dev-python/pywcs/pywcs-1.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.9.ebuild,v 1.3 2012/05/04 15:12:15 patrick Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython"
-
-inherit distutils eutils
-
-WCS_V=4.4.4
-MYP="${P}-${WCS_V}"
-
-DESCRIPTION="Python routines for handling the FITS World Coordinate System"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-COMMON_DEPEND=">=sci-astronomy/wcslib-${WCS_V}"
-DEPEND="${COMMON_DEPEND}
-	  virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	  dev-python/pyfits"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-wcslib.patch
-}
-
-src_test() {
-	# FIX: does not work, needs fits files
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" test/test.py
-	}
-	python_execute_function testing
-}
-
-#FIX: compiles twice (once during build, another time during install)
-# seems to be in the defsetup.py hack script