Bump to sci-libs/comedilib-9999 and add sci-misc/comedi-headers-9999.

The tricky part is handling /usr/include/comedi.h, which is supplied
by:

* the kernel's staging comedi drivers (but not installed)
    drivers/staging/comedi/comedi.h
* the Comedi module (installed via sci-misc/comedi-headers):
    include/linux/comedi.h
* the Comedilib module (not installed)
    include/comedi.h

The current CSV sources are very similar, but there are reasonable
differences with the staging version.  Hopefully everything works out
;).

The dependency setup is based on media-libs/alsa-lib and
media-sound/alsa-headers, which have to deal with a similar setup (in
kernal driver, out of kernal driver, and userspace library).

diff --git a/ChangeLog b/ChangeLog
index 3bd101ddea1c816e90c787f3847166baf9cecce3..b2c3ba93880430119e6b0cfde36a04afa702d8f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/comedilib/Attic/ChangeLog,v 1.3 2006/03/13 17:51:20 caleb dead $
 
+*comedilib-9999 (08 Dec 2010)
+
+  08 Dec 2010; W. Trevor King <wking@drexel.edu> +comedilib-9999.ebuild, -comedilib-0.7.21.ebuild, -comedilib-0.7.22.ebuild:
+  Merged previous ebuilds into a new CVS-based ebuild.
+
 *comedilib-0.7.22 (08 Dec 2010)
 
   08 Dec 2010; W. Trevor King <wking@drexel.edu> +comedilib-0.7.22.ebuild:

diff --git a/Manifest b/Manifest
index 47d1b0be1f0dd44f354cbaf22f4a3cd993d54d0c..cb7805a759aa567e9f8f7e7039482224b3a9ec80 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,5 +1,3 @@
-DIST comedilib-0.7.21.tar.gz 632737 RMD160 c1c8dae1b45d9b017acd772b0a1cecaeecf50604 SHA1 315abb7f9da4c0ff65128f2a2d3921e85c5b8d72 SHA256 6b6eed98b44b29a10cdf6617ee04075e3e815a4e34dbee9efe7fef1a97d1530a
-EBUILD comedilib-0.7.21.ebuild 668 RMD160 b591f54472efc6c4f2e7fd8b31eafdc8b6072db8 SHA1 d2f0d8cd9e2cea9cce85f30e10830b62410f62c3 SHA256 f8cb10f9dd93ddb7278c06ca97d77cc6c5bdd1899dd871dd82bb082de4a841a1
-EBUILD comedilib-0.7.22.ebuild 781 RMD160 15ffed7e2ba26cf4811e2cf6d8d7a5800507c682 SHA1 b65bbe37e79e12c38a59c9e68a5a4cc10470b0eb SHA256 ed3d04ca25f5908f4ed8127671b51e58b16bfb32ba3bd4638e9e141806bcac35
-MISC ChangeLog 956 RMD160 e77a9f10c4b3a582a8bd91801f3d35ea625f1cc6 SHA1 2e929cbc4c622733e7cdeee12d8296bfc6c880ac SHA256 3bde4bb822939f0d212c37e3a689ada410d048e694f8d2cba70da5f3eb48d899
-MISC metadata.xml 249 RMD160 d316d15ef8c780f89752527285ebea79b2ea55d1 SHA1 0fbeb42565a3b718f6391cb102e00043b8a58a5f SHA256 cabe6432e8542045f36995984a1ff975953bf490601b714b7e47f21ec9dff631
+EBUILD comedilib-9999.ebuild 1196 RMD160 d6c67195995b59c509553e8643286668e2b4f213 SHA1 0271ff01fb36619157f994e93d503273f2d4d2b0 SHA256 a7d668f9ec5f0a16605b3c2ae1ea5ce975647ae9a9a699f508f5cc26701c8ea9
+MISC ChangeLog 1168 RMD160 62c9992630de85e02a25d5a4cc077386211b8859 SHA1 bc9d91fff9c4f05804d564f5e55fd63ed99c3426 SHA256 6766a0d3f76055ed559975a91df6f2876289f129248fa739853da0d2606bec9f
+MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/comedilib-0.7.21.ebuild b/comedilib-0.7.21.ebuild
deleted file mode 100644 (file)
index 84cdca0..0000000
--- a/comedilib-0.7.21.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/comedilib/Attic/comedilib-0.7.21.ebuild,v 1.2 2006/03/13 17:51:20 caleb dead $
-
-IUSE="python doc"
-DESCRIPTION="comedilib - Userspace utility for comedi"
-SRC_URI="http://www.comedi.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.comedi.org"
-KEYWORDS="x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND=">=sci-misc/comedi-0.7.63
-       python? ( dev-lang/python )
-       doc? ( app-text/docbook2X )"
-
-src_compile()
-{
-       ./configure --prefix=${D}/usr --localstatedir=${D}/var
-       make
-}
-
-src_install()
-{
-       make install
-       keepdir /var/calibrations
-}
-

