[gentoo-commits] gentoo-x86 commit in net-dialup/accel-ppp: ChangeLog accel-ppp-1.7.4.ebuild accel-ppp-1.7.9999.ebuild

2014-06-05 Thread Sergey Popov (pinkbyte)
pinkbyte14/06/05 08:09:28

  Modified: ChangeLog accel-ppp-1.7.4.ebuild
accel-ppp-1.7..ebuild
  Log:
  Respect multilib properly
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0x1F357D42)

Revision  ChangesPath
1.7  net-dialup/accel-ppp/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.7view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.7content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?r1=1.6r2=1.7

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog   3 Jun 2014 08:08:37 -   1.6
+++ ChangeLog   5 Jun 2014 08:09:28 -   1.7
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/accel-ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.6 
2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.7 
2014/06/05 08:09:28 pinkbyte Exp $
+
+  05 Jun 2014; Sergey Popov pinkb...@gentoo.org accel-ppp-1.7.4.ebuild,
+  accel-ppp-1.7..ebuild:
+  Respect multilib properly
 
 *accel-ppp-1.7.4 (03 Jun 2014)
 



1.2  net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?r1=1.1r2=1.2

Index: accel-ppp-1.7.4.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- accel-ppp-1.7.4.ebuild  3 Jun 2014 08:08:37 -   1.1
+++ accel-ppp-1.7.4.ebuild  5 Jun 2014 08:09:28 -   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-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.1 
2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.2 
2014/06/05 08:09:28 pinkbyte Exp $
 
 EAPI=5
 
-inherit cmake-utils linux-info
+inherit cmake-utils linux-info multilib
 
 DESCRIPTION=High performance PPTP, PPPoE and L2TP server
 HOMEPAGE=http://accel-ppp.sourceforge.net/;
@@ -38,8 +38,10 @@
 }
 
 src_configure() {
+   local libdir=$(get_libdir)
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative 
to OpenSSL
local mycmakeargs=(
+   -DLIB_PATH_SUFFIX=${libdir#lib}
-DBUILD_DRIVER=FALSE
-DCRYPTO=OPENSSL
$(cmake-utils_use debug MEMDEBUG)



1.5  net-dialup/accel-ppp/accel-ppp-1.7..ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?rev=1.5view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?rev=1.5content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?r1=1.4r2=1.5

Index: accel-ppp-1.7..ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- accel-ppp-1.7..ebuild   3 Jun 2014 08:08:37 -   1.4
+++ accel-ppp-1.7..ebuild   5 Jun 2014 08:09:28 -   1.5
@@ -1,12 +1,12 @@
 # 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..ebuild,v 1.4 
2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild,v 1.5 
2014/06/05 08:09:28 pinkbyte Exp $
 
 EAPI=5
 
 EGIT_REPO_URI=git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp
 EGIT_BRANCH=1.7
-inherit cmake-utils git-r3 linux-info
+inherit cmake-utils git-r3 linux-info multilib
 
 DESCRIPTION=High performance PPTP, PPPoE and L2TP server
 HOMEPAGE=http://accel-ppp.sourceforge.net/;
@@ -32,6 +32,7 @@
-e /echo/d \
-e s: RENAME accel-ppp.conf.dist:: accel-pppd/CMakeLists.txt 
|| die 'sed on accel-pppd/CMakeLists.txt failed'
 
+   # TBF shaper is obsolete by upstream, so it's 

[gentoo-commits] gentoo-x86 commit in net-dialup/accel-ppp: ChangeLog accel-ppp-1.7.4.ebuild accel-ppp-1.7.9999.ebuild

2014-06-03 Thread Sergey Popov (pinkbyte)
pinkbyte14/06/03 08:08:38

  Modified: ChangeLog accel-ppp-1.7..ebuild
  Added:accel-ppp-1.7.4.ebuild
  Log:
  Version bump, fix compilation with USE='shaper' in live ebuild
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0x1F357D42)

Revision  ChangesPath
1.6  net-dialup/accel-ppp/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.6view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.6content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?r1=1.5r2=1.6

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog   3 Jun 2014 07:49:17 -   1.5
+++ ChangeLog   3 Jun 2014 08:08:37 -   1.6
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/accel-ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.5 
2014/06/03 07:49:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.6 
2014/06/03 08:08:37 pinkbyte Exp $
+
+*accel-ppp-1.7.4 (03 Jun 2014)
+
+  03 Jun 2014; Sergey Popov pinkb...@gentoo.org +accel-ppp-1.7.4.ebuild,
+  accel-ppp-1.7..ebuild:
+  Version bump, fix compilation with USE='shaper' in live ebuild
 
   03 Jun 2014; Sergey Popov pinkb...@gentoo.org accel-ppp-1.7..ebuild:
   Switch live ebuild to git-r3 eclass



1.4  net-dialup/accel-ppp/accel-ppp-1.7..ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?rev=1.4view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?rev=1.4content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild?r1=1.3r2=1.4

Index: accel-ppp-1.7..ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- accel-ppp-1.7..ebuild   3 Jun 2014 07:49:17 -   1.3
+++ accel-ppp-1.7..ebuild   3 Jun 2014 08:08:37 -   1.4
@@ -1,6 +1,6 @@
 # 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..ebuild,v 1.3 
2014/06/03 07:49:17 pinkbyte Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7..ebuild,v 1.4 
2014/06/03 08:08:37 pinkbyte Exp $
 
 EAPI=5
 
@@ -32,6 +32,9 @@
-e /echo/d \
-e s: RENAME accel-ppp.conf.dist:: accel-pppd/CMakeLists.txt 
|| die 'sed on accel-pppd/CMakeLists.txt failed'
 
+   sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \
+   accel-pppd/extra/CMakeLists.txt || die 'sed on 
accel-pppd/extra/CMakeLists.txt failed'
+
epatch_user
 }
 



1.1  net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.1content-type=text/plain

Index: accel-ppp-1.7.4.ebuild
===
# 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.4.ebuild,v 1.1 
2014/06/03 08:08:37 pinkbyte Exp $

EAPI=5

inherit cmake-utils linux-info

DESCRIPTION=High performance PPTP, PPPoE and L2TP server
HOMEPAGE=http://accel-ppp.sourceforge.net/;
SRC_URI=mirror://sourceforge/${PN}/${P}.tar.bz2

LICENSE=GPL-2
SLOT=0
KEYWORDS=~amd64 ~x86
IUSE=debug doc postgres radius shaper snmp valgrind

RDEPEND=postgres? ( dev-db/postgresql-base )
snmp? ( net-analyzer/net-snmp )
dev-libs/libpcre
dev-libs/openssl:0
DEPEND=${RDEPEND}
valgrind? ( dev-util/valgrind )

DOCS=( README )
CONFIG_CHECK=~L2TP ~PPPOE ~PPTP

src_prepare() {
sed -i  -e /mkdir/d \
-e /echo/d \
-e s: RENAME accel-ppp.conf.dist:: accel-pppd/CMakeLists.txt 
|| die 'sed on accel-pppd/CMakeLists.txt failed'

# TBF shaper is obsolete by upstream, so it's disabled
sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \
accel-pppd/extra/CMakeLists.txt || die 'sed on 
accel-pppd/extra/CMakeLists.txt failed'

epatch_user
}

src_configure() {
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto