From 8449413e1a840b92210d793435080544798ab831 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 8 Mar 2012 13:13:37 -0500 Subject: [PATCH] Update comedilib ebuild to fix doc installation. --- ChangeLog | 20 ++++++++++++++++++++ Manifest | 4 ++-- comedilib-9999.ebuild | 17 ++++++++--------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 102eb75..c024b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,26 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*comedilib-9999 (08 Mar 2012) + + 08 Mar 2012; W. Trevor King comedilib-9999.ebuild + Only try and install `demo/.deps` if it exists. I was getting + errors like: + install: cannot stat `demo/.deps/*': No such file or directory + !!! doins: demo/.deps/* does not exist + I'm not sure what changed, since there's nothing new with the demo + directory since March 2010. Perhaps an autotools update? Anyhow, + if autotools doesn't create the dependency directory, it must not + need it to build the demos. + + There is also no need to remove `comedi_calibrate.8`, now that that + change has been accepted upstream: + http://comedi.org/git?p=comedi/comedilib.git;a=commit;h=b09e05a776f0f8ea9a71d19c021a7a8516935b90 + + Finally, I fixed some minor `DOCINTO` quoting issues, disabled + compression for the `demo` directory, and inherited `eutils` for + `epatch`. + *comedilib-9999 (25 Jan 2012) 25 Jan 2012; W. Trevor King comedilib-9999.ebuild diff --git a/Manifest b/Manifest index a46e730..db457a1 100644 --- a/Manifest +++ b/Manifest @@ -1,4 +1,4 @@ AUX comedilib-9999-demo-Makefile.patch 2512 RMD160 4f827f6ff33f3a74eda57b5298c39d725d5dcddc SHA1 e40a18d3a8084b297079f6de3bf84f7221083d2c SHA256 510fba930ae097c5bd9cf850381a7217e30a026180b68bea316fb2c2085a5a7d -EBUILD comedilib-9999.ebuild 3735 RMD160 146c2d12ffeeeaba5565ba44ad50ef174e8e1964 SHA1 732f8792cfddfdbe4156fcdd06665d8fdf355646 SHA256 5b25fc2019c013842e5ac3773d7a59d91fb8199d29add9132f9b31296859b156 -MISC ChangeLog 2748 RMD160 5aceaa8d15c20bd4d91a089640c805f633b103cc SHA1 454dd350ec4675cdd89003af0d4219ffd6b66673 SHA256 03a37176c71e866d597796f1430e5b1618103d2ae46c7caa91acd7f8028f1ffa +EBUILD comedilib-9999.ebuild 3662 RMD160 e50394d49b8ee04a39cbf4d34e91c281a3255d1c SHA1 8dbd35a4e42a8bd700a0000f758b16bd4b9b6598 SHA256 2b2669b617e254dfdd7fbb6fd0e4cffceffa2028f730a79e65dae5828a64b327 +MISC ChangeLog 3631 RMD160 076cd06afc97cc592b15590b96cfe324121cbcde SHA1 0d2f83f6a91e6f109aa9453c6a080bff61f4db19 SHA256 371af166d00b049f3a6071ae2ef4833e730f201bc5fe4e1ae571ba850a591382 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild index a446f29..1089c49 100644 --- a/comedilib-9999.ebuild +++ b/comedilib-9999.ebuild @@ -7,7 +7,7 @@ EAPI="4" PYTHON_DEPEND="python? 2" RESTRICT_PYTHON_ABIS="3.*" -inherit distutils +inherit distutils eutils if [[ ${PV} == "9999" ]] ; then inherit git-2 @@ -107,16 +107,19 @@ src_install() popd || die "failed to popd" insinto "${DOCINTO}/demo" doins demo/Makefile demo/README demo/*.c demo/*.h || die "doins failed" - insinto "${DOCINTO}/demo/.deps" - doins demo/.deps/* + if [ -d demo/.deps ]; then + insinto "${DOCINTO}/demo/.deps" + doins -r demo/.deps + fi if use python ; then - insinto ${DOCINTO}/demo/python + insinto "${DOCINTO}/demo/python" doins demo/python/README demo/python/*.py || die "doins failed" fi if use ruby ; then - insinto ${DOCINTO}/demo/ruby + insinto "${DOCINTO}/demo/ruby" doins swig/ruby/README swig/ruby/demo/*.rb swig/ruby/demo/{cmd,inp,outp} || die "doins failed" fi + docompress -x "${DOCINTO}/demo" else rm -rf "${DDOCINTO}" fi @@ -132,10 +135,6 @@ src_install() fi # comedi.h already installed by sci-misc/comedi-headers rm "${D}/usr/include/comedi.h" || die "failed to remove comedi.h" - # comedi_calibrate is a separate package - pushd "${D}/usr/share/man/man8/" || die "failed to pushd" - rm comedi_calibrate.8* - popd || die "failed to popd" } pkg_postinst() -- 2.26.2