From b07d4d16d6cb43892351ae0774e9b040b443f92e Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Tue, 3 Jun 2014 07:34:23 +0000 Subject: Split valgrind integration to separate USE flag, fix CONFIG_CHECK, wrt bug #486858. Thanks to SpiderX for discovering this issue (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) --- net-dialup/accel-ppp/ChangeLog | 10 ++++++++-- net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild | 15 ++++++++------- net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild | 15 ++++++++------- net-dialup/accel-ppp/metadata.xml | 1 + 4 files changed, 25 insertions(+), 16 deletions(-) (limited to 'net-dialup/accel-ppp') diff --git a/net-dialup/accel-ppp/ChangeLog b/net-dialup/accel-ppp/ChangeLog index 0f31dbf639f5..02ef2f8a63c9 100644 --- a/net-dialup/accel-ppp/ChangeLog +++ b/net-dialup/accel-ppp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/accel-ppp -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.3 2013/02/28 16:42:58 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.4 2014/06/03 07:34:22 pinkbyte Exp $ + + 03 Jun 2014; Sergey Popov accel-ppp-1.7.3.ebuild, + accel-ppp-1.7.9999.ebuild, metadata.xml: + Split valgrind integration to separate USE flag, fix CONFIG_CHECK, wrt bug + #486858. Thanks to SpiderX for discovering this + issue 28 Feb 2013; Sergey Popov metadata.xml: Add net-dialup herd to maintainers diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild index e856615088a7..95daa3ac8d18 100644 --- a/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild,v 1.1 2013/01/03 21:32:08 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild,v 1.2 2014/06/03 07:34:23 pinkbyte Exp $ EAPI=5 @@ -13,16 +13,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug doc postgres radius shaper snmp" +IUSE="debug doc postgres radius shaper snmp valgrind" -DEPEND="postgres? ( dev-db/postgresql-base ) +RDEPEND="postgres? ( dev-db/postgresql-base ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" DOCS=( README ) -CONFIG_CHECK="~CONFIG_L2TP ~CONFIG_PPPOE ~CONFIG_PPTP" +CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" src_prepare() { sed -i -e "/mkdir/d" \ @@ -45,11 +46,11 @@ src_configure() { -DBUILD_DRIVER=FALSE -DCRYPTO=OPENSSL $(cmake-utils_use debug MEMDEBUG) - $(cmake-utils_use debug VALGRIND) $(cmake-utils_use postgres LOG_PGSQL) $(cmake-utils_use radius RADIUS) $(cmake-utils_use shaper SHAPER) $(cmake-utils_use snmp NETSNMP) + $(cmake-utils_use valgrind VALGRIND) ) cmake-utils_src_configure diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild index 8ce397449f3f..ba56fe6f82e5 100644 --- a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.1 2013/01/18 07:07:41 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.2 2014/06/03 07:34:22 pinkbyte Exp $ EAPI=5 @@ -15,16 +15,17 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc postgres radius shaper snmp" +IUSE="debug doc postgres radius shaper snmp valgrind" -DEPEND="postgres? ( dev-db/postgresql-base ) +RDEPEND="postgres? ( dev-db/postgresql-base ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" DOCS=( README ) -CONFIG_CHECK="~CONFIG_L2TP ~CONFIG_PPPOE ~CONFIG_PPTP" +CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" src_prepare() { sed -i -e "/mkdir/d" \ @@ -40,11 +41,11 @@ src_configure() { -DBUILD_DRIVER=FALSE -DCRYPTO=OPENSSL $(cmake-utils_use debug MEMDEBUG) - $(cmake-utils_use debug VALGRIND) $(cmake-utils_use postgres LOG_PGSQL) $(cmake-utils_use radius RADIUS) $(cmake-utils_use shaper SHAPER) $(cmake-utils_use snmp NETSNMP) + $(cmake-utils_use valgrind VALGRIND) ) cmake-utils_src_configure diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml index 927075db6716..83d51487e6c5 100644 --- a/net-dialup/accel-ppp/metadata.xml +++ b/net-dialup/accel-ppp/metadata.xml @@ -8,5 +8,6 @@ Support for traffic shaping + Compile in valgrind hints -- cgit v1.2.3-65-gdbad