summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2015-05-14 10:19:42 +0000
committerSergey Popov <pinkbyte@gentoo.org>2015-05-14 10:19:42 +0000
commit939fc2b963b1173715c692e95abab38281b1fb6f (patch)
tree9da1337f72170f03153c7c00810cef5378b42d07 /net-dialup
parentInitial commit (diff)
downloadhistorical-939fc2b963b1173715c692e95abab38281b1fb6f.tar.gz
historical-939fc2b963b1173715c692e95abab38281b1fb6f.tar.bz2
historical-939fc2b963b1173715c692e95abab38281b1fb6f.zip
Revision bump: split ppp scripts into separate package - net-dialup/ppp-scripts. Adjust dependencies
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x60C0742D1F357D42
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/ppp/ChangeLog9
-rw-r--r--net-dialup/ppp/Manifest26
-rw-r--r--net-dialup/ppp/ppp-2.4.7-r1.ebuild216
-rw-r--r--net-dialup/ppp/ppp-2.4.7.ebuild5
4 files changed, 238 insertions, 18 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index af3001eabf58..2172f3a522df 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dialup/ppp
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.302 2015/03/03 09:20:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.303 2015/05/14 10:19:41 pinkbyte Exp $
+
+*ppp-2.4.7-r1 (14 May 2015)
+
+ 14 May 2015; Sergey Popov <pinkbyte@gentoo.org> ppp-2.4.7.ebuild,
+ +ppp-2.4.7-r1.ebuild:
+ Revision bump: split ppp scripts into separate package -
+ net-dialup/ppp-scripts. Adjust dependencies
03 Mar 2015; Yixun Lan <dlan@gentoo.org> ppp-2.4.7.ebuild:
add arm64 support, tested on A53 board
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index be8f658e5707..9bbea33fde22 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -10,28 +10,24 @@ DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d
DIST ppp-2.4.6-patches-4.tar.xz 36692 SHA256 63caf7687a6345d880eaf915e2ad814ff73d46b3fecfd56c75807e34c6d28cc4 SHA512 b3d0e7c296074a0317d818a46898116c927d504b8500567e7f8667ed209bfe63e59d260d2154fe18503abe1595ef23ddbf69f6f0b46910da4816b8aff11fb440 WHIRLPOOL 1ff47be7ebf76e1131adf90f294670307d90aea05902d2bef8d6f009ec4815b7f44cd904442725638bb7d54bc3c1054a1e21b262cd0d82fa0f2a0815cca7282b
DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
DIST ppp-2.4.7-patches-1.tar.xz 38852 SHA256 442e619ab33afe4c8d9999295a221699917604dbc55171cdef6fb2094bf0aaf6 SHA512 105c68cbabcc860498bdb583598fc5838de5f523875ef3e7c35ce3c367d89072b0a52d97c2d500cd225407e2b6d806b45054c19ff1203dd1fad10515980d56da WHIRLPOOL d57aef8666b5189d4d9a69de3097eda41233dfdc07d87ac7a91d5e03bb070f372665d7c39912fc7196504ca079220efd5103cfecc3e5f97136d089e7c4f4e44d
+DIST ppp-2.4.7-patches-2.tar.xz 37484 SHA256 ca2a58bb2af2c2a728cfaefab31386239bda2e750765141f9aae65bde38d58f1 SHA512 91d91820a7171dbe93fc4d9235456dd6eaa821b79fd0d34691bd95ecfeec2f571ed69ef07fa5839c78132dbbcb0f6b347e2ac5f794a0a1385055c7bf9a4637b6 WHIRLPOOL 6ba77ffdcf51fd792439c56dd43bab51cb978db395c1a409019e549fb1481a33f0cd8b8b3aaed93dbecb3b5e4b6916e4ef5a5425a6509b05b874add936632173
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.4-r25.ebuild 10959 SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373 SHA512 884f0fef8fca451b18746ad04639788a3fb6bcae4211f36ffa695b9ce7eb9d590a7d394bc390c406f81eddbc2a8f55fdff1376ba14495ee9906e3c1f9ab2ee37 WHIRLPOOL 7f9f60e0cf5743e8d3759268253338009f3069b283eeefeca95ad50b5b11458824ae07c5afe69983bd398b157bab0dcc67fdd9c080d617dd9b8959f04cf6ea27
EBUILD ppp-2.4.5-r3.ebuild 7045 SHA256 9680200ffc73f68571a5ee3cfa2ec0703853679f1ad0c3b16c768786880fb19e SHA512 9913d1ce1690dda37c3991cd94c50116bc8f55cbc76ed5f422d3b2aebcf9c30f55c10eb6eb909884436fefeb97926d9f6888fd978bf1e251c22b829edc6090c1 WHIRLPOOL 0beeee3601f24e914067ca80733373cc601549d05bb9fb469cc6f85420b78e0cc4c26cbe55e2c99c74beb21e88f64b5e814cbb3ed35e2fa337f7ab91c8716635
EBUILD ppp-2.4.6-r3.ebuild 7001 SHA256 66d4f15c50a177d57e30a80c7129943c38448b278351774a514e95b0e4d58c60 SHA512 f89ebe39b93284313739b159fd927a5966767d98812b1c4dda0c544a0c6eb2c81770be50f2562638628d6915b03c1f6bda2d2ae67691ddf84bcfd91dc3e03789 WHIRLPOOL 4d30aad5c8d5224fff79bcd9d8f31a264a9a2759d21293ef0638d46261e4a0f59d42794bc83b828505c76fd10fc37ab7f5840fc1699742da30ecfeea2e56bb6f
-EBUILD ppp-2.4.7.ebuild 6978 SHA256 8e6000267cf76102ab0bd679d3a1d2a6a13a04b950bea4688fecda63f3f9560a SHA512 f1b3e27c306076097ce29e09b8eefad7135620038833182744dbd6dd503db7ea87cec6c31be8bbf96a5f1fd09e93686bde0cefe1789a51bf74f529eb19f0657d WHIRLPOOL 4ff6887c1d33b24910209de9010f7ac141ece7d13ee584301b737ee153182eb0b1f3bbaebc847bbdfcb03749cad04af869b182cee3ee99f8c001836583d194c7
-MISC ChangeLog 47962 SHA256 8963be18f0d8e3648f5ad46de3a05d334e90042b74996d38ab85345ba5ea7b48 SHA512 a921a7d7c9cfe7e8f6dfcfe29cf6e9af005a6a68b0193640a226fabb7bbb8dcebc4f86dada08b2025456000fafbcbecdd8d92e298fdadd254f1bf0f7f3f1f3ea WHIRLPOOL 9fc9853a6c7306fff2a9b6803a8fd84b06c9cb90107f95cb3c0296fc4317d96458dc71bd422aa9485dedaa7f166dc95f6e9c34ceb962a9bbda6a396667c6ed05
+EBUILD ppp-2.4.7-r1.ebuild 6842 SHA256 5a07f899560a3786f9d484c901fd2625c4dce5bc3e976e85ed987029886fa18e SHA512 6ad5877c147b4d7e2a85b9d3dd338d378b8613b308d7339ab3d77032b12f1a9cab237f73741811b978a8d288e21b4a9bba55ab22fb70829ca630174409194d08 WHIRLPOOL 6c760b7a41df5d72d3a31bd653dcfe354a4abeca778aea09ce3785d8f325c8c6556e19fc12f8d02181127ee33bdd05a7a4983eef7bca7c265b62d6422b0e545c
+EBUILD ppp-2.4.7.ebuild 7008 SHA256 ea7ff4235d77ba60378c1c26a44c3b744e89c754f38168ba3b628a891c59a36e SHA512 ac3944524f8f56ea17edf6ed4d6bb50676852d985bdbe97e0349c8b808c71db5ad9e46d5499d5b9e9fd4ef4357fe03e8dfa5e4a94e3530c001da20c86976d994 WHIRLPOOL b77a4cd12b9d069f3f955962d4fe3cb13dd3315f233de733881fae49c92887b1182b1f11a0b860f6f5f8bd5e9c0273b3283e54ab0a6955812651edb9648417ce
+MISC ChangeLog 48193 SHA256 2517583c637273fb1ae890dcd47f0c38e6aed3aa1c7c67e9162b35df37be4226 SHA512 5f6c838199e48570cb3ed52e5d8f2ecd5471d6af3648bca82863f795ccc53913463ecc24dc977e1d64bc5d1205470c64887a9f6e95541129caef08938ef5cb0f WHIRLPOOL fbcf9e39a08aa13ce0f3e596f5b9873738b8441ec1feabbd18c78b0fca1ca7ca36a76546bb5c203cdedaa4ba445326310fcef3f41ff375385bfd1be402d79ad8
MISC metadata.xml 1437 SHA256 ead1d034656325de6aebce34890880e837b002baebcc9064218913b0b1796216 SHA512 1113d280079f4ba1ae4d12106ffeb6bda6c4fa72a8514df2522b7f3db556b4931f4960d4567ac093558cd266de0eb3cdfd1c955047b7ab12bd9a8b7588f2f143 WHIRLPOOL 02f4409c8e891ada907f775a6c68f65ab5a0d5eaae6bf20d4323cf592cd91cadcb5124f08c030327f77df079f9e57e5a695f59d19b8226f7453553de6db9c9fd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJU9QvtAAoJEJIMDbyqvv1VUBMP/j86ukpPAaHaC+tJrjt/sq1e
-Hlysh+QasSRL4HXSfsogiVbmQONXSnKouuKhfD37dboyU6BFhlSzmm9WU0wheGlu
-0rIAgCFXTtYi+juP9TLmnkYXYgyHWK/WrtEeZzaaUliKL8HpP8uSOr0sujHYGvmr
-RpWEoKp9QHeBG2MYrcy1s6mbc4rHRoCmTO5CKiSvMBfvzfBiJPou8HFnNsACXahZ
-QmCQtykXxqbwfyHKB3RuPgdLeZh3WxYpB0CR1VtGH95xGFGUQ41v5/wRUr8QVD43
-qrd7E/+htzYnloIMnat/qi3R/ulHVsm5jzk+RsV8anZddn9iLRC7tSn5VvNuQQ2Z
-gbdNSoalzit4pdAdpxEOFmCT5v8O4akPJVjVR7f8nrmyU7ACo8Zlr+ehZG3QEaVW
-Bp33o5tytzFuq6fheBZTcb6XkuGn4UwIp+S/S/qvmRCQcNW58qAOiOVodk60VW0R
-M0z0oYPXQvb2YUNmUZM+uOuW+z3So+RYavJHRKxpQA9bPCx7F0H3OoDZhYzqcnf0
-kZRuXt7iNXV7PHwUWKFcsisks/t8dWRZw3jr9+771jyN9KJQyKdyndElmYTF5iYo
-pqTCw1+AjTuis1t6JibErrUMS3ShRlFfstPhJ4E/3u6IB/Pf9FQWuoHOSCz/oWEO
-N89lcrqaAx6rkaEluKDx
-=Ft1j
+iQEcBAEBCAAGBQJVVHa9AAoJECo/aRed9267pbEH/ici2yfqHCL7HGAnk4R47Gxy
+X+HwgNjBAG1joGip7GS/Mh5XLeIAcBmgFiW54JMq3UrIH1TGCNAfFGSo9nu0LXBr
+fLPtqvsh+Ev2JZOt89ppsZK/1ixLwYb6Z9wzIUidgM36AJQpns9bbcAbOPfr5gP1
+BV+aJ2fAiXAOv9hehrbJpkhAayHv8FtYhxcPwxm68KPcUrCg0P+Ack4nWKeHE53a
+tUe3cvfA2Q00usF3AY9FbYOu/8XuvY6JCvabep7IhxfJ7kB5fj2NEKJMS9bXdeH7
+0yPGz6WSYM0850IxFqjmL31xZasQUVwCGG1QpMdDipRSy0UbBrnHYevfVki+01E=
+=bugJ
-----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.7-r1.ebuild b/net-dialup/ppp/ppp-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..d13c536e51e5
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.7-r1.ebuild
@@ -0,0 +1,216 @@
+# 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.1 2015/05/14 10:19:41 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils linux-info multilib pam toolchain-funcs
+
+PATCH_VER="2"
+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
+ http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
+
+DEPEND="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 )"
+RDEPEND="${DEPEND}"
+PDEPEND="net-dialup/ppp-scripts"
+
+src_prepare() {
+ mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+ use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+ EPATCH_SUFFIX="patch" \
+ epatch "${WORKDIR}"/patch
+
+ if use atm ; then
+ einfo "Enabling PPPoATM support"
+ sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+ pppd/plugins/pppoatm/Makefile.linux || die
+ fi
+
+ if ! use activefilter ; then
+ einfo "Disabling active filter"
+ sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+ fi
+
+ if use pam ; then
+ einfo "Enabling PAM"
+ sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+ fi
+
+ if use ipv6 ; then
+ einfo "Enabling IPv6"
+ sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+ fi
+
+ einfo "Enabling CBCP"
+ sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+ if use dhcp ; then
+ einfo "Adding ppp-dhcp plugin files"
+ sed -i \
+ -e '/^SUBDIRS :=/s:$: dhcp:' \
+ pppd/plugins/Makefile.linux || die
+ fi
+
+ # Set correct libdir
+ sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+ pppd/{pathnames.h,pppd.8} || die
+
+ if use radius ; then
+ #set the right paths in radiusclient.conf
+ sed -i -e "s:/usr/local/etc:/etc:" \
+ -e "s:/usr/local/sbin:/usr/sbin:" \
+ pppd/plugins/radius/etc/radiusclient.conf || die
+ #set config dir to /etc/ppp/radius
+ sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+ pppd/plugins/radius/{*.8,*.c,*.h} \
+ pppd/plugins/radius/etc/* || die
+ else
+ einfo "Disabling radius"
+ sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+ fi
+}
+
+src_compile() {
+ tc-export AR CC
+ emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+ # build pppgetpass
+ cd contrib/pppgetpass || die
+ if use gtk ; then
+ emake -f Makefile.linux
+ else
+ emake pppgetpass.vt
+ fi
+}
+
+src_install() {
+ local i
+ for i in chat pppd pppdump pppstats ; do
+ doman ${i}/${i}.8
+ dosbin ${i}/${i}
+ done
+ fperms u+s-w /usr/sbin/pppd
+
+ # Install pppd header files
+ emake -C pppd INSTROOT="${D}" install-devel
+
+ dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+ dodir /etc/ppp/peers
+ insinto /etc/ppp
+ insopts -m0600
+ newins etc.ppp/pap-secrets pap-secrets.example
+ newins etc.ppp/chap-secrets chap-secrets.example
+
+ insopts -m0644
+ doins etc.ppp/options
+
+ pamd_mimic_system ppp auth account session
+
+ local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+ # closing " for syntax coloring
+ insinto "${PLUGINS_DIR}"
+ insopts -m0755
+ doins pppd/plugins/minconn.so
+ doins pppd/plugins/passprompt.so
+ doins pppd/plugins/passwordfd.so
+ doins pppd/plugins/winbind.so
+ doins pppd/plugins/rp-pppoe/rp-pppoe.so
+ doins pppd/plugins/pppol2tp/openl2tp.so
+ doins pppd/plugins/pppol2tp/pppol2tp.so
+ if use atm ; then
+ doins pppd/plugins/pppoatm/pppoatm.so
+ fi
+ if use dhcp ; then
+ doins pppd/plugins/dhcp/dhcpc.so
+ fi
+ if use radius ; then
+ doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+ #Copy radiusclient configuration files (#92878)
+ insinto /etc/ppp/radius
+ insopts -m0644
+ doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+ doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+ fi
+
+ insinto /etc/modprobe.d
+ insopts -m0644
+ newins "${FILESDIR}/modules.ppp" ppp.conf
+
+ dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+ dodoc "${FILESDIR}/README.mpls"
+
+ dosbin scripts/p{on,off,log}
+ doman scripts/pon.1
+
+ # Adding misc. specialized scripts to doc dir
+ insinto /usr/share/doc/${PF}/scripts/chatchat
+ doins scripts/chatchat/*
+ insinto /usr/share/doc/${PF}/scripts
+ doins scripts/*
+
+ if use gtk ; then
+ dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+ newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+ else
+ newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+ fi
+ doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_src_exists ; then
+ echo
+ ewarn "If the following test report contains a missing kernel configuration option that you need,"
+ ewarn "you should reconfigure and rebuild your kernel before running pppd."
+ CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+ local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+ local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+ local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+ if use activefilter ; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+ local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+ fi
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+ local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+ local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+ local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+ local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+ local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+ if use atm ; then
+ CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+ local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+ fi
+ check_extra_config
+ fi
+
+ # create *-secrets files if not exists
+ [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+ cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+ [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+ cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+ # lib name has changed
+ sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
+
+ echo
+ elog "Pon, poff and plog scripts have been supplied for experienced users."
+ elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+ elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-dialup/ppp/ppp-2.4.7.ebuild b/net-dialup/ppp/ppp-2.4.7.ebuild
index 3b6ed11450c7..da147942f209 100644
--- a/net-dialup/ppp/ppp-2.4.7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.9 2015/03/03 09:20:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.7.ebuild,v 1.10 2015/05/14 10:19:41 pinkbyte Exp $
EAPI=5
@@ -18,7 +18,8 @@ SLOT="0/${PV}"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 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 )