Override localstatedir in comedi-calibrate's econf call (now "${EPREFIX}"/var).

diff --git a/sci-misc/comedi-calibrate/Manifest b/sci-misc/comedi-calibrate/Manifest
index 55584088b030c30107ededfb75bf067826320ff2..a4f1c5555f6365f59887afd35b40d8f1f968839a 100644 (file)
--- a/sci-misc/comedi-calibrate/Manifest
+++ b/sci-misc/comedi-calibrate/Manifest
@@ -1,5 +1,5 @@
 AUX comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch 515 RMD160 dcae09bccde0d5637a738b1bbc16dc7a97d71822 SHA1 6b4dee6c7e265aa328a9346de38bce8610a6a345 SHA256 f57712e52dab67cb7d1f45665ffe27d55ef77b3dcc1280b53a8d2032ea6d2cd7
 AUX comedi_calibrate.8 4900 RMD160 64859e216bc54b4010c227bd3efa9ad9ce2c1d1e SHA1 78a575d045a874ed1bdceddece22049d8637e1ab SHA256 5f96b0e24cd5590197747d64d28e7ec99e724d4ea846f84abb921d4dc4a8fe2f
-EBUILD comedi-calibrate-9999.ebuild 904 RMD160 22da78f51581af2fef24be8a784a6c48475ffbd3 SHA1 a1e7e4c8a2ce0a4601869850fdcba68b15ed5014 SHA256 131efe1524b30914c07d3354eba7e5306675d2dd576702311d6049cf1f0527d0
+EBUILD comedi-calibrate-9999.ebuild 1249 RMD160 833b4d33bf05d53904060e7784b16f5c164d506c SHA1 3d3dc44232e752ad57072494234dd49948d17c24 SHA256 bd9e88bc5b001d05335cace23248220e9cfea92ea36f95f718b9ac72750dd34b
 MISC ChangeLog 792 RMD160 6e22e5ed7fa1d3ef38fe8d11c420a0240f03e1ca SHA1 b98269489344612e965364e942f93a0b0406b1e9 SHA256 e2b6bbceb9fc1f9c61cda9b0a3324d67e5fa3de3adf6a241e0e06db50a865faa
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/sci-misc/comedi-calibrate/comedi-calibrate-9999.ebuild b/sci-misc/comedi-calibrate/comedi-calibrate-9999.ebuild
index c18f243b5ced0163ddf12fb3463af305ff260bf3..5fa05917535fff6dd950285296dc49389cb4640d 100644 (file)
--- a/sci-misc/comedi-calibrate/comedi-calibrate-9999.ebuild
+++ b/sci-misc/comedi-calibrate/comedi-calibrate-9999.ebuild
@@ -39,6 +39,16 @@ src_prepare()
        fi
 }
 
+src_configure()
+{
+       # by default, Gentoo uses `"${EPREFIX}"/var/lib` for
+       # localstatedir, but the GNU folks recommend $(prefix)/var.
+       #   http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+       # Comedi expects to be configured with the GNU form, otherwise we
+       # get /var/lib/lib/comedi.
+       econf --localstatedir="${EPREFIX}"/var
+}
+
 src_install()
 {
        emake DESTDIR="${D}" install