diff --git a/comedilib-0.7.22.ebuild b/comedilib-0.7.22.ebuild
deleted file mode 100644 (file)
index a6230c5..0000000
--- a/comedilib-0.7.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/comedilib/comedilib-0.7.22.ebuild,v 1.3 2004/06/24 21:56:04 agriffis Exp $
-
-ECVS_SERVER="cvs.comedi.org:/cvs/comedi"
-ECVS_MODULE="comedilib"
-inherit cvs
-
-IUSE="python doc"
-HOMEPAGE="http://www.comedi.org"
-KEYWORDS="x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND=">=app-sci/comedi-0.7.63
-        python? ( dev-lang/python )
-        doc? ( app-text/docbook2X )"
-
-S="${WORKDIR}/${PN}"
-
-src_compile()
-{
-        ./autogen.sh
-        ./configure --prefix=${D}/usr --localstatedir=${D}/var
-        make
-}
-
-src_install()
-{
-        make install
-        keepdir /var/calibrations
-                               dosym ${D}/usr/lib/libcomedi.so ${D}/usr/lib/libcomedi.so.0
-}

diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
new file mode 100644 (file)
index 0000000..8edeeb8
--- /dev/null
+++ b/comedilib-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+#inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+       ECVS_SERVER="cvs.comedi.org:/cvs/comedi"
+       ECVS_MODULE="comedilib"
+       ECVS_LOCALNAME="${P}"
+       inherit cvs
+       SRC_URI=""
+else
+       SRC_URI="http://www.comedi.org/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="Userspace interface to Comedi kernel modules."
+HOMEPAGE="http://www.comedi.org"
+
+IUSE="python ruby doc"
+KEYWORDS="x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+DEPEND=">=sci-misc/comedi-headers-${PV}
+       sys-devel/flex
+       sys-devel/bison
+       python? (
+               dev-lang/swig
+               dev-lang/python
+       )
+       ruby? (
+               dev-lang/swig
+               dev-lang/ruby
+       )
+       doc? ( app-text/xmlto )"
+RDEPEND=""
+
+src_compile()
+{
+       if [ "${PV}" == "9999" ] ; then
+               ./autogen.sh
+       fi
+       econf \
+               $(use_enable python python-binding) \
+               $(use_enable ruby ruby-binding) \
+               $(use_enable doc docbook-binding) \
+               || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install()
+{
+       emake DESTDIR="${D}" install || die "emake install failed"
+       keepdir /var/calibrations
+       # comedi.h already installed by sci-misc/comedi-headers
+       rm ${D}/usr/include/comedi.h || die "failed to remove comedi.h"
+}

diff --git a/metadata.xml b/metadata.xml
index 44a4ca1eb246e553753d0726bbf2921983683878..d1249280a90c19f6fc967e1236aa084daa0a520e 100644 (file)
--- a/metadata.xml
+++ b/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>caleb@gentoo.org</email>
-  <name>Caleb Tennis</name>
-</maintainer>
+       <herd></herd>
+       <maintainer>
+               <email>wking@drexel.edu</email>
+               <name>W. Trevor King</name>
+       </maintainer>
 </pkgmetadata>