Update to EAPI=4 and move patchset to CVS.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 246 insertions, 15 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index f6e4035a0a37..55321491144a 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.278 2012/08/07 15:05:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.279 2012/08/10 04:12:54 vapier Exp $
+
+*ppp-2.4.5-r3 (10 Aug 2012)
+
+  10 Aug 2012; Mike Frysinger <vapier@gentoo.org> +ppp-2.4.5-r3.ebuild:
+  Update to EAPI=4 and move patchset to CVS.
 
   07 Aug 2012; Mike Frysinger <vapier@gentoo.org> ppp-2.4.5-r2.ebuild:
   Remove local copies of linux-headers and rely on the system one being up-to-
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 7b474a760f36..6b84f3902903 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -7,27 +7,29 @@ DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 SHA256 52f174b3df36110d14c522869c507
 DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea SHA512 70bde7121a0a2e150a7eec85731ca1055a2741da7886a8b8734c075637703d223bb579c3d14ad32a009488e07deaa62e7948e2d3e73077e6fb3db076841f7270 WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f
 DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd SHA512 f24d9bdb8ee1cea7effcb314d88337672a4423a74249153da34999117f056e118981956c49cb8b3801054a38a52c4fcc3cd048fac9b339ad77f0f8b0ea9c99c6 WHIRLPOOL 421c2c78266eeda12ead02711a4d6c38f6cc7fe32c0f128a9a66e402a5c99b5ad6af9f109132ad437588e807846fb3945144126660414d7775a95335ada6bd8e
 DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed SHA512 ff9ac176e532ece8f0b13adf75c6999bd81a6f8a75a9edb490219c160cc7a2f055ace7a6ff73bc84965fafa2eb8a689a7106a349923be8c73464e2c00ab16ab6 WHIRLPOOL fb2d7a408ceebae22c83246d441fa5955ed013e9eeadb6247f06fe41512eb47860578768b3fe2f9a0683844e7c40e271e4b22b9f401a87dec376c17fcc9825e9
+DIST ppp-2.4.5-patches-1.tar.xz 37188 SHA256 c654757af62bb49af15d3dd4c3686074e8817752e4756e993e023a56556e055c SHA512 ba4803698510cdcec17c627365e1ac1329b167d58b83fb7140222425ee507fc2aab1443cfaa1ecfe4eb2a68dca2a25562966ad2be7262ac1b5fe626f379ca071 WHIRLPOOL e6cc28d46a1f005b91314d7ac5ec321f34e34da246868c69334a18113788964358e3ca1d074dc1a6c5e1f72b8bee9f8607572e63672b03b4d95a19e15e583c45
 DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
 DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
 EBUILD ppp-2.4.4-r25.ebuild 10959 SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373 SHA512 884f0fef8fca451b18746ad04639788a3fb6bcae4211f36ffa695b9ce7eb9d590a7d394bc390c406f81eddbc2a8f55fdff1376ba14495ee9906e3c1f9ab2ee37 WHIRLPOOL 7f9f60e0cf5743e8d3759268253338009f3069b283eeefeca95ad50b5b11458824ae07c5afe69983bd398b157bab0dcc67fdd9c080d617dd9b8959f04cf6ea27
 EBUILD ppp-2.4.5-r1.ebuild 10047 SHA256 a2591d0d4a9fff20c460983e388d3095cb284778cdae8e6a7b7d8140f40e0016 SHA512 3a9546138f54f33827a95d5cf13beb92319d419a25d496cff55b7f89ea4cb5cc3dc89880cec0b4ffd4ca8c0bffc102b51551d32c0219a7d06c9c8f1ea3cc00c1 WHIRLPOOL a11b3a285f513b0a30017a1c45768db2b4bdfbdb4585033db8a4b261e14ff2c52227cfa8f2687343395e7856d57e960ad1dd3051765c938b0d9bcd1c9e8c210e
 EBUILD ppp-2.4.5-r2.ebuild 10108 SHA256 88800148e714e3e614078e0a5c8b601f9ed6ca43832bd7ce60020067eb4f3ab5 SHA512 dbbab510d62d11e1a4f5eff267dee2b825e4dd99a7ed72c1729dd0bdb82ebcb338eb2a5a95f9591760309a27ab420881ba9260dd70c603654fbde20f8111d746 WHIRLPOOL 8215e78fb67e504002cc2811ac5847550a2f00e0e57c9ef4d1ed050ec1262c0685393c24c0c0e737b7173d228b205f2ca8c55dfbe82e6eaefec7c1edc6323d2e
