1 |
pinkbyte 14/06/05 08:09:28 |
2 |
|
3 |
Modified: ChangeLog accel-ppp-1.7.4.ebuild |
4 |
accel-ppp-1.7.9999.ebuild |
5 |
Log: |
6 |
Respect multilib properly |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 net-dialup/accel-ppp/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/ChangeLog?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- ChangeLog 3 Jun 2014 08:08:37 -0000 1.6 |
24 |
+++ ChangeLog 5 Jun 2014 08:09:28 -0000 1.7 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for net-dialup/accel-ppp |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.6 2014/06/03 08:08:37 pinkbyte Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.7 2014/06/05 08:09:28 pinkbyte Exp $ |
30 |
+ |
31 |
+ 05 Jun 2014; Sergey Popov <pinkbyte@g.o> accel-ppp-1.7.4.ebuild, |
32 |
+ accel-ppp-1.7.9999.ebuild: |
33 |
+ Respect multilib properly |
34 |
|
35 |
*accel-ppp-1.7.4 (03 Jun 2014) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: accel-ppp-1.7.4.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- accel-ppp-1.7.4.ebuild 3 Jun 2014 08:08:37 -0000 1.1 |
53 |
+++ accel-ppp-1.7.4.ebuild 5 Jun 2014 08:09:28 -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-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.1 2014/06/03 08:08:37 pinkbyte Exp $ |
58 |
+# $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 $ |
59 |
|
60 |
EAPI=5 |
61 |
|
62 |
-inherit cmake-utils linux-info |
63 |
+inherit cmake-utils linux-info multilib |
64 |
|
65 |
DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
66 |
HOMEPAGE="http://accel-ppp.sourceforge.net/" |
67 |
@@ -38,8 +38,10 @@ |
68 |
} |
69 |
|
70 |
src_configure() { |
71 |
+ local libdir="$(get_libdir)" |
72 |
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
73 |
local mycmakeargs=( |
74 |
+ -DLIB_PATH_SUFFIX="${libdir#lib}" |
75 |
-DBUILD_DRIVER=FALSE |
76 |
-DCRYPTO=OPENSSL |
77 |
$(cmake-utils_use debug MEMDEBUG) |
78 |
|
79 |
|
80 |
|
81 |
1.5 net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild |
82 |
|
83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild?rev=1.5&view=markup |
84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild?rev=1.5&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild?r1=1.4&r2=1.5 |
86 |
|
87 |
Index: accel-ppp-1.7.9999.ebuild |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v |
90 |
retrieving revision 1.4 |
91 |
retrieving revision 1.5 |
92 |
diff -u -r1.4 -r1.5 |
93 |
--- accel-ppp-1.7.9999.ebuild 3 Jun 2014 08:08:37 -0000 1.4 |
94 |
+++ accel-ppp-1.7.9999.ebuild 5 Jun 2014 08:09:28 -0000 1.5 |
95 |
@@ -1,12 +1,12 @@ |
96 |
# Copyright 1999-2014 Gentoo Foundation |
97 |
# Distributed under the terms of the GNU General Public License v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.4 2014/06/03 08:08:37 pinkbyte Exp $ |
99 |
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.5 2014/06/05 08:09:28 pinkbyte Exp $ |
100 |
|
101 |
EAPI=5 |
102 |
|
103 |
EGIT_REPO_URI="git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp" |
104 |
EGIT_BRANCH="1.7" |
105 |
-inherit cmake-utils git-r3 linux-info |
106 |
+inherit cmake-utils git-r3 linux-info multilib |
107 |
|
108 |
DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
109 |
HOMEPAGE="http://accel-ppp.sourceforge.net/" |
110 |
@@ -32,6 +32,7 @@ |
111 |
-e "/echo/d" \ |
112 |
-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
113 |
|
114 |
+ # TBF shaper is obsolete by upstream, so it's disabled |
115 |
sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \ |
116 |
accel-pppd/extra/CMakeLists.txt || die 'sed on accel-pppd/extra/CMakeLists.txt failed' |
117 |
|
118 |
@@ -39,8 +40,10 @@ |
119 |
} |
120 |
|
121 |
src_configure() { |
122 |
+ local libdir="$(get_libdir)" |
123 |
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
124 |
local mycmakeargs=( |
125 |
+ -DLIB_PATH_SUFFIX="${libdir#lib}" |
126 |
-DBUILD_DRIVER=FALSE |
127 |
-DCRYPTO=OPENSSL |
128 |
$(cmake-utils_use debug MEMDEBUG) |