diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest index 63357b231..2893aacb1 100644 --- a/dev-python/python-nss/Manifest +++ b/dev-python/python-nss/Manifest @@ -1,3 +1,3 @@ -AUX gentoo_lib_name.patch 1772 RMD160 5a1eea8d3c681dd335486c622f6e19c11acfe461 SHA1 1d8de4d267a05b83a842c9ee8fd7985ee1b11220 SHA256 9f66cc2bfdd12b4b7ae9f8f3cf39db5b588025a83e8b1008dad823616a494902 +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 1132 RMD160 a4e3892f0909b3de1ad4891f7a71667b3b178af0 SHA1 5df6d94f5bf46da6a47444fdf77911df3beeab67 SHA256 9e409b82c99c727a2792294f1e99f45596348a6a6f9ae9ecee72e9f62a872388 +EBUILD python-nss-0.8.ebuild 1150 RMD160 2cbb3190d0c31418713cd739f5489700bf11ae44 SHA1 5b0aab026a7d086e52657b21166664c4c52ec10a SHA256 0feea2141b7b431124a16db73e9eb3ed8c7d5d92ac927819b23c00234b0f693f diff --git a/dev-python/python-nss/files/gentoo_lib_name.patch b/dev-python/python-nss/files/python-nss-fix-path.patch similarity index 74% rename from dev-python/python-nss/files/gentoo_lib_name.patch rename to dev-python/python-nss/files/python-nss-fix-path.patch index 48dc29142..7e679fc05 100644 --- a/dev-python/python-nss/files/gentoo_lib_name.patch +++ b/dev-python/python-nss/files/python-nss-fix-path.patch @@ -1,38 +1,44 @@ ---- setup.py.orig 2010-02-17 22:51:13.762123843 +0200 -+++ setup.py 2010-02-17 22:53:26.538622241 +0200 -@@ -310,7 +310,7 @@ +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 = [] 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'], libraries = ['nspr4'], ++ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'], extra_compile_args = extra_compile_args, ) -@@ -318,7 +318,7 @@ + nss_io_extension = \ Extension('nss.io', sources = ['src/py_nspr_io.c'], - include_dirs = ['/usr/include/nss3', '/usr/include/nspr4'], + include_dirs = ['/usr/include/nss', '/usr/include/nspr'], libraries = ['nspr4'], ++ library_dirs = ['/usr/lib/nspr', '/usr/lib/nss'], extra_compile_args = extra_compile_args, ) -@@ -326,7 +326,7 @@ + nss_nss_extension = \ Extension('nss.nss', 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'], extra_compile_args = extra_compile_args, ) -@@ -334,7 +334,7 @@ + nss_ssl_extension = \ Extension('nss.ssl', sources = ['src/py_ssl.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'], 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.8.ebuild index 000ef8a20..81a9e29f6 100644 --- a/dev-python/python-nss/python-nss-0.8.ebuild +++ b/dev-python/python-nss/python-nss-0.8.ebuild @@ -27,7 +27,7 @@ RESTRICT_PYTHON_ABIS="3.*" DOCS="README doc/ChangeLog" src_prepare() { - epatch "${FILESDIR}"/*.patch + epatch "${FILESDIR}"/python-nss-fix-path.patch } src_install() {