Depend on Perl and call perl phase functions only if useflag perl is set, bug 433537

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 26 insertions, 14 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index c372b5b9e342..c47cb0c708f1 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/linux-gpib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.8 2012/08/25 16:45:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.9 2012/09/11 14:11:20 dilfridge Exp $
+
+  11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  linux-gpib-3.2.16-r3.ebuild:
+  Depend on Perl and call perl phase functions only if useflag perl is set, bug
+  433537
 
   25 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
   linux-gpib-3.2.16-r3.ebuild:
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 49135326e297..987ed4376dab 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -6,17 +6,23 @@ AUX linux-gpib-3.2.16-kernel-3.4-asm-includes.patch 2016 SHA256 fb3601ddd1de04cc
 AUX linux-gpib-3.2.16-perl.patch 471 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10 WHIRLPOOL cd3995233836621a1ce3440a38290ef5162816e9251a5ed6362b9b20ea084cf804d7ad9c246264cfe6246b6e90b7443daa80c7b27225374f2ca97e091456a3d7
 DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
 DIST linux-gpib-3.2.16.tar.gz 1189792 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e SHA512 41bac9b774e2023e0a6dc3f95cc25f883bf1b40a5e03d870b4f57761f4485189f05412b2c572f3648275a62c7eaf53a5e789610e1a123bf257598d31cb43e393 WHIRLPOOL 415023f7a838d46624a78a9085370dd178f57ac694927f4c565fa7dbd188bae1158faf1944c3abc2c8bd5c51ca321f9bb6921d1f0a332c1ecef4247c45f10f92
-EBUILD linux-gpib-3.2.16-r3.ebuild 5691 SHA256 4d361e422d7ba78147c7c291c289bc088725fb8415a7c8c6679ea030bb8b3351 SHA512 87b2e757982cc1c57e2475ef9aa2b2b8467f94c56ab4961045186cc26eb526429bf72f88e6cbc4e1d3e18bcf97a73c66ea0c88e89a89106f9c837d7dc3f56375 WHIRLPOOL 232c1ee929f2d3393f01ec967e591d897046245eface14c590bd942e50ec6ea378eae272d231bc7c9954a5cfdc83e2289b12f7ec1c1c5bdf69630773ad1a118f
-MISC ChangeLog 2092 SHA256 0aba3ab1cea664f9b01c6ab1a17f538797ce1e8efca03e11063e4d3c4277d8e4 SHA512 12579e999b43761e4f2ceb32606d91033f48d32feddae5f2993b68e67c0f7a2a8dcef6f1b83dbeea813897f151e19efc3c36f22d44b287ca862bbf87621ef93e WHIRLPOOL 321e0c54ec38646e6ed9c9500c1bce8f16188bf59ceda381f3ae015343187ae160c3d75ba8a55de3f2bb8252eee7558f379de6218ec8e0ce41fbf14a0bdf01bb
+EBUILD linux-gpib-3.2.16-r3.ebuild 5752 SHA256 bb39e81ccce34ca170fab7dc5d82edd796006d8b6e6c6d3f457c5232c3375c48 SHA512 6daaf8e63389c19e8448d7afa073b19d6229b4d3dd1bb5e9957d3b5441ef088280b290a6333264fa3e057a3ed98030af4330759589e264ce37796ab3d0caa36e WHIRLPOOL 2b2eba3b3de434cd522e328bf72dccccd47bb46efa586f30e4347e2b6fd18e6cf601bda4da10abcf866bb1acc20532ee42e67832775109a82a12d0bea8cc87fa
+MISC ChangeLog 2270 SHA256 ffa9fc087db15ef7542c4f86581955691914e993d31fa27aa382b8a32fd298a5 SHA512 b36d9e3335e7e65987c140162ffe21d6899f8a225535f385e9b712b4bfc71507d53bf997d0335cfe203087e09ba55d0a2b19074f70aeeda8897ca577db53c475 WHIRLPOOL db052997fad25d4a76910aa79c69cc915b071ec1b1fa78a4d6a7b310527f76d92f1f24fe01ae2a09e182be587ed45823a86e2aae265cc9e063a411781d892782
 MISC metadata.xml 333 SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367 SHA512 cbb7ec805e57e4724ec1845253b0af912484d931ca5b9841f653f9becaabe36b5442ca5a0a45aea75fe64aa68a4bc2f500a5fd030af9ced2cb21c22157ed0f8b WHIRLPOOL 7dcb1724a1b475cc1b219f70825bce373b4566a1d465b8e6e3acb1da030729e7f97d58996cd260cc857bac58dd9afaeae19d5a23d4008335523088ea1c5c2475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQOQE4AAoJEEdUh39IaPFNFA4H/iRNG++6/7syz5bowT+cFhVo
