Adapt to upsteam's partial acceptance of the comedilib setup.py patch.

diff --git a/Manifest b/Manifest
index 559e1bf2c6033bbb470c97bc9165720e143daeb6..07dab10ad96365c9d2da347ca738a91b1d56f63e 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,5 +1,5 @@
 AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
-AUX comedilib-9999-setup.py.patch 962 RMD160 efcd89f8528e18a68ba8ff3756f00c047fdb228e SHA1 60827fa147aba30d5b5749260e1a1d928047222a SHA256 219864acf1610e2ddd94eb14eca8983fd336511db7626dde5a6347e11822a983
-EBUILD comedilib-9999.ebuild 3729 RMD160 13a651d2e0ae799b07d8f6245780c210748e03e9 SHA1 af16da7a6a11a787a133e8cb246be2008a680fa9 SHA256 39e03e1516b5484fd8eb8800f5b27f8fac4f7268d98718082cf41dd170582dbf
+AUX comedilib-9999-setup.py.patch 639 RMD160 7c3ae3605d8522795b0b138eb729dc1c0aebbc33 SHA1 708d03a0393f189cee08ad702f8345a81a80c6b0 SHA256 cb75295edbd6c39ee65ab5fbc29bac2f3e6b0002e7cdbba03836d488f2cff766
+EBUILD comedilib-9999.ebuild 3709 RMD160 7ab9420cb0bb29f4b044c85f6fbeb9457f3f1f63 SHA1 3730c66ccc4e0494fe990a15e815eb0f9ead2010 SHA256 1fbf6c7ba4b381b5cc7252c525913b53f005e33e4babe3d9a76ccf4d229a1800
 MISC ChangeLog 1168 RMD160 62c9992630de85e02a25d5a4cc077386211b8859 SHA1 bc9d91fff9c4f05804d564f5e55fd63ed99c3426 SHA256 6766a0d3f76055ed559975a91df6f2876289f129248fa739853da0d2606bec9f
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
index dae8b0a8f7b1c15cd5e34ca2a57752fc23692e90..05a833655028d815f492645c94dc013c088e61c8 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -54,7 +54,6 @@ src_prepare()
        if use python ; then
                epatch "${FILESDIR}/${P}"-setup.py.patch
                pushd "${S}/swig/python" || die "failed to pushd"
-               ln -s ../comedi.i
                distutils_src_prepare
                popd || die "failed to popd"
        fi

diff --git a/files/comedilib-9999-setup.py.patch b/files/comedilib-9999-setup.py.patch
index 57130e5fc692ed8b27308b3e24f0755fd2700078..5f5cd914338dff0c2f75bc3ea93d8488d2b90d5c 100644 (file)
--- a/files/comedilib-9999-setup.py.patch
+++ b/files/comedilib-9999-setup.py.patch
@@ -1,27 +1,16 @@
-diff --git a/swig/python/setup.py b/swig/python/setup.py
-index 4c0c1eb..6fc1870 100644
---- a/swig/python/setup.py
-+++ b/swig/python/setup.py
-@@ -3,15 +3,17 @@ from distutils.core import setup, Extension
- module1 = Extension('_comedi',
+From: W. Trevor King <wking@drexel.edu>
+Date: Fri Dec 17 07:34:24 EST 2010
+Subject: [PATCH] Ajust setup.py to to link against libtool's lib/.libs/
+
+diff -ru a/swig/python/setup.py b/swig/python/setup.py
+--- a/swig/python/setup.py     2010-12-17 07:01:36.000000000 -0500
++++ b/swig/python/setup.py     2010-12-17 07:30:24.000000000 -0500
+@@ -4,7 +4,7 @@
                        define_macros = [('MAJOR_VERSION','0'),
                                        ('MINOR_VERSION','1')],
--                      include_dirs = ['../include'],
--                      library_dirs = ['../lib'],
-+                      include_dirs = ['../../include'],
+                       include_dirs = ['../../include'],
+-                      library_dirs = ['../../lib'],
 +                      library_dirs = ['../../lib/.libs'],
-+                      swig_opts=['-I../../include'],
+                       swig_opts = ['-I../../include', '-I..'],
                        libraries = ['comedi'],
--                      sources = ['comedi_wrap.c'])
-+                      sources = ['comedi.i'])
-                       
--setup (name='_comedi',
-+setup (name='comedi',
-       version = '0.1',
-       description = 'Python wrapper module for the Comedi data-acquisition drivers',
-       author = 'Bryan E. Cole',
-       author_email = 'bryan.cole@teraview.co.uk',
-       long_description = ''' Wrapper for the Comedi data-acquisition library ''',
--      ext_modules = [module1])
-+      ext_modules = [module1],
-+      py_modules = ['comedi'])
+                       sources = ['comedi_python.i'])