Diff rp-pppoe-3.15-r2 with a rp-pppoe-4.0

/usr/portage/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild 2023-10-09 14:52:33.352368447 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
5

  
6
inherit autotools readme.gentoo-r1 toolchain-funcs
7

  
8
PATCHSET="${PN}-3.14-patches-01"
9
PATCHES=(
10
	"${FILESDIR}/rp-pppoe-3.15-no_max_interfaces.patch"
11
)
4
EAPI=8
12 5

  
13 6
DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
14 7
HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
15
SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
16
	https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
8
if [[ ${PV} == 9999 ]]; then
9
	inherit git-r3
10
	EGIT_REPO_URI=https://github.com/dfskoll/rp-pppoe.git
11
else
12
	SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz"
13
	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
14
fi
17 15

  
18 16
LICENSE="GPL-2"
19 17
SLOT="0"
20
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
21
IUSE="tk"
18

  
19
S="${S}/src"
22 20

  
23 21
RDEPEND="
24
	<net-dialup/ppp-2.5:=
22
	net-dialup/ppp:=
25 23
	sys-apps/iproute2
26
	tk? ( dev-lang/tk:= )
27 24
"
28 25
DEPEND=">=sys-kernel/linux-headers-2.6.25
29 26
	elibc_musl? ( net-libs/ppp-defs )
30 27
	${RDEPEND}"
31 28

  
32
DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
29
PATCHES=(
30
	"${FILESDIR}/rp-pppoe-4.0-ar_environment.patch"
31
)
33 32

  
34 33
pkg_setup() {
35 34
	# This is needed in multiple phases
......
40 39
	PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}"
41 40
}
42 41

  
43
src_prepare() {
44
	if ! use elibc_musl ; then
45
		rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die
46
	fi
47

  
48
	rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die
49

  
50
	eapply "${WORKDIR}/patches"
51
	eapply "${PATCHES[@]}"
52
	eapply_user
53

  
54
	cd "${S}"/src || die
55
	eautoreconf
56
}
57

  
58 42
src_configure() {
59 43
	addpredict /dev/ppp
60 44

  
61
	cd src || die
62

  
63 45
	econf --enable-plugin=/usr/include/pppd
64 46
}
65 47

  
66 48
src_compile() {
67
	cd src || die
68
	emake AR="$(tc-getAR)" PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
69

  
70
	if use tk ; then
71
		emake -C "${S}/gui"
72
	fi
49
	emake PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
73 50
}
74 51

  
75 52
src_install() {
76
	cd src || die
77 53
	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install
78 54

  
79 55
	# We don't need this README file here.
80 56
	rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation"
81 57

  
82
	if use tk ; then
83
		emake -C "${S}/gui" \
84
			DESTDIR="${D}" \
85
			datadir=/usr/share/doc/${PF}/ \
86
			install
87
		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
88
	fi
89

  
90 58
	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
91 59
	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
92

  
93
	readme.gentoo_create_doc
94 60
}
Thank you!