commit: e52475278137a29d678b58350f19822abbc37e9e Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Thu Aug 25 11:34:36 2016 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Thu Aug 25 11:35:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5247527
net-misc/sstp-client: revision bump Bump EAPI to 6, fix incorrect handling of user patches in src_prepare Package-Manager: portage-2.2.28 net-misc/sstp-client/Manifest | 1 - ....0.9-r2.ebuild => sstp-client-1.0.10-r1.ebuild} | 12 ++--- net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild | 54 ---------------------- 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest index 9b1a0fd..4e903f0 100644 --- a/net-misc/sstp-client/Manifest +++ b/net-misc/sstp-client/Manifest @@ -1,2 +1 @@ DIST sstp-client-1.0.10.tar.gz 3012713 SHA256 5f9084d8544c42c806724a4e70d039d8cb7b0ea06be8ea9cc5120684d4e0d424 SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7 WHIRLPOOL ab1484edc04f2473d0704fdaaafca2de0262e74fe1ca20415ec512c1922818c0818b3900ae68129c2afab7b30ad192a90f9734613189f502069daae8bb1b0036 -DIST sstp-client-1.0.9.tar.gz 3243308 SHA256 d3d8a26485b2cf0b24e148301b94b3ab9cdb17700ecd7c408b8fd6ad16f7fc4e SHA512 28144552b4ae36ff56c202f0f7118628035d6583863597744a670fc769c4a022f30649348ff8e1e4ceb5b68712916f14e220a8bd6e8a8bab36567998f2e087c4 WHIRLPOOL cfe6476d558954083daf9ece8e4efb6df7be60e38fbf62bcfd44e012fcad03f157e976c1c9218b7cc448e0f18e10be1895ec1823a98e7858dca0d68292f4e5f9 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 similarity index 90% rename from net-misc/sstp-client/sstp-client-1.0.9-r2.ebuild rename to net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild index 533b848..0853fc6 100644 --- a/net-misc/sstp-client/sstp-client-1.0.9-r2.ebuild +++ b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit autotools eutils linux-info multilib user +inherit autotools linux-info multilib user DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" HOMEPAGE="http://sstp-client.sourceforge.net/"; @@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86" IUSE="static" RDEPEND=">=dev-libs/libevent-2.0.10 - dev-libs/openssl:0 - net-dialup/ppp:=" + dev-libs/openssl:0 + net-dialup/ppp:=" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig" CONFIG_CHECK="~NETFILTER_NETLINK" DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING ) @@ -33,8 +33,8 @@ src_prepare() { # set proper examples dir, --docdir overriding is src_configure does not work sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.am || die 'sed on Makefile.am failed' + default eautoreconf - epatch_user } src_configure() { 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 deleted file mode 100644 index 2bcb062..00000000 --- a/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils linux-info multilib user - -DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" -HOMEPAGE="http://sstp-client.sourceforge.net/"; -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static" - -RDEPEND=">=dev-libs/libevent-2.0.10 - dev-libs/openssl:0 - net-dialup/ppp:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -CONFIG_CHECK="~NETFILTER_NETLINK" -DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING ) - -pkg_setup() { - enewgroup sstpc - enewuser sstpc -1 -1 -1 sstpc -} - -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/$(get_libdir)/pppd/${PPPD_VER}" \ - $(use_enable static) -} - -src_install() { - default - prune_libtool_files --modules -}
