diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-14 13:28:06 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-14 13:28:06 +0000 |
commit | 569e66c7b9ad9618e2c2629bff893fdf81f19323 (patch) | |
tree | d17fd6ece79675bffd126ce534150d0d6588d92b /net-dialup | |
parent | Stable for x86, wrt bug #449950 (diff) | |
download | gentoo-2-569e66c7b9ad9618e2c2629bff893fdf81f19323.tar.gz gentoo-2-569e66c7b9ad9618e2c2629bff893fdf81f19323.tar.bz2 gentoo-2-569e66c7b9ad9618e2c2629bff893fdf81f19323.zip |
Drop old
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/pptpd/ChangeLog | 6 | ||||
-rw-r--r-- | net-dialup/pptpd/files/pptpd-init | 20 | ||||
-rw-r--r-- | net-dialup/pptpd/files/pptpd-init-r1 | 20 | ||||
-rw-r--r-- | net-dialup/pptpd/pptpd-1.3.4-r1.ebuild | 62 | ||||
-rw-r--r-- | net-dialup/pptpd/pptpd-1.3.4.ebuild | 61 |
5 files changed, 5 insertions, 164 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog index 967cde326307..cac8bc495829 100644 --- a/net-dialup/pptpd/ChangeLog +++ b/net-dialup/pptpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/pptpd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.46 2013/03/14 13:24:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.47 2013/03/14 13:28:05 pinkbyte Exp $ + + 14 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> -pptpd-1.3.4.ebuild, + -pptpd-1.3.4-r1.ebuild, -files/pptpd-init, -files/pptpd-init-r1: + Drop old 14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> pptpd-1.3.4-r2.ebuild: Stable for x86, wrt bug #449950 diff --git a/net-dialup/pptpd/files/pptpd-init b/net-dialup/pptpd/files/pptpd-init deleted file mode 100644 index 117e324ac62f..000000000000 --- a/net-dialup/pptpd/files/pptpd-init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript - -depend() { - need net -} - -start() { - ebegin "Starting pptpd" - start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping pptpd" - start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid - result=$? - start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pptpctrl - result=$(( $result + $? )) - eend $result -} diff --git a/net-dialup/pptpd/files/pptpd-init-r1 b/net-dialup/pptpd/files/pptpd-init-r1 deleted file mode 100644 index 36af3f25fff0..000000000000 --- a/net-dialup/pptpd/files/pptpd-init-r1 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript - -depend() { - need net -} - -start() { - ebegin "Starting pptpd" - start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping pptpd" - start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid - result=$? - start-stop-daemon --stop --quiet --exec /usr/sbin/pptpctrl - result=$(( $result + $? )) - eend $result -} diff --git a/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild deleted file mode 100644 index 4e09c1905808..000000000000 --- a/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild,v 1.4 2011/11/02 15:21:13 mattst88 Exp $ - -EAPI="4" -inherit eutils autotools 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="tcpd gre-extreme-debug" - -DEPEND="net-dialup/ppp - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-more-reodering-fixes.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" - sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile - - eautoreconf -} - -src_configure() { - use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" - local myconf - use tcpd && myconf="--with-libwrap" - econf --enable-bcrelay \ - ${myconf} -} - -src_compile() { - emake COPTS="${CFLAGS}" -} - -src_install () { - einstall - - insinto /etc - doins samples/pptpd.conf - - insinto /etc/ppp - doins samples/options.pptpd - - newinitd "${FILESDIR}/pptpd-init-r1" pptpd - newconfd "${FILESDIR}/pptpd-confd" pptpd - - dodoc AUTHORS ChangeLog NEWS README* TODO - docinto samples - dodoc samples/* -} diff --git a/net-dialup/pptpd/pptpd-1.3.4.ebuild b/net-dialup/pptpd/pptpd-1.3.4.ebuild deleted file mode 100644 index b3d733dc49cc..000000000000 --- a/net-dialup/pptpd/pptpd-1.3.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4.ebuild,v 1.12 2011/11/02 15:21:13 mattst88 Exp $ - -inherit eutils autotools flag-o-matic - -DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server" -SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz" -HOMEPAGE="http://www.poptop.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="tcpd gre-extreme-debug" - -DEPEND="net-dialup/ppp - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-more-reodering-fixes.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" - sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile - - eautoreconf -} - -src_compile() { - use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" - local myconf - use tcpd && myconf="--with-libwrap" - econf --enable-bcrelay \ - ${myconf} - emake COPTS="${CFLAGS}" || die "make failed" -} - -src_install () { - einstall || die "make install failed" - - insinto /etc - doins samples/pptpd.conf - - insinto /etc/ppp - doins samples/options.pptpd - - newinitd "${FILESDIR}/pptpd-init" pptpd - newconfd "${FILESDIR}/pptpd-confd" pptpd - - dodoc AUTHORS ChangeLog NEWS README* TODO - docinto samples - dodoc samples/* -} |