gentoo resync : 15.06.2021

9 files changed, 278 insertions, 13 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 7f4b668a850b..87af3afd3676 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 179d8a919edd..55e9cc550c6d 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -6,6 +6,8 @@ AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
 DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
+DIST freeradius-server-3.0.22.tar.gz 5248422 BLAKE2B b48170a02a354562dc2dd27230476d2ce0823fa2f577dde3f3947ee14653d912a562eb480c2d2ed53b0ff536f63ce4482b24f2777b4a41ff2ed4aba88f4c196e SHA512 8ee05350b1a5e811a51030a3ef0c511c58275407171f0ce41775e3695f3e9a4477e2fc288541015d314be5457154201d4e95f4c45cf7f503bc8829909c2551a8
 EBUILD freeradius-3.0.20-r1.ebuild 7522 BLAKE2B 8a4af6f6a3eac63ce3e3ee9e92298a09c19a7ff5aa3ab32e48c8581c3c9ac74ae2856d80b771cf0998161e1a7a4e79924c52186fdd481f156f583bcf12d9a218 SHA512 8d632a2ec8793b4a6712ac71b5e84594bb0175a53546170de6eb6d013cb46530bb2561b57a7a130da182c2e3c03de3776eb4fc733248fe1c7ae12b05d17b2dd7
-EBUILD freeradius-3.0.21-r1.ebuild 7417 BLAKE2B 2017eb36e370a7117699b163a5d3dd2a3e951d7d852707545499984054c16ff8e80104645622a90ac4ee0221abeee703c956d6f8047fea16c8e1031ba2645bb6 SHA512 c57617e02d3b5cf3c3b749af414bf3d24ec998ac861fb2fec771fd52096746c4052cf13f3929af07a79570f06bd5a23a9d62edf8aed3db652c0083df98adbaff
+EBUILD freeradius-3.0.21-r1.ebuild 7419 BLAKE2B a43be3faa52f59255fb3fa66cfdb5df9da1822e774ed0289dbf3d8ce2c2ab36dbe29548a8e76ceb1772cce79622e1afb9d705cd3ce654b7ee4988e3c75849af3 SHA512 8cc4b67a0754610183cbdce694d7c74db06dc4e8df70c62140d455e463c0b389d72a9d010a0669df5b6b82a7cb745778f0cdfbb7833fcdb61342f253c18ea158
+EBUILD freeradius-3.0.22.ebuild 7422 BLAKE2B 2458fa4dba31129a42353d39fc75fc4c274de88b6844293bf29d7d4c64707c2764dcacbe5da6fa3d62f797499d8d7c5e93b6942c5fe8d3567a925c386bcdabb0 SHA512 56c51fa2e66e9efcc7699ba1ca282429104846721cd3056751f36c8477f37759a2af2f3efb09ff6d2062d8436aa44e4d0ae9233d3a6c018700c3ad5a78165f81
 MISC metadata.xml 894 BLAKE2B 462f2bc696550e919723d5a6435c11a8b217b183aef0f623737bbf446f43153da33840478bc10c45277d253d82e4186a4a85661565edcc37d03b924f60220fc9 SHA512 0cadbf858cab18860ad4934c0d1163bc149f3616395420568357c1cd959b635d5c5835216fde2cd799718010e16e13fc3acc746108a49b9c5d19cc5b64581347
diff --git a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
index 2706b9bc43ef..7dfd7fe3a313 100644
--- a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools pam python-single-r1 systemd
 
 MY_P="${PN}-server-${PV}"
