Make the perl bindings actually install; things should be compiled during the compile phase; remove old

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 69 insertions, 43 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 798487cf62b4..7491da1dab6e 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/linux-gpib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.2 2011/05/14 17:05:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.3 2011/08/14 11:22:30 dilfridge Exp $
+
+*linux-gpib-3.2.16-r1 (14 Aug 2011)
+
+  14 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -linux-gpib-3.2.15.ebuild, +linux-gpib-3.2.16-r1.ebuild,
+  +files/linux-gpib-3.2.16-perl.patch:
+  Make the perl bindings actually install; things should be compiled during the
+  compile phase; remove old
 
 *linux-gpib-3.2.16 (14 May 2011)
 
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index ae8d21d731ec..2907626db34a 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA512
 
 AUX linux-gpib-3.2.15-build.patch 1681 RMD160 0d462f8d25790806c9699f6d5e480221f59e8978 SHA1 b421f3ef440426df3fa5e704c88495c1d8271664 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704
+AUX linux-gpib-3.2.16-perl.patch 471 RMD160 9702c06a8ff7390105d217733487d5a2ceaf1073 SHA1 0476bfbf1f581fdbec391e7469893a02ca764f27 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc
 DIST gpib_firmware-2006-11-12.tar.gz 169357 RMD160 9784b026ef41ce75439c635610ec56f037e88499 SHA1 584f9ffeba8194ab5d44fdfd4c97ab919750596c SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701
-DIST linux-gpib-3.2.15.tar.gz 1150433 RMD160 010d88374c8c6b243f4cffa292c70983c59c989a SHA1 405deb45972fd4e9a0648fca1182260dc7caa84f SHA256 0489ef5ce337a8a5b0d6ca702aee8b0218c3d5c07dc92b50330e80d50e769682
 DIST linux-gpib-3.2.16.tar.gz 1189792 RMD160 943f6c09ec54b03c7179bace50d2a3b9e0e413a0 SHA1 1f6e501a4f84da39ffccf9f2fd45d390f5d96f75 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e
-EBUILD linux-gpib-3.2.15.ebuild 5096 RMD160 bd7f937f4e6c0390cf22a006a635dd6b7cdcc9d1 SHA1 599fb05ca34775f7f09eb61e2f50c3e8e3042eee SHA256 b78eebd993cc358b8b0421ab7ea53fcb0fb2b36ffbd0cdacfe78d8f0e8e746bc
+EBUILD linux-gpib-3.2.16-r1.ebuild 5252 RMD160 5e30d49a2ec03a0eccb61eabebb37a0f58c28ef1 SHA1 059f7b27c14372778592b9048f2b624559980f45 SHA256 e1599bda51b8f79bcb48f9947b6e6de1801dd7912fa8dd7e8b4a9f460f7a31a8
 EBUILD linux-gpib-3.2.16.ebuild 4983 RMD160 bb17a163e19ed8f9d8ca366b212aea16196c81d6 SHA1 5c3c85ed0167786bbdb8ffcabeea21a5679fbe45 SHA256 3b00b49f896832b934136a9553b0a060c0f47407491c520d2fc30a3b67cf8fb3
-MISC ChangeLog 783 RMD160 d0a260fe210debbb04a90bff592dd89a8ccfd6a4 SHA1 a4d46b447d7c8435b243df7dee1917548cec739a SHA256 d9f879934e91d16e7e1d76c8fefc7c3fd00d173d1d8a88b0529df7c55083b1d2
+MISC ChangeLog 1084 RMD160 aa1d5e511ce5d73971809dda5bf666c0f9957ba1 SHA1 30e733512f3f1c8be09b3d2bddd84352adea425b SHA256 41eb23d0173757927b3d256edb7b24c82159a27acddb083a0d16c5565a1e31b7
 MISC metadata.xml 333 RMD160 53cc452da426b779f6231218f7700176efaa1418 SHA1 8041c003a5532b89964cd8b3deba4bf97a3a3b3f SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNzrspAAoJENwGBM22xffeyrMP/ictayEkVnAcczdGyQD7AXKO