-0Kw2mGWWA/C3gTO8/9MWFiOhnbb1EUN/FwaYWeghaMj9ZImu7XNEWfWX7L2W8kVX
-OFoKr54+HfTiDdJniOv6dcOheF0FlEJtnC+zXFzvl32nSF4Sw/iCGH4gmHfJTX4A
-+kQ8DUz6Qu8GsbtG8Q8vHn8QMfojYGzBOh+aact0IiOmv5HoBF6fythjyrsM8CrA
-6sG78a7p+DmLe23udhgOyZJnawXInvEh8iT92TM9hgG4AhvhVJVT90DBqfBvGiRJ
-+9X2dpS8LBNpn+twjTCwxVVZOhm+jvestN5HCJLvPqgV3zIQKICBlmDf/le9jtk=
-=mr7P
+iQIcBAEBCAAGBQJQT0b6AAoJEEb+UGWnxTyHuLIP/2ztNDcFWdM0MmD9bxXQJaYc
+S19qHPK5s7GYyghE7aiwewPonT/lpmPpzVlpyerN/fPQVq5B2tneVKBIlJpfaLQN
+GFb1Wtp75T9g/HpiIU10bPede3RRUQUTlYHLOmUq0jV9IaP/s3fb2GhkMgZm9gEi
+eMwZjGGbco8Ae6l5jOJfvNJE6mg+9CIotF1dzw/cvEs3kwKNiJqCJIIHG+DlnMD6
+V2MjgPJcBbwXboi4OBLYhloBbgxG4tRXOY465o9O3wsxHcT8/XXFRulVHMhWbwxB
+gjHO0ZuEK5omoTZDlQURg/CJUXrNLp6UXM/7oZdoTOl9iN2dZlafvNSunPABXjA+
+YPoOUN7D6W3oHLuAEK8kKGUDt+QKgBWDQwkiWE+4mFOAqn2HAXG1cIYj61JDzHCg
+An+IPmCu2BNE04LD2DeTCuEHoSWM0DU23+pioOdm3wI2x46rYVa7dvIZerQptRUf
+r8gNPtsk//EjqQDqf3NVY9aTzywrADbYrBDd6w6tVJeGEo0Y6K2E8WopdH7xPpqJ
+ntGUyBpow2rscRZaBKh+RnJnIWjhwyOmz88OkO5sxBgFHvTNs9IMMxsvLoKnaUGR
+fijzJGoVDvHVTfU0FhvwAz4tvsl/JEndIcS25jvphL72kbbVtCWOynR8qj7W0qcS
+22az5TnBWYuL+tItq2sa
+=HblR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
index 13387b98a078..864c4800e785 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 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.16-r3.ebuild,v 1.3 2012/08/25 16:46:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild,v 1.4 2012/09/11 14:11:20 dilfridge Exp $
 
 EAPI=4
 PERL_EXPORT_PHASE_FUNCTIONS=no
+GENTOO_DEPEND_ON_PERL=no
 PYTHON_DEPEND="python? 2"
 
 inherit base linux-mod autotools perl-module python toolchain-funcs user
@@ -37,7 +38,7 @@ PATCHES=(
 )
 
 pkg_setup () {
-	perl-module_pkg_setup
+	use perl && perl-module_pkg_setup
 	python_pkg_setup
 	python_set_active_version 2
 	linux-mod_pkg_setup
@@ -139,13 +140,13 @@ src_install() {
 
 pkg_preinst () {
 	linux-mod_pkg_preinst
-	perl-module_pkg_preinst
+	use perl && perl-module_pkg_preinst
 	enewgroup gpib
 }
 
 pkg_postinst () {
 	linux-mod_pkg_postinst
-	perl-module_pkg_postinst
+	use perl && 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"