1 |
commit: e52475278137a29d678b58350f19822abbc37e9e |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 25 11:34:36 2016 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 25 11:35:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5247527 |
7 |
|
8 |
net-misc/sstp-client: revision bump |
9 |
|
10 |
Bump EAPI to 6, fix incorrect handling of user patches in src_prepare |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
net-misc/sstp-client/Manifest | 1 - |
15 |
....0.9-r2.ebuild => sstp-client-1.0.10-r1.ebuild} | 12 ++--- |
16 |
net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild | 54 ---------------------- |
17 |
3 files changed, 6 insertions(+), 61 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest |
20 |
index 9b1a0fd..4e903f0 100644 |
21 |
--- a/net-misc/sstp-client/Manifest |
22 |
+++ b/net-misc/sstp-client/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
DIST sstp-client-1.0.10.tar.gz 3012713 SHA256 5f9084d8544c42c806724a4e70d039d8cb7b0ea06be8ea9cc5120684d4e0d424 SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7 WHIRLPOOL ab1484edc04f2473d0704fdaaafca2de0262e74fe1ca20415ec512c1922818c0818b3900ae68129c2afab7b30ad192a90f9734613189f502069daae8bb1b0036 |
25 |
-DIST sstp-client-1.0.9.tar.gz 3243308 SHA256 d3d8a26485b2cf0b24e148301b94b3ab9cdb17700ecd7c408b8fd6ad16f7fc4e SHA512 28144552b4ae36ff56c202f0f7118628035d6583863597744a670fc769c4a022f30649348ff8e1e4ceb5b68712916f14e220a8bd6e8a8bab36567998f2e087c4 WHIRLPOOL cfe6476d558954083daf9ece8e4efb6df7be60e38fbf62bcfd44e012fcad03f157e976c1c9218b7cc448e0f18e10be1895ec1823a98e7858dca0d68292f4e5f9 |
26 |
|
27 |
diff --git a/net-misc/sstp-client/sstp-client-1.0.9-r2.ebuild b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild |
28 |
similarity index 90% |
29 |
rename from net-misc/sstp-client/sstp-client-1.0.9-r2.ebuild |
30 |
rename to net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild |
31 |
index 533b848..0853fc6 100644 |
32 |
--- a/net-misc/sstp-client/sstp-client-1.0.9-r2.ebuild |
33 |
+++ b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild |
34 |
@@ -2,9 +2,9 @@ |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
# $Id$ |
37 |
|
38 |
-EAPI=5 |
39 |
+EAPI=6 |
40 |
|
41 |
-inherit autotools eutils linux-info multilib user |
42 |
+inherit autotools linux-info multilib user |
43 |
|
44 |
DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" |
45 |
HOMEPAGE="http://sstp-client.sourceforge.net/" |
46 |
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86" |
47 |
IUSE="static" |
48 |
|
49 |
RDEPEND=">=dev-libs/libevent-2.0.10 |
50 |
- dev-libs/openssl:0 |
51 |
- net-dialup/ppp:=" |
52 |
+ dev-libs/openssl:0 |
53 |
+ net-dialup/ppp:=" |
54 |
DEPEND="${RDEPEND} |
55 |
- virtual/pkgconfig" |
56 |
+ virtual/pkgconfig" |
57 |
|
58 |
CONFIG_CHECK="~NETFILTER_NETLINK" |
59 |
DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING ) |
60 |
@@ -33,8 +33,8 @@ src_prepare() { |
61 |
# set proper examples dir, --docdir overriding is src_configure does not work |
62 |
sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.am || die 'sed on Makefile.am failed' |
63 |
|
64 |
+ default |
65 |
eautoreconf |
66 |
- epatch_user |
67 |
} |
68 |
|
69 |
src_configure() { |
70 |
|
71 |
diff --git a/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild |
72 |
deleted file mode 100644 |
73 |
index 2bcb062..00000000 |
74 |
--- a/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,54 +0,0 @@ |
77 |
-# Copyright 1999-2015 Gentoo Foundation |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
-# $Id$ |
80 |
- |
81 |
-EAPI=5 |
82 |
- |
83 |
-inherit eutils linux-info multilib user |
84 |
- |
85 |
-DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" |
86 |
-HOMEPAGE="http://sstp-client.sourceforge.net/" |
87 |
-SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" |
88 |
- |
89 |
-LICENSE="GPL-2" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~amd64 ~x86" |
92 |
-IUSE="static" |
93 |
- |
94 |
-RDEPEND=">=dev-libs/libevent-2.0.10 |
95 |
- dev-libs/openssl:0 |
96 |
- net-dialup/ppp:=" |
97 |
-DEPEND="${RDEPEND} |
98 |
- virtual/pkgconfig" |
99 |
- |
100 |
-CONFIG_CHECK="~NETFILTER_NETLINK" |
101 |
-DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING ) |
102 |
- |
103 |
-pkg_setup() { |
104 |
- enewgroup sstpc |
105 |
- enewuser sstpc -1 -1 -1 sstpc |
106 |
-} |
107 |
- |
108 |
-src_prepare() { |
109 |
- # set proper examples dir, --docdir overriding is src_configure does not work |
110 |
- sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.in || die 'sed on Makefile.in failed' |
111 |
- |
112 |
- epatch_user |
113 |
-} |
114 |
- |
115 |
-src_configure() { |
116 |
- local PPPD_VER="$(best_version net-dialup/ppp)" |
117 |
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
118 |
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
119 |
- econf \ |
120 |
- --enable-ppp-plugin \ |
121 |
- --enable-group=sstpc \ |
122 |
- --enable-user=sstpc \ |
123 |
- --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \ |
124 |
- $(use_enable static) |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- default |
129 |
- prune_libtool_files --modules |
130 |
-} |