-hZSPZprsfcQXtMRhl+pSKOL2jGXNIDsP9ZcXFG+O3f+kJx+t0aRgMW/TZPLI76BY
-ArSBldGLwYfuqZJDBpqurBnSb715BCAySCRsKff0XTLquSs0ofYe3MKCb05yZPad
-rZDU5it0j0d5hLOFdTQMzPxtPIUf7yBdLBqBsElAEo13vU3rb+/4IFpt3GQ2TmLo
-+mzieaUoJJedq3WDh33r66cfMaKntvbG2aLJYJO8oJM1K7kU8MM3HwA1izHEgYol
-gZn8j9yRcZtOVgzJa6x+ngfMe9UH97pHQMWjL09NJGrTc/HQbnRtHuTq1ECkAMwy
-0vLB7ykCb/zMc8uGQVz+2ABudOeAIHSccT1/HCqP+u9eUeqpms3mYt7aXwxhAT7D
-dCLabeWHTK7XY2agSXq/Ed/o8265cjGaMUd3fzCkrp+7+Xe0oFp0gmClYksEecnc
-ZSTFgZNXv68NTs107j89xqKL9rnqqFs5O/b//shX7UC8hju/VTyU89fe9cdXR2RJ
-EN3F+/egl2fKQ1ww6grg1hrPN0ndfp4Dh+vuqqN25I75F8YqmG+7ASqJ227BG00a
-MS3I0bU6J/I/pUb853m6gojspV0NF8o7BuBBVXstwprIcIgcA5DTZ7VtPyDA9sjq
-tPOtBS9kK/tTyGwgmZjm
-=sYga
+iQIcBAEBCgAGBQJOR7ADAAoJENwGBM22xffeJ4sP/10q98s0ksHIZ/Ot7dwIse/Q
+0F+ahcm7y7hTDs9kIvxFOyBkF1LHM+JdQvVx3oD+Fu08qxWZjvQQ1P07EBeS/GFw
+A/g4C80sU03WHJ2KEHML2sG+IHoWMcKaw/u86mngGAqS77B+VnLBGGjHRCZppLQZ
+fm5yVLLBGAl0o34OVFpZKfw481fczt89Pp5FkNNHNWurbB2yFeABpr/wYU9xyUua
++ZpLaVgMfgFSZNZ4u4/bDGynzKHfL8N/takHT1r8jynPUPfN+dsWhOJIVOc5/RWL
+k4ZEOtkQJDXGh81aRixbvICyzwxkmoQqJ3u7KqRLpv7ac0Ls6bRwiYnajiRIGeaF
+R9rq81V+GG9eFr1o8/uhX8PROZc+1y1oDm3YEZjorDopebvuWt5zkwOw6Dhga8we
+A9cmCKFHotpc+xW2zgGA+ZBtVNUN8sg2PwiR4t7BU2JtMrfKGBfJBlLAvYFWeCB7
+Su40FKFdZ+JR3YayDdxSAxzHhNT/S4KhARGlroicwN0C/BpPrhAtScLM5BBLTzFx
+v2kDFy2hZf/0E8UCUBLtjS98pYiY/GlfqGj93sCVFKhLJX6zU6FkCpCTvb38tIKx
+FoXudLU++mhN+C6Nj7SYzqPC4/mvhdjQ+YIiyR3HywRsrAptFJcid9gdSx0XZdjb
+OsApPJeQTUReL/mHtoPh
+=3fcP
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
new file mode 100644
index 000000000000..16f2f15b0ad7
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
@@ -0,0 +1,9 @@
+diff -ruN linux-gpib-3.2.16.orig/language/Makefile.am linux-gpib-3.2.16/language/Makefile.am
+--- linux-gpib-3.2.16.orig/language/Makefile.am	2009-09-16 19:26:53.000000000 +0200
++++ linux-gpib-3.2.16/language/Makefile.am	2011-08-14 03:32:53.000000000 +0200
+@@ -67,4 +67,4 @@
+ 	$(RM) perl/Makefile
+ 
+ perl/Makefile:
+-	-(cd perl && $(PERL) Makefile.PL)
++	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
index e301d23e5e43..cccdd3748da2 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild,v 1.1 2011/01/31 22:29:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild,v 1.1 2011/08/14 11:22:30 dilfridge Exp $
 
