Revision bump: add epatch_user, add subslot for ppp dependency, set proper path for pppd plugin directory, wrt bug #522768. Add missing build-time dependency on virtual/pkgconfig. Drop old revision

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

3 files changed, 32 insertions, 22 deletions

diff --git a/net-misc/sstp-client/ChangeLog b/net-misc/sstp-client/ChangeLog
index 41b3a4b3ad54..48f8006c971c 100644
--- a/net-misc/sstp-client/ChangeLog
+++ b/net-misc/sstp-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/sstp-client
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sstp-client/ChangeLog,v 1.1 2013/03/09 20:35:49 maksbotan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sstp-client/ChangeLog,v 1.2 2015/05/03 09:21:39 pinkbyte Exp $
+
+*sstp-client-1.0.9-r1 (03 May 2015)
+
+  03 May 2015; Sergey Popov <pinkbyte@gentoo.org> -sstp-client-1.0.9.ebuild,
+  +sstp-client-1.0.9-r1.ebuild:
+  Revision bump: add epatch_user, add subslot for ppp dependency, set proper
+  path for pppd plugin directory, wrt bug #522768. Add missing build-time
+  dependency on virtual/pkgconfig. Drop old revision
 
 *sstp-client-1.0.9 (09 Mar 2013)
 
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 179ce581ac0d..e94f756b44c1 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST sstp-client-1.0.9.tar.gz 3243308 SHA256 d3d8a26485b2cf0b24e148301b94b3ab9cdb17700ecd7c408b8fd6ad16f7fc4e SHA512 28144552b4ae36ff56c202f0f7118628035d6583863597744a670fc769c4a022f30649348ff8e1e4ceb5b68712916f14e220a8bd6e8a8bab36567998f2e087c4 WHIRLPOOL cfe6476d558954083daf9ece8e4efb6df7be60e38fbf62bcfd44e012fcad03f157e976c1c9218b7cc448e0f18e10be1895ec1823a98e7858dca0d68292f4e5f9
-EBUILD sstp-client-1.0.9.ebuild 1294 SHA256 0c136f5689ef4696f792e5203334f2799879dfe5d3427d0d1a8f1839cc11bd8e SHA512 fe420012cf80c9d602d7f885e211b2e9cc2adc130ca5e47f627273b553c0807843b8e2172534e06ca8f2e0d7a1d9223373c1aee0621fde36b0710bbcae1784f7 WHIRLPOOL bf9a33bc7600d25f4dc2500bc3c66849fd7d32c30cd54141eb6405e560392b6e4e596dc3ab7dbb2d3089df390c9c10e7d99c1ff13028663ebf8a18b55783f01e
-MISC ChangeLog 408 SHA256 7c41aa9230be2e26b192c454ecf6c7929c1a8cfb1ce6da14ff4e2f7cc398a4c3 SHA512 ee4b6fa3358660c11909f19df4482c5ef95735ccc8f6de388e0981217f4724e4b16ea204b5879cfb8826a9f747ad2251c2678a3177282142f0c23e42014bc770 WHIRLPOOL b863b987f94f6ae4aa8abf711c04829cd416af2c33fb57c23b9c9fb252323844d2b6d0cb1acb5cf2f56f6c410ffc60ebb6df01a61e40101d391297e8cce1f75b
+EBUILD sstp-client-1.0.9-r1.ebuild 1432 SHA256 c48a06339bee9a29b48458a0a507210e7e3477f3fcc1b774948f0c2b18b306cd SHA512 30f8acdc4ee2f55df9d3f20977639d6c59f0897873c6870597c5c0dd058037034c4d379b5f5e08e78bc54ba0e962fc379f884dc11321158dfe3adc1309bb0274 WHIRLPOOL 42bd8bbc127d009216fe964081304a5857cbd9d06fdd41516ac41934b2e81717647344e25d3ebc43ef7e564218c09f0d7a5fa20b8b0887def69b3ae2fb437626
+MISC ChangeLog 758 SHA256 1045b21859fd650b5eef8ecc59a463ca1f3b9d9ff0dcdb7877d55e770f2b9a33 SHA512 eea61f59db366d7e170c8ab0f6790b8f269223a73ab24ec14f82c651d9935029683c4e44c81c21a128f92110270dd975cd6d53b8260641d04e25e1504915f148 WHIRLPOOL 6cec749749abb4d81e82c21f3ed23890ff5ef37423f7d6d0e3f1add7386d2b2baf8212470f3876ed02bf15353e0241e02d4c658bfd46404a512913c6800f5969
 MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJRO51HAAoJEAmJmMX429reG2oH/1LAOEZ58zdVdqM4Wkl9ie9A
