Fix building against dev-lang/perl-5.18. Move configuration logic to src_configure().

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 58 insertions, 10 deletions

diff --git a/net-analyzer/symon/ChangeLog b/net-analyzer/symon/ChangeLog
index 329160f36203..393095cdf9ed 100644
--- a/net-analyzer/symon/ChangeLog
+++ b/net-analyzer/symon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/symon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.15 2014/06/24 01:31:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.16 2014/07/30 14:49:12 jer Exp $
+
+  30 Jul 2014; Jeroen Roovers <jer@gentoo.org> symon-2.86-r1.ebuild,
+  +files/symon-2.86-perl-5.18.patch:
+  Fix building against dev-lang/perl-5.18. Move configuration logic to
+  src_configure().
 
 *symon-2.86-r1 (24 Jun 2014)
 
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index ffc0c647a1d1..e288215fc84b 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX symon-2.86-perl-5.18.patch 1020 SHA256 97f6c8e1ba5231048183fb81038159a6e1f53df16b56817da92de399a11300a0 SHA512 8a86f408e68e5ed90154dc48ba119a96a41b7239204f237d0bf124c4b0f2eaed1eecf8c80eb2874c55c5320ae07ee2ad09d5be4bb0d96762bd782fd2b40a8ebc WHIRLPOOL 176e73f545794e975e2cf0da2bf0c37ca2fc6cbd17fcfd2126e02eb2f371937c2939a16d76aa61a1abf84b3c979a09f710a5a9cbb18aef097536143b5917fed3
 AUX symon-init.d 662 SHA256 c13b1b58df24452308ae347df5f9b8eea6b8a07f3daa30d5cdbca7908762b7cf SHA512 4f59a1635c40aac84038d21fddce12dbd41e7823725e9b51a38a0d7bb87b8d70c57743fb859ed643d4bdec1a728303b067b112131bdab315c5d8fa15d3354114 WHIRLPOOL ec5e93ebb0b8588d95a4811455e6f3adcf9550d8c60834c122ccd79434622a5f3eb2824ef54db22978c1f4d5ae2f9c5f700660747fac38da8a2ef5a06e6c72de
 AUX symon.conf 313 SHA256 3f4914f65fa4456de5ee70da3c6f40f416d6452fac8a439648cc565c791cec73 SHA512 9d83d316a5024c0fc5a9c487113088548e6ba193360d684b162d39e0373bc478ebdb40b7ce508c0de2287de6684c75cfcf2f312e34e9def1dcaaeb0036ecab56 WHIRLPOOL f782d8fb717c3de1bec7e5dfab0591bb51e1770605fc6060b2b5537eae31b3b3afcde9964a23b410c69388c3d32d94193894f8369a1865be887423f53d283d2f
 AUX symux-init.d 656 SHA256 64719f1df500fa43cfd1eb0e3bd7159c98380884c6bdbf01724882fecf266dc5 SHA512 e203fe2a3fe7ee862e7541ffc5a0c8de7d174830c7ff969dc231ebf01172d0a0f913caa1713abbe9becb78b55a832a6290d4217ee3da198d435c86700c245b51 WHIRLPOOL fb4d99927e32959c7da7d03e3e999dc17c2106820a7d25fdac7166c77cdcec82bcc84e86e84afd3146b8ebcf08abe53d9421884e68da44c89f9c21e51e4fe96e
 AUX symux.conf 952 SHA256 20f915f55f084c1f9b55410c097c8165e2d621924e3496c9e3add7c1de655126 SHA512 5f7aa2d069ed6cb58dfc6ce7ab192f1486256551c1315b86b0216c56d4ee93d84101168c5ee8c1507729136dcd05c7a09cc9c901f132c5fc8015b2502bc15272 WHIRLPOOL 919d2bf8d56b52dccc10b0899993ff839578d16760243d2c204706d17662c34b33a1cf3dee4aae10728afc4191045d6c641396416fe61ff697209f68e64f7b8c
 DIST symon-2.86.tar.gz 106791 SHA256 c36457e53e91cbb478cb57d96bf40c718a8582e0b19bd4cba247002b7a6068b3 SHA512 13f96654ee4569ac0a92fd601962d2610e83d03a59b0772c385788586ee7bcc2639012388b8c123dd6f12368e21e834c5a12c32152fc73e9e87553889962ee46 WHIRLPOOL bc94567f1c7ca36d30afd74f2747cbb239e86b8b7255541ff5ca4e2adafaed794249f455339a04c8291260430279840395e02e3733619f0e3595da2fdbfd7d21
