commit:     4c7cad08a9087b40fcc3dcab82b9a7e2e576a8af
Author:     layman <layman <AT> localhost>
AuthorDate: Mon Mar 14 01:17:09 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4c7cad08

net-dialup/ppp: mark stable over tree version

Package-Manager: portage-2.2.26

 net-dialup/ppp/Manifest             |  4 ++--
 net-dialup/ppp/ppp-2.4.7-r99.ebuild | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 1ea2d2f..adbf8cd 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,9 +2,9 @@ AUX README.mpls 530 SHA256 
5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e51882
 AUX modules.ppp 299 SHA256 
8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512 
58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
 WHIRLPOOL 
dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3
 AUX ppp-2.4.7-dhcp-musl.patch 1943 SHA256 
2c76bf44407ebb917c0c7db7b1d7c7253e6d67efa16edfbd6906b7cd18e5951b SHA512 
26cbbe527a8bf950d983f124b78b6b65fcd5f37ff9af20ec8ffcd7b4cb42d507ec80270361c7993a4cd96f78b170da5b5818f10146f76f193f9cd958f0014eec
 WHIRLPOOL 
d2578dbdf9a9b1215584bf77c0a725e7c0785880ad09a8b27cacb6f79655338d1e3609d984a8a523dc41392edc658ba0d161a5ea5639569b7be247ef9b4d1276
 AUX ppp-2.4.7-musl.patch 5350 SHA256 
91e67a03538b1146584b784bfd41f33eb4d0587af66e6df442a3a2ffa259c8af SHA512 
ce6381280c5299933ee55cc1039874e9d33900e28198939263ca4b78e1c1b8e88939e198c4e313e7f05ba6d85ff33e8d5ccd5c5ba12c7acfff6d96e767738179
 WHIRLPOOL 
bf6d148ba578ffcdd169c966d13daa541d478a2d400e1a1aad53b52d0e11b55d14b23d0f78f3f9dbb8b3cfd56ea4641d2a15224fcc47fc996c4779429d4e397a
-DIST ppp-2.4.7-patches-2.tar.xz 37484 SHA256 
ca2a58bb2af2c2a728cfaefab31386239bda2e750765141f9aae65bde38d58f1 SHA512 
91d91820a7171dbe93fc4d9235456dd6eaa821b79fd0d34691bd95ecfeec2f571ed69ef07fa5839c78132dbbcb0f6b347e2ac5f794a0a1385055c7bf9a4637b6
 WHIRLPOOL 
6ba77ffdcf51fd792439c56dd43bab51cb978db395c1a409019e549fb1481a33f0cd8b8b3aaed93dbecb3b5e4b6916e4ef5a5425a6509b05b874add936632173
+DIST ppp-2.4.7-patches-1.tar.xz 38852 SHA256 
442e619ab33afe4c8d9999295a221699917604dbc55171cdef6fb2094bf0aaf6 SHA512 
105c68cbabcc860498bdb583598fc5838de5f523875ef3e7c35ce3c367d89072b0a52d97c2d500cd225407e2b6d806b45054c19ff1203dd1fad10515980d56da
 WHIRLPOOL 
d57aef8666b5189d4d9a69de3097eda41233dfdc07d87ac7a91d5e03bb070f372665d7c39912fc7196504ca079220efd5103cfecc3e5f97136d089e7c4f4e44d
 DIST ppp-2.4.7.tar.gz 688117 SHA256 
02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 
e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 WHIRLPOOL 
48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
 DIST ppp-dhcpc.tgz 33497 SHA256 
977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 WHIRLPOOL 
74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
-EBUILD ppp-2.4.7-r99.ebuild 7034 SHA256 
2e5da5c46173eaff782b639bb1b49f4206b817fa3fba1fb7496ec030877128dc SHA512 
fc2b3cc3d2e267d9636e326e0ad8c45a414e879f5d7452b6218904d27a99b5a2c4c193d46ed22d6dc04b32f6e48c21198a9dc21ec523f7427eae1bd2f97960cc
 WHIRLPOOL 
