Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/
Date: Wed, 19 Jan 2022 11:35:07
Message-Id: 1642592093.0e38714c614e269a4188c1521515a16e258f26be.polynomial-c@gentoo
1 commit: 0e38714c614e269a4188c1521515a16e258f26be
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 19 11:34:53 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 19 11:34:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e38714c
7
8 net-dialup/rp-pppoe: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 net-dialup/rp-pppoe/Manifest | 2 -
13 net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild | 96 --------------------------------
14 2 files changed, 98 deletions(-)
15
16 diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
17 index e30cbe2a4fac..b5d0fa70c57e 100644
18 --- a/net-dialup/rp-pppoe/Manifest
19 +++ b/net-dialup/rp-pppoe/Manifest
20 @@ -1,5 +1,3 @@
21 -DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
22 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
23 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
24 -DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29
25 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
26
27 diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
28 deleted file mode 100644
29 index 21179f572f4f..000000000000
30 --- a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
31 +++ /dev/null
32 @@ -1,96 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit autotools readme.gentoo-r1 toolchain-funcs
39 -
40 -PPP_P="ppp-2.4.8"
41 -PATCHES="${P}-patches-01"
42 -
43 -DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
44 -HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
45 -SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
46 - https://github.com/paulusmack/ppp/archive/${PPP_P}.tar.gz
47 - https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0"
51 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
52 -IUSE="tk"
53 -
54 -RDEPEND="
55 - net-dialup/ppp:=
56 - tk? ( dev-lang/tk:= )
57 -"
58 -DEPEND=">=sys-kernel/linux-headers-2.6.25
59 - ${RDEPEND}"
60 -
61 -DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
62 -
63 -pkg_setup() {
64 - # This is needed in multiple phases
65 - PPPD_VER=$(best_version net-dialup/ppp)
66 - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
67 - PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
68 -}
69 -
70 -src_prepare() {
71 - if ! use elibc_musl ; then
72 - rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die
73 - fi
74 -
75 - eapply "${WORKDIR}/patches"
76 - eapply_user
77 -
78 - cd "${S}"/src || die
79 - eautoreconf
80 -}
81 -
82 -src_configure() {
83 - addpredict /dev/ppp
84 -
85 - cd src || die
86 - # Not a mistake! This comes from the GitHub tarball doing funky naming
87 - econf --enable-plugin=../../ppp-ppp-${PPPD_VER}
88 -}
89 -
90 -src_compile() {
91 - cd src || die
92 - emake AR="$(tc-getAR)"
93 -
94 - if use tk; then
95 - emake -C "${S}/gui"
96 - fi
97 -}
98 -
99 -src_install() {
100 - cd src || die
101 - emake DESTDIR="${D}" install
102 -
103 - #Don't use compiled rp-pppoe plugin - see pkg_preinst below
104 - local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so"
105 - if [[ -f "${pppoe_plugin}" ]] ; then
106 - rm "${pppoe_plugin}" || die
107 - fi
108 -
109 - if use tk ; then
110 - emake -C "${S}/gui" \
111 - DESTDIR="${D}" \
112 - datadir=/usr/share/doc/${PF}/ \
113 - install
114 - dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
115 - fi
116 -
117 - newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
118 - newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
119 -
120 - readme.gentoo_create_doc
121 -}
122 -
123 -pkg_preinst() {
124 - # Use the rp-pppoe plugin that comes with net-dialup/pppd
125 - if [[ -n "${PPPD_VER}" ]] && [[ -f "${EROOT}/usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so" ]] ; then
126 - dosym ../../../usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
127 - fi
128 -}