-EBUILD symon-2.86-r1.ebuild 2597 SHA256 b759184464e30f07fe7b7a33087f377df69d6261bf744931348473fa911dc9c4 SHA512 6cede92fcbe88efbbb2aca9b93c35cf774d513c4e61e270c9416f22f6cf2474dad93ca6290a17a3e3a8ff7e3a4d6d7a097de5f7293a4e192d7301300ad2c328c WHIRLPOOL 9f85585bb4d2f1fc4029bbd66f86db6c3038123bbb2a38e6dfb5c39ec68b07ffd82e50ed60d38e41c1a0df26c7f1579e1c1a5aa5a98cf2e128ff4ce48da828a3
-MISC ChangeLog 3142 SHA256 ea081c826c352e91febef235ddd05f976ea5a84760a55128c530ac2c7699e3c9 SHA512 d1db72a9b881150b59601429c11b19340f4212c2cfcbaa134b21b5dd6c653bfc4d25a98952286ca383fbd05fc78907c565e00988b377470273d0c28261382a73 WHIRLPOOL 77b9308824a5a065fb5542d53864e0fccb96a80763c834e91a7b1ccea3de3798fdb8c114dad9d07edb3e603533b7812d6f3cd2d76898eb71741944dafbfd2653
+EBUILD symon-2.86-r1.ebuild 2668 SHA256 e0aa45e8342d6b59c4a7c96c263cc22fb50f4a36a3172008e7f3f35a7d90a44a SHA512 4671fb12221c01ccc9d7f3f29170dd47ace319ba0d5bf198d52e1111290b6dbe13a6523c96e027cb2e0c8f22aa306096c9a405a29fef6fb209a3d4637b2556d5 WHIRLPOOL 88859eafe8023d06f07198dac9d85cb34c7670f442ef5c22495b84d99c29221858cd569b9ad0f821e5c79c46437d4e4ebeb871c3fceb08d5b16f002f14a500da
+MISC ChangeLog 3339 SHA256 0298128ff010a4e6db53a4af00513cd48f4c4b877fbdd915d086d4f8d236a208 SHA512 e453a8b516a94b1cbde9effe6aa1bf85835cad94270c567da2416c97ba4df780b32633638cdd1c8def6e4d93e30308c056ee6188b47d0b16aff54e55b231b355 WHIRLPOOL 2b0b62deefbe1353700417b161ee72646c078dcf17f69a1784873290552927e25bbd856611b2e1a491f91eafcf330e2bca18c8f4291bff56fabd1a989182ad98
 MISC metadata.xml 512 SHA256 c95f7e3719ea159f70b49b972150f6fb2f366f2373636a0a6167a6efe36b4631 SHA512 bd2d6ed4269a7e6a0d537c6a400247ba4683a07c66f19b158e9005fc9210cea9d9ef40904cf2971f636759456986764d432239984159cbe098771cefa49c813a WHIRLPOOL c96b89c04a12acd9805b3a241515fa8f0c69f2321239c9981a36d6384daac402c00ecb8b881dd0884754cb0793f796b919749b385f99d4fc1985746636b4e689
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOo1NwACgkQVWmRsqeSphOCpwCfaz3otSQ+GkcvORdnXjvCTxuQ
-U2wAn25RfDh+MJzlW0+Cwdas8YMEfqqF
-=clEb
+iEYEAREIAAYFAlPZBeoACgkQVWmRsqeSphPbcQCfdNarI+uYms9GWLDx5BJpl3kY
+YtgAn3+hw02D9cKTLo5xZGD7T6UVpm0H
+=E0YE
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/symon/files/symon-2.86-perl-5.18.patch b/net-analyzer/symon/files/symon-2.86-perl-5.18.patch
new file mode 100644
index 000000000000..83ea4b013dad
--- /dev/null
+++ b/net-analyzer/symon/files/symon-2.86-perl-5.18.patch
@@ -0,0 +1,38 @@
+--- a/client/SymuxClient.pm
++++ b/client/SymuxClient.pm
+@@ -267,23 +267,35 @@
+ 
+ =head2 METHODS
+ 
++=over 4
++
+ =item getitem (host, stream, item)
+ 
++=back
++
+ Refresh the measured data and get an item from a stream for a particular
+ host. Note that successive calls for this function deal with successive
+ measurements of B<symon>. Set C<host> to '*' if data about any host is of
+ interest. Any errors are sent out on STDOUT prepended with 'error: '.
+ 
++=over 4
++
+ =item getcacheditem (host, stream, item)
+ 
++=back
++
+ Get an item from a stream for a particular host. Returns C<undef> if no data is
+ cached, or if the data cached does not match the B<host>. Can be called
+ multiple times to obtain items from the same measurement. Set C<host> to '*' if
+ data about any host is of interest. Any errors are sent out on STDOUT prepended
+ with 'error: '.
+ 
++=over 4
++
+ =item getsource ()
+ 
++=back
++
+ Get the symon source host of the currently cached information. Usefull to see
+ what host's data getcacheditem is working on.
+ 
diff --git a/net-analyzer/symon/symon-2.86-r1.ebuild b/net-analyzer/symon/symon-2.86-r1.ebuild
index b4c824856c86..2d1ea9ec9e7f 100644
--- a/net-analyzer/symon/symon-2.86-r1.ebuild
+++ b/net-analyzer/symon/symon-2.86-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.1 2014/06/24 01:31:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.2 2014/07/30 14:49:12 jer Exp $
 
 EAPI=5
 
-inherit perl-module toolchain-funcs
+inherit eutils perl-module toolchain-funcs
 
 DESCRIPTION="Performance and information monitoring tool"
 HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
@@ -25,7 +25,7 @@ S=${WORKDIR}/${PN}
 # Deletes the directory passed as an argument from the internal pmake
 # variable SUBDIR.
 zap_subdir() {
-	sed -i "/^SUBDIR/s/$1//" Makefile || die
+	sed -i "/^SUBDIR/s|$1||" Makefile || die
 }
 
 pkg_setup() {
@@ -44,6 +44,10 @@ src_prepare() {
 		-e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \
 		sym*/Makefile || die
 
+	epatch "${FILESDIR}"/${P}-perl-5.18.patch
+}
+
+src_configure() {
 	# Do some sed magic in accordance with the USE flags.
 	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
 	! use perl && zap_subdir client