[gentoo-commits] dev/dilfridge:ni-experimental commit in: sci-libs/ni-pal/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     e887688db5da4ce98c06277abef1f81fb9fc1a02
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Tue Jun  7 18:35:19 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 18:35:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=e887688d

[sci-libs/ni-pal] Lots of cleanup and moving code to the eclass

(Portage version: 2.1.9.50/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 sci-libs/ni-pal/ChangeLog                 |    4 ++
 sci-libs/ni-pal/Manifest                  |   32 +++++++++---------
 sci-libs/ni-pal/ni-pal-2.5.4_beta2.ebuild |   51 ++++++++++++++---------------
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/sci-libs/ni-pal/ChangeLog b/sci-libs/ni-pal/ChangeLog
index 2879bc0..1a448d7 100644
--- a/sci-libs/ni-pal/ChangeLog
+++ b/sci-libs/ni-pal/ChangeLog
@@ -4,6 +4,10 @@
 
   07 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   ni-pal-2.5.4_beta2.ebuild:
+  Lots of cleanup and moving code to the eclass
+
+  07 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  ni-pal-2.5.4_beta2.ebuild:
   Added restrict
 
 *ni-pal-2.5.4_beta2 (07 Jun 2011)

diff --git a/sci-libs/ni-pal/Manifest b/sci-libs/ni-pal/Manifest
index 73570d6..f656131 100644
--- a/sci-libs/ni-pal/Manifest
+++ b/sci-libs/ni-pal/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 AUX ni-pal-2.5.4_beta2-envd 89 RMD160 beef1de7877d1c7514b5a1711bae2ff2e8bee503 SHA1 0d70896946bb332438e88be12df84f4e1aed0a96 SHA256 9de8b2519a071946c04207023eb76003b6195f2fa184725ab8d72f4d7f27d6c4
 AUX ni-pal-2.5.4_beta2-initscript 3169 RMD160 17a5ffb6ec26c6c4c2747991d22211a7f35d6547 SHA1 96db50622c9ec2edeb0af17ba935dc871c8cbbe4 SHA256 8e309ae5d3304e303af64e2e994738452485bd8044670ad4fc3639f3bdf6e196
 AUX ni-pal-2.5.4_beta2-nipalwrapper 130 RMD160 62e38127f8b04804fa6043a06e13e3ccbbf26a3e SHA1 586c4ac01cf2ef262a4e72534c700000d30925d6 SHA256 9be85468e596bef52884d43f74d5a068f0a382fc16150d990aed540f51111932
-DIST NI-VISA-Runtime-5.0.0-beta1.iso 6631424 RMD160 daa08768122cfd6b4ebf81a5e7a73a1c473940e5 SHA1 b1f8bdba00ced3a778992b3816f0f614a27bbcb8 SHA256 127fd35d515c90b1f20f0bdcf2d31842f94d1de2b42696223798e09dcfb9690e
-EBUILD ni-pal-2.5.4_beta2.ebuild 3308 RMD160 d0b490d4c3c334f64aa9b5f1c3d54cdd4c0f9809 SHA1 258e4b3cf6ee3c67447c53f0e06e3075e211858a SHA256 16dbc96c2924c885f6bcee206f416073ef60847531a80227ef51f8decb2a8385
-MISC ChangeLog 905 RMD160 8cbf6cfcfcbfd5052ba13ec621510fc336675dba SHA1 4539dac3d28811fb4fde3e13ee29decedae93865 SHA256 a6b60bce79ad26330d9d2577aa29c8fed156a5743fe3243a4215c724ec9a4a69
+DIST NI-VISA-5.0.0.iso 51918848 RMD160 800c2b9483dc314570f23affc5f424ae51cff678 SHA1 d2059e751404674f5c3553a79799bb588e29fcd5 SHA256 a244a3fa05077a9c3f9f435e327c0f307e994b46920ccb64e90f7e0a5a3ad18a
+EBUILD ni-pal-2.5.4_beta2.ebuild 2947 RMD160 4b0e61d64e0ee06cdc765564accbb569d0216d4f SHA1 2770b0de28b5f69eb0812913c49958e87d47d1b5 SHA256 48a066142ba73910635add5b493bb67eb5f09136cbba2607126d3552381f4ee8
+MISC ChangeLog 1040 RMD160 6d40b30b06e731f0ba320b1744749dabba5f8fdd SHA1 40a74cfe9710359ed4748ca882886eabf62da517 SHA256 259f609e844474042ec130ebc2bed35ef0383c1a5b13eddde1339db45633c3ad
 MISC metadata.xml 225 RMD160 aa7d7690bc9d41aa160500739ec29a5aecb24958 SHA1 a7fa143a3c80636c1f82827063de2327d4380d57 SHA256 3b760abcba804d12e90e8101abef730ff1be333e8c01f273f7a05e68f5f1df88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN7jCwAAoJEEb+UGWnxTyHUQMP/2CHuw00gKZL0tTUqsI1o9/X
-I7eZLaI6FzJbZq3RuPXFOom9eVtXkAHZA15jHuhEzLx4QpvtVXToS2ZHLs8Nbfw2
-Nim8Fy0eYUXatdjZ+vPopkKpB4/uMMdBw+paFkFCmH2EgcG503cp2JkkVqR6AMOu
-Chl46Lmumu5S8NKw7I2x/v21h8C3C75JEt3zqvj2wQDPGSSS+elfzBJjAEpJpMtz
-auN1FC4BeXZ1mwLXl4mfSMC+7EUtlEOaLrobrX01bIRstgwTw4PjGgqr6tLPJ015
-KWqAq+zjKN69/bSHdmTPY5RcfFPp9khgNnMUJvuhFnOJjOaNpBFc9Ge3p8obEuBQ
-nnVRGxznsCpO5K9gynjzOXbhU5jp6xeFaSeedH1ydJ7qh3X1nNrNh0+0qAgYpu8R
-a/YjvjYqRonk7wPZevt1mXzhV3HApw5xvP7swYj+Ioal786pdWzM5QsrcP2pS+iS
-aWBelY74O8Q4kdzYaWRrLnWSU+OX6QVBhZKWipHf6yQM7tQ8cNJBgMCbQk2Wsvrg
-vNDndDbWpJVdlufoUSChxey7NjBw2iYi0FPOQZ9yfcaS+OUvNewEgtz/xOao+X7E
-9dsVhfbFqrdZMQXX1asnIhe+vZRs/eELIiFOosfOWhUV9kvtC27MWoF58o1mTW80
-GwwnmSA8aihRIz7kP7iT
-=37gm
+iQIcBAEBCgAGBQJN7m9nAAoJEEb+UGWnxTyHcG4QAIuIDlxU/xH2w4UJP+GDVThS
+VXmFeIOqSKV/AqcWJ0nHbCkTdaqBBh2hFsC5TVGrRDX5SCh7nzr+2TjSCi6SUrkO
+r94+oEm+K94gyYXR/XFK9zQ13e5nXoTrCucYmoUzl814rea31mE0Qh1VBzjK3iGP
+zFcIGPLwSh4QTetcS4ywh48M+2VDBE++G1egYsz9rFyuSTIWNHBub+F005hR9P0d
+K0ZJKwtbvL8pZXgFcBfwQ6SG+lAQlJVFFRWhZaA0HmfcgzCDoJXH1z+hdTlIGEv2
+YwaqGCP7bdPvBONrlHoZWwnGDDSqMw3tWsS1OribU1qvt7xsGgQtDAEYzrz5bl/i
+ZKr1ywHmZQmaw0i6Ki10yDhSKzKUSCOh93vWnO3Eqpa1/NDPHN2dkGas7S2Kt6O0
+kLTrFNUrkd2Nwn+moPpI7gtv1TNoHX8F++Yo+hlxkVAwvcDeqOAEebaeUCQxgsgA
++RgZQbL7uD07HY/6zAioVYmBHvYWZynOBIr/DnInehzOAn+M8uqGvaf+Sdz+YJrX
+kH+ng8CKLhrvmRfF00LASXCDzaYlyArp/fwEG2fFgiJXzXf3LL0NJ+F7egW+gLjg
+gqWsubuaCjHfrYASZSs8u8JF7H05yHf0FQEh9266Y1//KZhwMddojQpw2b8PWIk8
+eN33qkqXMzlNy8//uS1+
+=8RZ/
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/ni-pal/ni-pal-2.5.4_beta2.ebuild b/sci-libs/ni-pal/ni-pal-2.5.4_beta2.ebuild
index 0774e19..c40ac31 100644
--- a/sci-libs/ni-pal/ni-pal-2.5.4_beta2.ebuild
+++ b/sci-libs/ni-pal/ni-pal-2.5.4_beta2.ebuild
@@ -2,53 +2,49 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
-inherit eutils multilib ni-driver
+inherit ni-driver
 
 DESCRIPTION="National Instruments NI-PAL service manager"
-SRC_URI="http://ftp.ni.com/support/softlib/visa/NI-VISA/4.5/Linux/NI-VISA-4.5.0.iso -> NI-VISA-Runtime-5.0.0-beta1.iso"
+SRC_URI="http://ftp.ni.com/support/softlib/visa/NI-VISA/5.0/linux/NI-VISA-5.0.0.iso"
 
-KEYWORDS=""
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=sci-libs/ni-kal-1.10.0"
+RDEPEND="sci-libs/ni-kal"
 DEPEND="${RDEPEND}"
 
-NI_RPMFILES="nivisa-runtime-5.0.0b5.tar.gz.dir/rpms/nipali-2.5.4-b2.i386.rpm"
-use amd64 && NI_RPMFILES+=" nivisa-runtime-5.0.0b5.tar.gz.dir/rpms/nipalki-2.5.4-b2.x86_64.rpm"
-use x86 && NI_RPMFILES+=" nivisa-runtime-5.0.0b5.tar.gz.dir/rpms/nipalki-2.5.4-b2.i386.rpm"
-
 QA_PRESTRIPPED="/usr/sbin/nipalsm /opt/natinst/nipal/sbin/nipalsm"
 
-RESTRICT="bindist mirror primaryuri"
+src_unpack() {
+	NI_RPMFILES=( "nipali*.rpm" )
+	use amd64 && NI_RPMFILES=( ${NI_RPMFILES[@]-} "nipalki*.x86_64.rpm" )
+	use x86 && NI_RPMFILES=( ${NI_RPMFILES[@]-} "nipalki*.i386.rpm" )
 
-src_install() {
-	# now lets merge the rpm contents
-	mkdir "${S}/merged"
-	for rdir in ${NI_RPMDIRS}; do
-		cp -a -i "${S}/$rdir"/* "${S}/merged/"
-	done
+	ni-driver_src_unpack
+}
 
+src_install() {
 	# main installation
 	dodir ${NI_PREFIX}/natinst
-	cp -a ${S}/merged/usr/local/natinst/* ${D}${NI_PREFIX}/natinst/
+	cp -a "${S}"/usr/local/natinst/* "${D}${NI_PREFIX}"/natinst/ || die
 
 	# register configuration directory
 	dodir /etc/natinst
 	dosym ${NI_PREFIX}/natinst/nipal/etc /etc/natinst/nipal
-        echo "${NI_PREFIX}/natinst/nipal" > ${D}${NI_PREFIX}/natinst/nipal/etc/nipal.dir
+	echo "${NI_PREFIX}/natinst/nipal" > "${D}${NI_PREFIX}"/natinst/nipal/etc/nipal.dir
 
 	# shared libraries
-	dolib.so ${S}/merged/usr/local/natinst/nipal/lib/libnipalu.so.* 
+	dolib.so "${S}"/usr/local/natinst/nipal/lib/libnipalu.so.*
 
 	# service manager
-	dosbin ${S}/merged/usr/local/natinst/nipal/sbin/nipalsm
+	dosbin "${S}"/usr/local/natinst/nipal/sbin/nipalsm
 
 	# the runlevel scripts
-	doinitd ${S}/merged/usr/local/natinst/nipal/etc/init.d/nipal
-	newinitd ${FILESDIR}/${P}-nipalwrapper nipalwrapper
+	doinitd "${S}"/usr/local/natinst/nipal/etc/init.d/nipal
+	newinitd "${FILESDIR}/${P}"-nipalwrapper nipalwrapper
 
 	dodir /var/lib/natinst/nipal
 	dodir /var/lock/subsys
@@ -56,13 +52,13 @@ src_install() {
 	dodir ${NI_PREFIX}/natinst/nikal/etc/clientkdb/nipal
 	dosym ${NI_PREFIX}/natinst/nipal/src/objects/nipalk-unversioned.o ${NI_PREFIX}/natinst/nikal/etc/clientkdb/nipal/
 
-	newenvd ${FILESDIR}/ni-pal-$PV-envd 81nipal
+	newenvd "${FILESDIR}/ni-pal-${PV}-envd" 81nipal
 
 	# We create the NI share directory already here since it is (ahem...) shared 
 	# between different packages using ni-pal. It contains only etc/share.dir though...
 	#
 	dodir ${NI_PREFIX}/natinst/share/etc
-	echo "${NI_PREFIX}/natinst/share" > ${D}${NI_PREFIX}/natinst/share/etc/share.dir
+	echo "${NI_PREFIX}/natinst/share" > "${D}${NI_PREFIX}"/natinst/share/etc/share.dir
 	dosym ${NI_PREFIX}/natinst/share/etc /etc/natinst/share
 
 	dodir ${NI_PREFIX}/natinst/share/errors/English
@@ -81,8 +77,11 @@ src_install() {
 pkg_postinst() {
 	ni-driver_pkg_postinst
 
-	elog "This is the moment when all drivers depending on ni-pal should be rebuilt. So, running updateNIDrivers now."
+	elog "Running updateNIDrivers."
+	echo
 	${NI_PREFIX}/natinst/nikal/bin/updateNIDrivers
 
-        elog "You should start /etc/init.d/nipalwrapper now and/or add it to your default runlevel."
+	echo
+	echo
+	elog "You should start /etc/init.d/nipalwrapper and/or add it to your default runlevel."
 }