Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/symon: ChangeLog symon-2.86-r1.ebuild
Date: Wed, 30 Jul 2014 14:49:17
Message-Id: 20140730144912.D92852004F@flycatcher.gentoo.org
1 jer 14/07/30 14:49:12
2
3 Modified: ChangeLog symon-2.86-r1.ebuild
4 Log:
5 Fix building against dev-lang/perl-5.18. Move configuration logic to src_configure().
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.16 net-analyzer/symon/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?rev=1.16&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?rev=1.16&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?r1=1.15&r2=1.16
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v
19 retrieving revision 1.15
20 retrieving revision 1.16
21 diff -u -r1.15 -r1.16
22 --- ChangeLog 24 Jun 2014 01:31:06 -0000 1.15
23 +++ ChangeLog 30 Jul 2014 14:49:12 -0000 1.16
24 @@ -1,6 +1,11 @@
25 # ChangeLog for net-analyzer/symon
26 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.15 2014/06/24 01:31:06 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.16 2014/07/30 14:49:12 jer Exp $
29 +
30 + 30 Jul 2014; Jeroen Roovers <jer@g.o> symon-2.86-r1.ebuild,
31 + +files/symon-2.86-perl-5.18.patch:
32 + Fix building against dev-lang/perl-5.18. Move configuration logic to
33 + src_configure().
34
35 *symon-2.86-r1 (24 Jun 2014)
36
37
38
39
40 1.2 net-analyzer/symon/symon-2.86-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?r1=1.1&r2=1.2
45
46 Index: symon-2.86-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- symon-2.86-r1.ebuild 24 Jun 2014 01:31:06 -0000 1.1
53 +++ symon-2.86-r1.ebuild 30 Jul 2014 14:49:12 -0000 1.2
54 @@ -1,10 +1,10 @@
55 # Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.1 2014/06/24 01:31:06 jer Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.2 2014/07/30 14:49:12 jer Exp $
59
60 EAPI=5
61
62 -inherit perl-module toolchain-funcs
63 +inherit eutils perl-module toolchain-funcs
64
65 DESCRIPTION="Performance and information monitoring tool"
66 HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
67 @@ -25,7 +25,7 @@
68 # Deletes the directory passed as an argument from the internal pmake
69 # variable SUBDIR.
70 zap_subdir() {
71 - sed -i "/^SUBDIR/s/$1//" Makefile || die
72 + sed -i "/^SUBDIR/s|$1||" Makefile || die
73 }
74
75 pkg_setup() {
76 @@ -44,6 +44,10 @@
77 -e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \
78 sym*/Makefile || die
79
80 + epatch "${FILESDIR}"/${P}-perl-5.18.patch
81 +}
82 +
83 +src_configure() {
84 # Do some sed magic in accordance with the USE flags.
85 use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
86 ! use perl && zap_subdir client