Comedilib comedilib.pc.in and setup.rb patches merged upstream.

$ cvs log comedilib.pc.in
...
revision 1.2
date: 2010-12-14 09:41:55 -0500;
author: abbotti;
state: Exp;
lines: +1 -1;
commitid: JoFyUjr1kr0t6g0v;

Add -lm to comedilib.pc.in Libs.
Patch from W. Trevor King.
...

$ cvs log swig/ruby/setup.rb
...
revision 1.3
date: 2010-12-14 09:37:18 -0500;
author: abbotti;
state: Exp;
lines: +3 -0;
commitid: 2pQqTp57JCuS4g0v;

Import DESTDIR in swig/ruby/setup.rb for configurable rbconfig install paths.
Patch from W. Trevor King.
...

diff --git a/Manifest b/Manifest
index eb00fdedc47eb925dd6f9148c5249d8425e5018a..559e1bf2c6033bbb470c97bc9165720e143daeb6 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,7 +1,5 @@
-AUX comedilib-9999-comedilib.pc.in.patch 299 RMD160 5b545b1523eba2479a2f9f9511c8c8ab5eeb7929 SHA1 53765178e9f9bc67ebd7b2a28ca99672c5e1f10f SHA256 c4c7d4951012fc346b446c39322d26362afea37df9d8eb10b78cf7aa0e709245
 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
-AUX comedilib-9999-setup.rb.patch 318 RMD160 c9bcd07119fb7c2c92ce9c133947f51a3bd85c51 SHA1 8e213fdc3c319b611e23a98fe0844db55ef28aed SHA256 afb1fa061a2b703a66e09c408b21a337592d519ead51984f78f7b64dbc74c5a9
-EBUILD comedilib-9999.ebuild 3845 RMD160 23dfbd40caf8bc2f8892f17b4b439a605ccefd93 SHA1 9c0d2805593f92cfb67a9587b7d95c2acbd98f96 SHA256 78469158659a273e46a643210206f3f5a58f12ba94e6b19ffcc31e7fc511cc93
+EBUILD comedilib-9999.ebuild 3729 RMD160 13a651d2e0ae799b07d8f6245780c210748e03e9 SHA1 af16da7a6a11a787a133e8cb246be2008a680fa9 SHA256 39e03e1516b5484fd8eb8800f5b27f8fac4f7268d98718082cf41dd170582dbf
 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 2abe6ab71e366acdb6bfbf70670c9f2e4b17ed6d..dae8b0a8f7b1c15cd5e34ca2a57752fc23692e90 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -51,7 +51,6 @@ src_prepare()
        if [ "${PV}" == "9999" ] ; then
                ./autogen.sh
        fi
-       epatch "${FILESDIR}/${P}"-comedilib.pc.in.patch
        if use python ; then
                epatch "${FILESDIR}/${P}"-setup.py.patch
                pushd "${S}/swig/python" || die "failed to pushd"
@@ -59,9 +58,6 @@ src_prepare()
                distutils_src_prepare
                popd || die "failed to popd"
        fi
-       if use ruby ; then
-               epatch "${FILESDIR}/${P}"-setup.rb.patch
-       fi
 }
 
 src_configure()

diff --git a/files/comedilib-9999-comedilib.pc.in.patch b/files/comedilib-9999-comedilib.pc.in.patch
deleted file mode 100644 (file)
index 4151fef..0000000
--- a/files/comedilib-9999-comedilib.pc.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/comedilib.pc.in b/comedilib.pc.in
-index 5aa1f86..498d51c 100644
---- a/comedilib.pc.in
-+++ b/comedilib.pc.in
-@@ -7,5 +7,5 @@ Name: Comedilib
- Description: Comedi Library
- Requires: 
- Version: @VERSION@
--Libs: -L${libdir} -lcomedi
-+Libs: -L${libdir} -lcomedi -lm
- Cflags: -I${includedir}

diff --git a/files/comedilib-9999-setup.rb.patch b/files/comedilib-9999-setup.rb.patch
deleted file mode 100644 (file)
index 9f6a6da..0000000
--- a/files/comedilib-9999-setup.rb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/swig/ruby/setup.rb b/swig/ruby/setup.rb
-index 424a5f3..228ec2e 100644
---- a/swig/ruby/setup.rb
-+++ b/swig/ruby/setup.rb
-@@ -41,6 +41,9 @@ def File.dir?(path)
-   File.directory?((path[-1,1] == '/') ? path : path + '/')
- end
- 
-+if ENV['DESTDIR'] then
-+  DESTDIR = ENV['DESTDIR']
-+end
- 
- class ConfigTable
-