[gentoo-commits] repo/gentoo:master commit in: net-dialup/pptpd/, net-dialup/pptpd/files/

[Austin English]

commit:     607a7c48f4e29b41999c85e90695c58c31234263
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 21:49:00 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 21:59:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607a7c48

net-dialup/pptpd: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-dialup/pptpd/files/pptpd-init-r2   |  2 +-
 net-dialup/pptpd/pptpd-1.4.0-r1.ebuild | 74 ++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/net-dialup/pptpd/files/pptpd-init-r2 b/net-dialup/pptpd/files/pptpd-init-r2
index b1f8d29..6bbf9d6 100644
--- a/net-dialup/pptpd/files/pptpd-init-r2
+++ b/net-dialup/pptpd/files/pptpd-init-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend() {
 	need net

diff --git a/net-dialup/pptpd/pptpd-1.4.0-r1.ebuild b/net-dialup/pptpd/pptpd-1.4.0-r1.ebuild
new file mode 100644
index 0000000..42f864a
--- /dev/null
+++ b/net-dialup/pptpd/pptpd-1.4.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
+HOMEPAGE="http://poptop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="gre-extreme-debug tcpd"
+
+DEPEND="net-dialup/ppp:=
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-sandbox-fix.patch"
+
+	# Match pptpd-logwtmp.so's version with pppd's version (#89895)
+	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
+	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die
+
+	# Automake 1.13, compatibility, bug #469476
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.in || die 'sed on configure.ac failed'
+
+	# remove 'missing' script to prevent warnings
+	rm missing || die 'remove missing script failed'
+
+	# respect compiler, bug #461722
+	tc-export CC
+
+	# Apply user patches
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
+	econf \
+		--enable-bcrelay \
+		$(use tcpd && echo "--with-libwrap")
+}
+
+src_compile() {
+	emake COPTS="${CFLAGS}"
+}
+
+src_install () {
+	default
+
+	insinto /etc
+	doins samples/pptpd.conf
+
+	insinto /etc/ppp
+	doins samples/options.pptpd
+
+	newinitd "${FILESDIR}/pptpd-init-r2" pptpd
+	newconfd "${FILESDIR}/pptpd-confd" pptpd
+
+	dodoc README.*
+	dodoc -r samples
+}