-EAPI=3
+EAPI=4
+PERL_EXPORT_PHASE_FUNCTIONS=no
 
-inherit base linux-mod autotools
+inherit base linux-mod autotools perl-module
 
 DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="http://linux-gpib.sourceforge.net/"
@@ -16,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pcmcia static debug guile perl php python tcl doc firmware"
 
-RDEPEND="
+COMMONDEPEND="
 	tcl? ( dev-lang/tcl )
 	guile? ( dev-scheme/guile )
 	perl? ( dev-lang/perl )
@@ -24,21 +25,26 @@ RDEPEND="
 	python? ( dev-lang/python )
 	firmware? ( sys-apps/fxload )
 "
-
-DEPEND="${RDEPEND}
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
 	sys-kernel/module-rebuild
 	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )
 "
 
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.15-build.patch"
+	"${FILESDIR}/${PN}-3.2.16-perl.patch"
+)
 
 pkg_setup () {
+	perl-module_pkg_setup
 	linux-mod_pkg_setup
 
 	case ${KV_MINOR} in
 		4) die "This version of Linux-GPIB requires a version 2.6.x of the Linux kernel. 2.4.x kernels are supported by Linux-GPIB versions 3.1.x." ;;
 		6) ;;
-		*) die "Unsupported kernel version '${KV}'." ;;
+		*) die "Unsupported kernel version '${KV_FULL}'." ;;
 	esac
 
 	if [ ${KV_PATCH} -lt 8 ] ; then
@@ -63,30 +69,36 @@ src_configure() {
 		$(use_enable python python-binding) \
 		$(use_enable tcl tcl-binding) \
 		$(use_enable doc documentation) \
-		--with-linux-srcdir=${KV_DIR} \
-		|| die
+		--with-linux-srcdir=${KV_DIR}
 }
 
 src_compile() {
-	emake || die
+	set_arch_to_kernel
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR=${D} \
+		INSTALL_MOD_PATH=${D} \
+		HOTPLUG_USB_CONF_DIR=${D}/etc/hotplug/usb \
+		USB_FIRMWARE_DIR=${D}${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
 }
 
 src_install () {
-
+	set_arch_to_kernel
 	FIRM_DIR=/usr/share/usb
-
-	# Here I changed the sbindir in order to install the gpib_config to /sbin,
-	# not /usr/sbin. This is done to enable running gpib_config from
-	# the modprobe.conf file: if /usr is not in the root file system,
-	# but a mounted partition then gpib_congig cannot be found in the moment when
-	# modprobe is run.
-	make \
+	emake \
 		DESTDIR=${D} \
 		INSTALL_MOD_PATH=${D} \
 		HOTPLUG_USB_CONF_DIR=${D}/etc/hotplug/usb \
 		USB_FIRMWARE_DIR=${D}${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html \
-		install || die "install problem"
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}/language/perl" || die
+		DESTDIR=${D} perl-module_src_install
+		cd "${S}" || die
+	fi
 
 	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
 	insinto /etc/udev/rules.d/
@@ -105,29 +117,26 @@ src_install () {
 	fi
 
 	if use firmware ; then
-
-		dodir "${FIRM_DIR}/agilent_8237a"
 		insinto "${FIRM_DIR}/agilent_8237a"
 		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_8237a/*
 
-		dodir "${FIRM_DIR}/ni_gpib_usb_b"
 		insinto "${FIRM_DIR}/ni_gpib_usb_b"
 		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
 
-		dodir "/usr/share/linux-gpib/hp_82341"
 		insinto "/usr/share/linux-gpib/hp_82341"
 		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/*
-
 	fi
 }
 
 pkg_preinst () {
 	linux-mod_pkg_preinst
+	perl-module_pkg_preinst
 	enewgroup gpib
 }
 
 pkg_postinst () {
 	linux-mod_pkg_postinst
+	perl-module_pkg_postinst
 
 	einfo "You need to run the 'gpib_config' utility to setup the driver before"
 	einfo "you can use it. In order to do it automatically you can add to your"