-2w79OriCJuYBDv9YlLCFIlbZ6iVN6P7k+H+ZKfOrYLELPzGIkKhIlcfUvlKaomxw
-qVAPyhqq2hlSzxHkP6+0XWpSLOqq772Sw+sil15FC+xcgAA7IMrREwlO2UMICNZR
-ZVKe0EfuPqpeZ+OQwO9nzcHhIH6ILp+rJN9oUlo1nhJlX4FDmhjWzsaTTtFQ46gZ
-ZPyHR1anLGSG/nTeKaRj3kgktucXWr9PIp99QA4HT7fyT7VRKaBl+77LIonTwh+f
-jukwJGFBDsi/dQ95unOThbBtEpkeMC6c1hwaOxk/wFZERsCkS4KIbjbc8r8CQhU=
-=zuPS
+iQEcBAEBCAAGBQJVReioAAoJECo/aRed92677MIIAIN8l6E6G8BhI3zy+yLLrPUq
+50obxJw0O74UE6VPqOdILX8zfWKWZjr8OlZm0AeUlz12xEDCp8cV1CPQQH+eDkn2
+5UaQCkIXokghf2AJ1yhMnXktxO9fKQmVWQ++l2dckfQo8b+toRAcXUWPdc3lZkwO
+0agxLFyI/Nh7/AM2BnsGiwV6w1jeg0/hBwaQwUhZ43mpEPbITmjQ5NG5EutM7SEH
+b/WvfTE1M/hUJ3ugYam8f7vkNStcSDTQCt6mdywQJW9ZsTh3oKUFBuN2DktHCmtO
+60wQTVcFA6MebTQn9O3Bo7YYUZUkJ+Be3q+qjmYNw9dnY869+vpLeQCsE74y3p8=
+=yUNF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sstp-client/sstp-client-1.0.9.ebuild b/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild
index aac071862c90..240a20398058 100644
--- a/net-misc/sstp-client/sstp-client-1.0.9.ebuild
+++ b/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sstp-client/sstp-client-1.0.9.ebuild,v 1.1 2013/03/09 20:35:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild,v 1.1 2015/05/03 09:21:39 pinkbyte Exp $
 
 EAPI=5
 
@@ -15,10 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static"
 
-DEPEND=">=dev-libs/libevent-2.0.10
+RDEPEND=">=dev-libs/libevent-2.0.10
 	dev-libs/openssl:0
-	net-dialup/ppp"
-RDEPEND="${DEPEND}"
+	net-dialup/ppp:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 CONFIG_CHECK="~NETFILTER_NETLINK"
 DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING )
@@ -31,13 +32,19 @@ pkg_setup() {
 src_prepare() {
 	# set proper examples dir, --docdir overriding is src_configure does not work
 	sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.in || die 'sed on Makefile.in failed'
+
+	epatch_user
 }
 
 src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
 	econf \
 		--enable-ppp-plugin \
 		--enable-group=sstpc \
 		--enable-user=sstpc \
+		--with-pppd-plugin-dir="/usr/lib64/pppd/${PPPD_VER}" \
 		$(use_enable static)
 }
 
@@ -45,8 +52,3 @@ src_install() {
 	default
 	prune_libtool_files --modules
 }
-
-pkg_postinst() {
-	ewarn "If sstp clients fails to work after net-dialup/ppp update,"
-	ewarn "please rebuild it before filing bugs."
-}