jer 14/07/30 14:49:12 Modified: ChangeLog symon-2.86-r1.ebuild Log: Fix building against dev-lang/perl-5.18. Move configuration logic to src_configure(). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.16 net-analyzer/symon/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 24 Jun 2014 01:31:06 -0000 1.15 +++ ChangeLog 30 Jul 2014 14:49:12 -0000 1.16 @@ -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 <[email protected]> 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) 1.2 net-analyzer/symon/symon-2.86-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild?r1=1.1&r2=1.2 Index: symon-2.86-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- symon-2.86-r1.ebuild 24 Jun 2014 01:31:06 -0000 1.1 +++ symon-2.86-r1.ebuild 30 Jul 2014 14:49:12 -0000 1.2 @@ -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 @@ # 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 @@ -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
