Perl module installs now

(Portage version: 2.1.10.10/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 60 insertions, 19 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 946818b..3f83e0f 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  linux-gpib-3.2.16-r1.ebuild, +files/linux-gpib-3.2.16-perl.patch:
+  Perl module installs now
+
 *linux-gpib-3.2.16-r1 (12 Aug 2011)
 
   12 Aug 2011; <huettel@gentoo.org> +linux-gpib-3.2.16-r1.ebuild:
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index d63d4dd..41c7c4e 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 5065 RMD160 771744e7a028a4172d22632386e7c85c1f55837f SHA1 15508805090332142e53829f7c9a24224c6a387b SHA256 a4f0e05227b56245f3d84821a6d67ce988ab7863fd908d76e73e2bc9f7de29f0
+EBUILD linux-gpib-3.2.16-r1.ebuild 5142 RMD160 90e143d4938ecd07f584e6ee02ec0d865c96ddc1 SHA1 59da4208204fc082055ffd7ffcb4e18b532aca09 SHA256 f746b68dfa12e702efd6a61a7823160e493e8a135bc5809d0c65a9bcf6441b69
 EBUILD linux-gpib-3.2.16.ebuild 4983 RMD160 bb17a163e19ed8f9d8ca366b212aea16196c81d6 SHA1 5c3c85ed0167786bbdb8ffcabeea21a5679fbe45 SHA256 3b00b49f896832b934136a9553b0a060c0f47407491c520d2fc30a3b67cf8fb3
-MISC ChangeLog 1544 RMD160 015bc5151fbae59668c5710d0dbc7711b38c11ab SHA1 da9237debaa5bb79a24b3109dee1b0bba6edb1d8 SHA256 87558eace63f2129ff2f125b72ddd7bf2a2ea1112f4ebbd0f86ee69f6b3b903a
+MISC ChangeLog 1697 RMD160 26355053377ab415c525c0b3daaa345cc131ff79 SHA1 6fc288c3c655f7f545282ecf871c3790bdb3a19a SHA256 2bd0e10ee0c6ddfff7f8aa23b44fc83ebae35434486c3f10801a22a36d166ef7
 MISC metadata.xml 333 RMD160 53cc452da426b779f6231218f7700176efaa1418 SHA1 8041c003a5532b89964cd8b3deba4bf97a3a3b3f SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367
 MISC notes.txt 953 RMD160 841091fe3ca13eb445c491dd939002f93d68f2c1 SHA1 342345998d98760ec62cd865eb27a36d7f9acabc SHA256 ac285c8b8fc201521a1cc4e40e8fdd8530f0456a08cb0362bb22dccdd88ccc44
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJORye0AAoJENwGBM22xffe3RUP/0kA7Z5oXE7HvsYffzzFFyIs
+NPdnvM6iC0BnsZYj2ILWVMDWpGLLb6WRWzlxWmugHEACAg2eaD/WWqktpmLcxg9A
+smXhsYmZBZrK2c6c8tXq/Gp9ziv+icIE2l2YoTEh2pkXlCJfQK5S05tygJAD2sXu
+PdXR9ztc33SO5OaHLoEreObKJDawYygyz4KmcTAZ5L38qVTQXxeG+2ifTSo1n1Bj
+/pXzp4Vh2uini5SqU6pdaeox9fYmx5N47G6b3N4WJKbyJ6uTFarXV9xlyNmfjKEp
+SNxWp0bi9STH9l4CeX1JvQK9Jv0xonga25xK/PhnwAFiF4B0jfHXJTkb//aHDt78
+GMu1b7wUY0MRcNYP+bn+eBUbHlFmomdP9Ro+3y/KMY9lOYD/KttZuPVb+prpwY0r
+V24NgX4eGMFEHJnApXOxY1ryewuF+5WLVMwy0tWQ8y7j/W25dLGrTv2cAo4w+E8w
+0ihKdf+weee2w1dbzApasc6i6Whl2a+oZjBxQCo36G2RWj0oFtT+shTpxApsc7gJ
+TC9RDFpH6wJOjJ0AWdBzBvzWgx49db2iBz3XJ7U8cowd2GbCQJ1gqdaCAa6vrpuP
+XUfNML5tNFTitWPcvYD5kwf4NmxaTB2hBGOAQx88WmvoRwiIOzV9leRAkBit3Gg+
+pQovLp8J/BWfz8MpfGeR
+=BFmJ
+-----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 0000000..16f2f15
--- /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.16-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
index b43ed3b..37390bf 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r1.ebuild
@@ -3,7 +3,6 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.16.ebuild,v 1.1 2011/05/14 17:05:08 dilfridge Exp $
 
 EAPI=4
-
 PERL_EXPORT_PHASE_FUNCTIONS=no
 
 inherit base linux-mod autotools perl-module
@@ -32,7 +31,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-sgml-utils )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-3.2.15-build.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.15-build.patch"
+	"${FILESDIR}/${PN}-3.2.16-perl.patch"
+)
 
 pkg_setup () {
 	perl-module_pkg_setup
@@ -66,31 +68,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
+	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
+		DESTDIR=${D} perl-module_src_install
+		cd ${S}
+	fi
 
 	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
 	insinto /etc/udev/rules.d/
@@ -109,7 +116,6 @@ src_install () {
 	fi
 
 	if use firmware ; then
-
 		insinto "${FIRM_DIR}/agilent_8237a"
 		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_8237a/*
 
@@ -118,17 +124,18 @@ src_install () {
 
 		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"