-MISC ChangeLog 44521 SHA256 a0e015a5b4ae0fc9f82d42605d3caaeb3ddbc2d43b385036981673d481ea842e SHA512 d046cfe1d833c119cc8708bb9e6879da5c8dd32de4a0a18fd84c6de8c412dfee7728e5cfca05d2f5e4018249073e71af278abe0c5eabda8ff6ff08b51b484ab3 WHIRLPOOL 16759f8b2864e44a5921faf8aee6addc434bf0f56921e124255b244c4a169359353c9b0d11d446bb33cac43176feb8b9d0c5c4a5b15353010efaff9a000f66da
+EBUILD ppp-2.4.5-r3.ebuild 7156 SHA256 c90abe915e297b12f7a26fcd6e270a17de509bb03c3d986894c37f1706501f1e SHA512 94df64e5634e169ec53ce04222d6eea8237cc94d151881d040e10c3da874a2ec42a66a732c63ba24ca3e6219e031e64492de99adc782ec4c092770b44bf438e5 WHIRLPOOL 98ef832d3e1bb327ef100df599b8a03999a723bcae1a42009a52434cf831b104cf513b04ddefea90c7c7bf958958463818f7829ef1af5155a595b410c5639aac
+MISC ChangeLog 44668 SHA256 36f31dfb5cdae9b90bad07ef099db0f01646c804323d67a834054c42c6aabe9b SHA512 91d8fd61d7a643318e5e7b9db6aa479e453f8f85e6d2bfabdf62a07dac106d326c1055667f719cc974e24c737fd426ba910a1e464dd09fd766e76ab1b0746a10 WHIRLPOOL dff2f6c13d95fffc74f61926e56e29c00b399b5d625312e41c57c754a4910e5747c10896f93ba1eb6a1a0332cbeabfc0c56a8c8029318871db331e4834dba169
 MISC metadata.xml 1355 SHA256 13d1a96a0ab4ad880369f5a7ea0b480de8af8a58545864e63199b1146cc5dd82 SHA512 c04ba18a61308349854637fe6625238c7759b3f7600e3bd7867562fea29903b0364bff815dceb71c5daef09d5e897e810a7389289826f1079f820ea0bb8c94a6 WHIRLPOOL 56811f2d00adccb6fb105fec27e06cf1b51f2da56269cd60483e6b5ebae007b12a40fbc5db5029b0900477fdc144247f3e0dd12456ef7d7edc7627cbebfad4fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIS65AAoJELEHsLL7fEFWcpoP/jvo0teSBdW/AS+XCHP8k1hd
-0Y+svr7YZ2bQl9NY32YBQd+CZM1I/bpZLoaH3WdUcKldhDP1hTQLZt+2oxh+Pjc4
-dLJOcO8r5BdDr/oT4uApVImUUDK0NYj3waevN/9RVr3PfogzMJjk9JoZ+p5HRuLX
-ikQqUeIuJtm8p0uSKUYZeDxm2aY4/u5zRjls8EbwU5/nlkWbRyciUx/FI8zi1w3r
-F3CPX0mdYQ4CvKBL2i+PwZk2dMV5oD/qpUr4V37fQeYqHDlCZJR+G59kQg7YkXgx
-cleV8D/vrOhFVr1s9XLQHn8tiJADEtGu+LInJK0JKW3kyOGMkVeMxV3MD4e1L/+0
-aHJuAY6JG5ja43fOVMs2CySumYqzJeEKulLaPnWw4aL0lpQWOmlh8W0sM/3c5x02
-AtbdUy77tv+I1HjplxW2IS8SVTE7WBKJcOG0i15XHJssGA/03Aa0BuRR/Pw/DaRN
-le2fJEl9LRY8LZiys97Zhv6zdkqObTTSPd97gVPLol/CsrguNnJLIMTKMz9wGd6S
-PzRz/w3fTmmCJgB3skTEBuWqyZl2voCSzzSgmGd1pEyVpsZZaGSIg8u8R8nELmzb
-ClRAR+ifruztpcyIs9TSxmHv54aVCbRU8EJ6nIIGlHeJexF9s1qjvWoZOu1LHAI6
-S0IzxqFUqUuikSRktE6N
-=7cWU
+iQIcBAEBCAAGBQJQJIpNAAoJELEHsLL7fEFWL8AQAInonSfnLL5BPYQDz7nIVAvm
+cwLUds2W3/aKNUi7PMbxCBRDoif6lAdb11C1LRTlDdQS9EFp0oZovq9SucMWxSfj
+zOpebUogUKNjIQ62xWtFGpKSJOhKmyN8qSdcaYSuVZWklj/VTLIVT1DkSxR6eAfu
+3N3mWt7SwGc6Pe4MGzLb/+Cnro9Htnh7c2ZQLsi7NncWp5DA2Xv6peZc9JLIczMx
+DHkGJxipe/woeNtgKjJF3nuPZl2OX/Y/jOSXAIABS29ozfqcEscvZc3mzrAPw1Yr
+Hoi7m7DteY5HKYnWdvMj92d20kQjUlqD2PEsyavujSRIx9bvCPt/KivLMr2jk2tB
+VXnyywcMHpy4REeSH7LgmmZt1BiFOC6UtgcqOsD+gIt/05LbfV3oxlflzlj0P8QW
+jPtmzi0kjh4qYvTgxG7Mw8itqNqWFrwC/aA7SlEZHZ+SbNwr9quDJ1CRnPOMDrjM
+QCmTrZqm47p4jCRgVJAGCagBcQ/y2YOuNLG45dGjsaNJmsPL0tqhYjYKDLOV5tTr
+/sSDI/7fCzjWWdNF0n20kN01I+Sw0VUeXksVv8bS7+iR/S8rf1hWgg4dVJMcHlYE
+Zxigt59HeP78ZZ0CmWJDPGkJQxIKOyNOiNuWXnuTCZLYWFXiOhuaBn9ibxv5w3fm
+RCeDFv1961fu0snsOXaB
+=Qu0U
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.5-r3.ebuild b/net-dialup/ppp/ppp-2.4.5-r3.ebuild
new file mode 100644
index 000000000000..2b85d46a43a4
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.5-r3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r3.ebuild,v 1.1 2012/08/10 04:12:54 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs linux-info pam
+
+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/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
+	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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}"
+
+src_prepare() {
+	# Use the headers from the kernel #427684
+	rm include/linux/if_pppol2tp.h || die
+
+	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+	use dhcp || EPATCH_EXCLUDE+=" 8?_all_dhcp-*"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
+
+	if use dhcp ; then
+		# copy the ppp-dhcp plugin files
+		einfo "Adding ppp-dhcp plugin files"
+		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+		sed -i \
+			-e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \
+			pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8}
+
+	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
+		#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/*
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass
+	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
+
+	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/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	# 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"
+
+	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."
+}