2327bb37ce7f23c4d975ce715651ccb433e591e30da7f34f465c0e9fe82d4c0fcff743a127752d948d28e3d0499ca1a9e452970e35aaac4166076bc214cef351
+EBUILD ppp-2.4.7-r99.ebuild 7104 SHA256 
af45ab5da6820d49bf44c2343e7a646cfa8610c56117dc0786933fd87bc36c8f SHA512 
52b4146e90294e6fafab66dbabea20d42735591a331303ce1ad7d02162ba64588524577c1373d8e6a5c435b053892a374b39f65ec1ac2dfbf8d2b42ee7e3ddcd
 WHIRLPOOL 
c67983afd639cfa497ad8902d248c3a6ba0d893839afa86610093ccce63c7e590f4a098d60381fde6efe2f55b6ef044b34f5487785aa69086af711028e292fd9
 MISC ChangeLog 48359 SHA256 
7fc888cc470be8f7d8fb3dc93e5f47663040b3a7b831714a6df5a3a9709e7b59 SHA512 
21979dedf9368f3b3135b54dd7ce8db70c105461bfdd2b1c2c8c3d1986bc6285a19621cfcca52a4130e0d32997a89bf3cdbcb232159987689689c14bd81145b5
 WHIRLPOOL 
597664594efeb789dcefd0e7ea0b722a53463910757c57994c3b13516d338c86157a3d819fd7367c63155e78bacb96192079753f2b184c88beb65319534d3fac
 MISC metadata.xml 1649 SHA256 
9792ff1d071c342fa42832e9b5341a40102885c7801b7f9604c956d048f95864 SHA512 
728cc22f75a18d16595d2139622b0a7d1fac65b7149d5a9144acf17ef72201bbfb3d4f15990b15bf9cab1bb05af6525d366f2c2484ee5b7b3fc04dbf463d5b2a
 WHIRLPOOL 
1eef54aba8dac6bfccb83cdef865ce297c2faacde3b9226a92a633b68f7a470b5153554302ab5e23bd2fa0e41f22691bf5093b52de94a25a93ecbf403085d4ef

diff --git a/net-dialup/ppp/ppp-2.4.7-r99.ebuild 
b/net-dialup/ppp/ppp-2.4.7-r99.ebuild
index 68c2c8c..a568483 100644
--- a/net-dialup/ppp/ppp-2.4.7-r99.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r99.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.7-r1.ebuild,v 1.2 
2015/05/14 10:21:15 pinkbyte Exp $
+# $Id$
 
 EAPI=5
 
 inherit eutils linux-info multilib pam toolchain-funcs
 
-PATCH_VER="2"
+PATCH_VER="1"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="http://www.samba.org/ppp";
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-       
http://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCH_VER}.tar.xz
+       https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
        http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz";
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 arm ~mips ppc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
 
-DEPEND="activefilter? ( net-libs/libpcap )
+DEPEND="!net-dialup/ppp-scripts
+       activefilter? ( net-libs/libpcap )
        atm? ( net-dialup/linux-atm )
        pam? ( virtual/pam )
        gtk? ( x11-libs/gtk+:2 )
        eap-tls? ( net-misc/curl dev-libs/openssl:0 )"
 RDEPEND="${DEPEND}"
-PDEPEND="net-dialup/ppp-scripts"
 
 src_prepare() {
        mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
@@ -128,6 +128,14 @@ src_install() {
        insopts -m0644
        doins etc.ppp/options
 
+       exeinto /etc/ppp
+       for i in ip-up ip-down ; do
+               doexe "${WORKDIR}/scripts/${i}"
+               insinto /etc/ppp/${i}.d
+               use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
+               doins "${WORKDIR}/scripts/${i}.d"/*
+       done
+
        pamd_mimic_system ppp auth account session
 
        local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"

Reply via email to