commit: d413bc84e352fd761aabeadd7fe5a2412fd2b9bf Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Tue Nov 30 12:12:46 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 1 21:29:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d413bc84
net-dialup/rp-pppoe: revision bump to fix bugs. Closes: https://bugs.gentoo.org/715396 Closes: https://bugs.gentoo.org/364941 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/23126 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dialup/rp-pppoe/metadata.xml | 2 +- net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild | 89 +++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml index 77a87ef4abda..6bde8ba5af3b 100644 --- a/net-dialup/rp-pppoe/metadata.xml +++ b/net-dialup/rp-pppoe/metadata.xml @@ -9,4 +9,4 @@ <email>[email protected]</email> <name>Gentoo Base System</name> </maintainer> - </pkgmetadata> +</pkgmetadata> diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild new file mode 100644 index 000000000000..dba2eeb9b98f --- /dev/null +++ b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools readme.gentoo-r1 toolchain-funcs + +PATCHES="${PN}-3.14-patches-01" + +DESCRIPTION="A user-mode PPPoE client and server suite for Linux" +HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"; +SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz + https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="tk" + +RDEPEND=" + net-dialup/ppp:= + sys-apps/iproute2 + tk? ( dev-lang/tk:= ) +" +DEPEND=">=sys-kernel/linux-headers-2.6.25 + ${RDEPEND}" + +DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" + +pkg_setup() { + # This is needed in multiple phases + PPPD_VER="$(best_version net-dialup/ppp)" + PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR} + PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV} + + PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}" +} + +src_prepare() { + if ! use elibc_musl ; then + rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die + fi + + rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die + + eapply "${WORKDIR}/patches" + eapply_user + + cd "${S}"/src || die + eautoreconf +} + +src_configure() { + addpredict /dev/ppp + + cd src || die + + econf --enable-plugin=/usr/include/pppd +} + +src_compile() { + cd src || die + emake AR="$(tc-getAR)" PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}" + + if use tk ; then + emake -C "${S}/gui" + fi +} + +src_install() { + cd src || die + emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install + + # We don't need this README file here. + rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation" + + if use tk ; then + emake -C "${S}/gui" \ + DESTDIR="${D}" \ + datadir=/usr/share/doc/${PF}/ \ + install + dosym doc/${PF}/tkpppoe /usr/share/tkpppoe + fi + + newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server + newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server + + readme.gentoo_create_doc +}
