summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiktor w brodlo <wiktor@brodlo.net>2011-06-13 14:33:24 +0000
committerwiktor w brodlo <wiktor@brodlo.net>2011-06-13 14:33:24 +0000
commit963a8a14ad2fe048d30f4fde4cf54fde02611cb5 (patch)
tree82d3ac94da2f5ab6d689ebe45f9e80b156edbff6 /dev-python
parentdev-python/pyblock version bump + -Werror patch (diff)
downloadanaconda-overlay-963a8a14ad2fe048d30f4fde4cf54fde02611cb5.tar.gz
anaconda-overlay-963a8a14ad2fe048d30f4fde4cf54fde02611cb5.tar.bz2
anaconda-overlay-963a8a14ad2fe048d30f4fde4cf54fde02611cb5.zip
dev-python/python-nss 0.8->0.11 + SRC_URI fix
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/python-nss/Manifest6
-rw-r--r--dev-python/python-nss/files/python-nss-fix-path.patch21
-rw-r--r--dev-python/python-nss/python-nss-0.11.ebuild (renamed from dev-python/python-nss/python-nss-0.8.ebuild)7
3 files changed, 21 insertions, 13 deletions
diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
index bf32295..17954fa 100644
--- a/dev-python/python-nss/Manifest
+++ b/dev-python/python-nss/Manifest
@@ -1,3 +1,3 @@
-AUX python-nss-fix-path.patch 2124 RMD160 1637e30111b9b0115bbc49ce34379869c1cc6e4a SHA1 15fd01f0aee8801f1c408182d67bd636e3b32b3a SHA256 5887e7afb2da1a08857a1faff38fcbe978ac961fc8faaa53b4ceeaa32ac6911a
-DIST python-nss-0.8.tar.lzma 108903 RMD160 e636140ab155e64d99e9eb1b5d574ae1e966cf07 SHA1 ad67c7c5e65be0054c98aea0eced12414208352a SHA256 6af55f01782867b2bc9ce09838c385ba9340c2a0646c3cf1ec1931892f64086a
-EBUILD python-nss-0.8.ebuild 1138 RMD160 24ee0f6f21e483e7209d6cff8efab10385574795 SHA1 64c218f7acec2760f652d4a45c6d64a4436ff4df SHA256 932edb75406d01c26d404e5d3a221e5c26a2907c8342a3efed5f54949459b39c
+AUX python-nss-fix-path.patch 2518 RMD160 a2fb2120cbcc4ece25d7523dfe09ec5a252cb189 SHA1 37ea1abf6f8b1e5bccf5ed385f53062a8404f9a4 SHA256 ff0d59cf8c16518f14d0f0785b38b0c4addd7771b178d1290a51654e1a438dcd
+DIST python-nss-0.11.tar.bz2 150644 RMD160 7dac33e9c635325964cd27de4d0de4e600f461a6 SHA1 21104098974cf700dd9f066f3191883de78de297 SHA256 90d5f05b845fd330e029095a651f60496ba8b36e8363ef29a0be672ef698f9cc
+EBUILD python-nss-0.11.ebuild 1258 RMD160 e0cd21c97bd6184577c5bcf47d9bff09cc625998 SHA1 e0f3a084d252cf553b371dd681186c7aded92127 SHA256 42073895b4b7f3f42ef1e20da15a20a4b30ed65bfa206913f40107c79a0fecc6
diff --git a/dev-python/python-nss/files/python-nss-fix-path.patch b/dev-python/python-nss/files/python-nss-fix-path.patch
index 7e679fc..b4b6737 100644
--- a/dev-python/python-nss/files/python-nss-fix-path.patch
+++ b/dev-python/python-nss/files/python-nss-fix-path.patch
@@ -1,12 +1,12 @@
-diff -Nurp python-nss-0.8.orig/setup.py python-nss-0.8/setup.py
---- python-nss-0.8.orig/setup.py 2009-09-21 21:18:37.000000000 +0200
-+++ python-nss-0.8/setup.py 2010-04-01 19:46:44.172982047 +0200
-@@ -310,32 +310,36 @@ extra_compile_args = []
+--- python-nss-0.11.orig/setup.py 2011-02-21 17:12:14.000000000 +0000
++++ python-nss-0.11/setup.py 2011-06-13 12:45:43.943609000 +0000
+@@ -310,37 +310,41 @@ extra_compile_args = []
nss_error_extension = \
Extension('nss.error',
sources = ['src/py_nspr_error.c'],
- include_dirs = ['/usr/include/nss3', '/usr/include/nspr4'],
+ include_dirs = ['/usr/include/nss', '/usr/include/nspr'],
+ depends = ['src/py_nspr_common.h', 'src/py_nspr_error.h'],
libraries = ['nspr4'],
+ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
extra_compile_args = extra_compile_args,
@@ -17,8 +17,9 @@ diff -Nurp python-nss-0.8.orig/setup.py python-nss-0.8/setup.py
sources = ['src/py_nspr_io.c'],
- include_dirs = ['/usr/include/nss3', '/usr/include/nspr4'],
+ include_dirs = ['/usr/include/nss', '/usr/include/nspr'],
+ depends = ['src/py_nspr_common.h', 'src/py_nspr_error.h', 'src/py_nspr_io.h'],
libraries = ['nspr4'],
-+ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
++ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
extra_compile_args = extra_compile_args,
)
@@ -27,8 +28,9 @@ diff -Nurp python-nss-0.8.orig/setup.py python-nss-0.8/setup.py
sources = ['src/py_nss.c'],
- include_dirs = ['src', '/usr/include/nss3', '/usr/include/nspr4'],
+ include_dirs = ['src', '/usr/include/nss', '/usr/include/nspr'],
- libraries = ['nspr4', 'ssl3'],
-+ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
+ depends = ['src/py_nspr_common.h', 'src/py_nspr_error.h', 'src/py_nss.h'],
+ libraries = ['nspr4', 'ssl3', 'nss3'],
++ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
extra_compile_args = extra_compile_args,
)
@@ -37,8 +39,11 @@ diff -Nurp python-nss-0.8.orig/setup.py python-nss-0.8/setup.py
sources = ['src/py_ssl.c'],
- include_dirs = ['src', '/usr/include/nss3', '/usr/include/nspr4'],
+ include_dirs = ['src', '/usr/include/nss', '/usr/include/nspr'],
+ depends = ['src/py_nspr_common.h', 'src/py_nspr_error.h', 'src/py_nspr_io.h',
+ 'src/py_ssl.h', 'src/py_nss.h'],
libraries = ['nspr4', 'ssl3'],
-+ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
++ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'],
extra_compile_args = extra_compile_args,
)
+
diff --git a/dev-python/python-nss/python-nss-0.8.ebuild b/dev-python/python-nss/python-nss-0.11.ebuild
index 4e928df..2fc91f4 100644
--- a/dev-python/python-nss/python-nss-0.8.ebuild
+++ b/dev-python/python-nss/python-nss-0.11.ebuild
@@ -5,11 +5,14 @@
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
-inherit distutils eutils
+inherit distutils eutils versionator
DESCRIPTION="Python bindings for Network Security Services (NSS)"
HOMEPAGE="http://people.redhat.com/jdennis/python-nss/doc/api/html"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.lzma"
+
+MY_PV=$(replace_all_version_separators '_')
+
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}_0/src/${P}.tar.bz2"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
SLOT="0"