diff --git a/net-dialup/freeradius/freeradius-3.0.22.ebuild b/net-dialup/freeradius/freeradius-3.0.22.ebuild
new file mode 100644
index 000000000000..293d9f72af3f
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.22.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools pam python-single-r1 systemd
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	pcap postgres python readline redis rest samba sqlite ssl systemd
+"
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pam? ( sys-libs/pam )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	redis? ( dev-libs/hiredis:= )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/openssl:0=[-bindist]
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	eapply_user
+	default
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	# Drop support of python2
+	rm -r src/modules/rlm_python || die
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r4" radiusd
+	newconfd "${FILESDIR}/radius.conf-r5" radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		fowners root:radius "${ROOT}"/etc/raddb/certs
+		fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
+		fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/ppp-scripts/Manifest b/net-dialup/ppp-scripts/Manifest
index 20c406dd0189..95c374551500 100644
--- a/net-dialup/ppp-scripts/Manifest
+++ b/net-dialup/ppp-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST ppp-scripts-0.tar.xz 1824 BLAKE2B dc2fe1fa860ec9abe43466a270324f8ac39f08a8ed35f2dbd971a59a2e07a939049624802ae8b8c5a4bf11544c871d27517976f61486c4cdbad75f162a502c59 SHA512 a36e6180b0acc8081b192602a2a5dbe765f1ba26e2cca8dc80d1dbc0e405b86acd6fe0cf655fb520c9f45373528773e64545876fd3370ce3514ffd9858916971
-EBUILD ppp-scripts-0.ebuild 664 BLAKE2B ecc0fa3c3efd73d29088411475bfbf6a6cf7a507a2da5510e261bd3720cc000d114560f0707dd1cafaf7a105d6a9310a996c0c6dce9d028c903c9bd4b5d0a658 SHA512 81d57e1d0db1b483b71316fa3d790963e8d91f42225db6be2ae57ca5ad776adced886f0b91c1c4f9ed7b7334aed07ce58fc5a56241fb91d4291b207a8f35b0e4
+EBUILD ppp-scripts-0.ebuild 664 BLAKE2B 22f76cb99040c12db2ce96c1487d2fc7a3bcb36d3f6fd12df703b2f6226ff7cc11c03b06346353c234808a563231e67c08799fbed078747bbded192738a5ebad SHA512 9f846365ab52f950f67803f3c0f809ec83f0adc837d7d15aefcb3f986e3146ecdefd4c2e5ed109bf9b74f35374df8a0a86010a6b350cc05907b79f1965cb95ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 9299c2d744b8..5cfe76c23ab5 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Common set of scripts for various PPP implementations"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -20,8 +20,8 @@ src_install() {
 	exeinto /etc/ppp
 	for i in ip-up ip-down ; do
 		doexe "scripts/${i}"
-		insinto /etc/ppp/${i}.d
 		dosym ${i} /etc/ppp/${i/ip/ipv6}
+		insinto /etc/ppp/${i}.d
 		doins "scripts/${i}.d"/*
 	done
 }
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 01773dc24acc..74333dbd0224 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -3,5 +3,5 @@ AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35
 DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c SHA512 5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
-EBUILD ppp-2.4.9-r2.ebuild 7367 BLAKE2B c63ebfeab0a0de84bfe796dbebf5d13910426611156db553de79cb61644956dee4aff9476fc3140cfd2806c1842fc19a71ae0e4316a6e98b68ee889213a613b6 SHA512 59890b24adda02cc49cd74adb7542b6228188d89a64ae851f3bed01605adf1508d7a99cb58c9cda41abeeb0b33b73bd4aa8efab4c9bb768e76508af5c19a62d7
-MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
+EBUILD ppp-2.4.9-r2.ebuild 7364 BLAKE2B 15e7f76295934b6d4b21d49f791f386f35fe17db47eb69fdd282df0f151f972e2702597bd33b5a1ac40635a54268b30a995e0290a379fdcc1a0b7a5e7a25f87a SHA512 5c3bb08ba10dce58b139ae88a40ba938c24cee54539a5454dabb7ce6b6e7e7f97fc8b29c88c8582f232217ed9a7e23f44fb830d678c818443ec427a678062126
+MISC metadata.xml 1096 BLAKE2B 6079f546fb5586c7b57529e6748125390f89a43c5d73d3d8454a8bf59ce2b33403884f5cc73b9bd8a45c9446b84f046961907d03ab6d36b6a28fcf42b2fe9aeb SHA512 04f921e7c99468c4d0fe62d902b53be82d87e59dbf477a39cb047b406eb21bcc001e2fef800dae3e44f04289bcf93fa6ebe81c333756e984631ac05fc1a7a847
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index a0beaacabe4a..4088e8b313f0 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -11,8 +11,6 @@
   </maintainer>
   <use>
     <flag name="activefilter">Enables active filter support</flag>
-    <flag name="atm">Enables ATM (Asynchronous Transfer Mode) protocol
-    support</flag>
     <flag name="dhcp">Installs PPP DHCP client plugin for IP address allocation
     by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
     <flag name="eap-tls">Enables support for Extensible Authentication
@@ -21,7 +19,6 @@
     <flag name="gtk">Installs GTK+ password prompting program that can be used
     by passprompt.so PPP plugin for reading the password from a X11 input
     terminal</flag>
-    <flag name="ipv6">Enables support for IP version 6</flag>
     <flag name="radius">Enables RADIUS support</flag>
   </use>
   <upstream>
diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 61bbe8a89062..a949862b2b6f 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -107,8 +107,8 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export AR PKG_CONFIG
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+	tc-export AR CC PKG_CONFIG
+	emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
 
 	# build pppgetpass
 	cd contrib/pppgetpass || die