1 |
commit: 70a33777ca6bea84f916e1ccd2f3cef45fd0cca8 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 20:48:38 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 20:48:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a33777 |
7 |
|
8 |
net-misc/miniupnpd: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-misc/miniupnpd/Manifest | 2 - |
13 |
net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild | 88 ----------------------- |
14 |
net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild | 91 ------------------------ |
15 |
3 files changed, 181 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest |
18 |
index 6bdc91e4601..1574ecf6cf8 100644 |
19 |
--- a/net-misc/miniupnpd/Manifest |
20 |
+++ b/net-misc/miniupnpd/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26 |
23 |
-DIST miniupnpd-2.1.20190924.tar.gz 241008 BLAKE2B 392006e71ede0d18dc1dbfd13c46e591f6675fcb02828461f0afc79b4019f953f62ab95669e92cee4724ff502585420c563d555a7948b0f9d25d755efe6bdb2c SHA512 719a3ac741327691170d7e933b170dcc1399da1958d9373327b96ab5d975290d2bfa0f68d96fbb2ac4b3fb9808b50385291705cd393252263f403d43298c4031 |
24 |
DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599 |
25 |
|
26 |
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild |
27 |
deleted file mode 100644 |
28 |
index 07c804f3564..00000000000 |
29 |
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,88 +0,0 @@ |
32 |
-# Copyright 1999-2019 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit toolchain-funcs |
38 |
- |
39 |
-DESCRIPTION="MiniUPnP IGD Daemon" |
40 |
-HOMEPAGE="http://miniupnp.free.fr/" |
41 |
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="BSD" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="~amd64 ~arm ~x86" |
46 |
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" |
47 |
- |
48 |
-RDEPEND=" |
49 |
- dev-libs/gmp:0= |
50 |
- sys-apps/util-linux:= |
51 |
- dev-libs/openssl:0= |
52 |
- !nftables? ( |
53 |
- >=net-firewall/iptables-1.4.6:0=[ipv6?] |
54 |
- net-libs/libnfnetlink:= |
55 |
- net-libs/libmnl:= |
56 |
- ) |
57 |
- nftables? ( |
58 |
- net-firewall/nftables |
59 |
- net-libs/libnftnl:= |
60 |
- net-libs/libmnl:= |
61 |
- )" |
62 |
-DEPEND="${RDEPEND} |
63 |
- sys-apps/lsb-release" |
64 |
- |
65 |
-src_prepare() { |
66 |
- default |
67 |
- |
68 |
- # Prevent overriding CFLAGS. |
69 |
- sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die |
70 |
- |
71 |
- mv "Makefile.linux$(usex nftables _nft '')" Makefile || die |
72 |
- |
73 |
- # Prevent gzipping manpage. |
74 |
- sed -i -e '/gzip/d' Makefile || die |
75 |
-} |
76 |
- |
77 |
-src_configure() { |
78 |
- local -a opts |
79 |
- opts=( |
80 |
- --vendorcfg |
81 |
- $(usex igd2 '--igd2' '') |
82 |
- $(usex ipv6 '--ipv6' '') |
83 |
- $(usex leasefile '--leasefile' '') |
84 |
- $(usex portinuse '--portinuse' '') |
85 |
- $(usex pcp-peer '--pcp-peer' '') |
86 |
- $(usex strict '--strict' '') |
87 |
- ) |
88 |
- |
89 |
- emake CONFIG_OPTIONS="${opts[*]}" config.h |
90 |
-} |
91 |
- |
92 |
-src_compile() { |
93 |
- # By default, it builds a bunch of unittests that are missing wrapper |
94 |
- # scripts in the tarball |
95 |
- emake CC="$(tc-getCC)" STRIP=true miniupnpd |
96 |
-} |
97 |
- |
98 |
-src_install() { |
99 |
- emake PREFIX="${ED}" STRIP=true install |
100 |
- |
101 |
- local confd_seds=() |
102 |
- if use nftables; then |
103 |
- confd_seds+=( -e 's/^iptables_scripts=/#&/' ) |
104 |
- else |
105 |
- confd_seds+=( -e 's/^nftables_scripts=/#&/' ) |
106 |
- fi |
107 |
- if ! use ipv6 || use nftables; then |
108 |
- confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) |
109 |
- fi |
110 |
- |
111 |
- newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} |
112 |
- newconfd - ${PN} < <(sed "${confd_seds[@]}" \ |
113 |
- "${FILESDIR}"/${PN}-conf.d-r2 || die) |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- elog "Please correct the external interface in the top of the two" |
118 |
- elog "scripts in /etc/miniupnpd and edit the config file in there too" |
119 |
-} |
120 |
|
121 |
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild |
122 |
deleted file mode 100644 |
123 |
index 8878d99503e..00000000000 |
124 |
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild |
125 |
+++ /dev/null |
126 |
@@ -1,91 +0,0 @@ |
127 |
-# Copyright 1999-2019 Gentoo Authors |
128 |
-# Distributed under the terms of the GNU General Public License v2 |
129 |
- |
130 |
-EAPI=7 |
131 |
- |
132 |
-inherit toolchain-funcs |
133 |
- |
134 |
-DESCRIPTION="MiniUPnP IGD Daemon" |
135 |
-HOMEPAGE="http://miniupnp.free.fr/" |
136 |
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" |
137 |
- |
138 |
-LICENSE="BSD" |
139 |
-SLOT="0" |
140 |
-KEYWORDS="~amd64 ~arm ~x86" |
141 |
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" |
142 |
- |
143 |
-RDEPEND=" |
144 |
- dev-libs/gmp:0= |
145 |
- sys-apps/util-linux:= |
146 |
- dev-libs/openssl:0= |
147 |
- !nftables? ( |
148 |
- >=net-firewall/iptables-1.4.6:0=[ipv6?] |
149 |
- net-libs/libnfnetlink:= |
150 |
- net-libs/libmnl:= |
151 |
- ) |
152 |
- nftables? ( |
153 |
- net-firewall/nftables |
154 |
- net-libs/libnftnl:= |
155 |
- net-libs/libmnl:= |
156 |
- )" |
157 |
-DEPEND="${RDEPEND} |
158 |
- sys-apps/lsb-release" |
159 |
- |
160 |
-src_prepare() { |
161 |
- default |
162 |
- |
163 |
- # Prevent overriding CFLAGS. |
164 |
- sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die |
165 |
- |
166 |
- mv "Makefile.linux$(usex nftables _nft '')" Makefile || die |
167 |
- # meh, we have two Makefiles but genconfig.sh guesses anyway... |
168 |
- sed -e "s@\[ -x \"\$(command -v nft)\" \]@$(usex nftables true false)@" \ |
169 |
- -i genconfig.sh || die |
170 |
- |
171 |
- # Prevent gzipping manpage. |
172 |
- sed -i -e '/gzip/d' Makefile || die |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- local -a opts |
177 |
- opts=( |
178 |
- --vendorcfg |
179 |
- $(usex igd2 '--igd2' '') |
180 |
- $(usex ipv6 '--ipv6' '') |
181 |
- $(usex leasefile '--leasefile' '') |
182 |
- $(usex portinuse '--portinuse' '') |
183 |
- $(usex pcp-peer '--pcp-peer' '') |
184 |
- $(usex strict '--strict' '') |
185 |
- ) |
186 |
- |
187 |
- emake CONFIG_OPTIONS="${opts[*]}" config.h |
188 |
-} |
189 |
- |
190 |
-src_compile() { |
191 |
- # By default, it builds a bunch of unittests that are missing wrapper |
192 |
- # scripts in the tarball |
193 |
- emake CC="$(tc-getCC)" STRIP=true miniupnpd |
194 |
-} |
195 |
- |
196 |
-src_install() { |
197 |
- emake PREFIX="${ED}" STRIP=true install |
198 |
- |
199 |
- local confd_seds=() |
200 |
- if use nftables; then |
201 |
- confd_seds+=( -e 's/^iptables_scripts=/#&/' ) |
202 |
- else |
203 |
- confd_seds+=( -e 's/^nftables_scripts=/#&/' ) |
204 |
- fi |
205 |
- if ! use ipv6 || use nftables; then |
206 |
- confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) |
207 |
- fi |
208 |
- |
209 |
- newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} |
210 |
- newconfd - ${PN} < <(sed "${confd_seds[@]}" \ |
211 |
- "${FILESDIR}"/${PN}-conf.d-r2 || die) |
212 |
-} |
213 |
- |
214 |
-pkg_postinst() { |
215 |
- elog "Please correct the external interface in the top of the two" |
216 |
- elog "scripts in /etc/miniupnpd and edit the config file in there too" |
217 |
-} |