| 1 |
commit: b92ee975bf1a5ec55457c0a71ced73c96a685427 |
| 2 |
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> |
| 3 |
AuthorDate: Sat Apr 25 02:47:44 2020 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 27 12:25:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b92ee975 |
| 7 |
|
| 8 |
net-misc/whois: Patches in ::gentoo, CFLAGS not required, in-tree v5.4.3 OK |
| 9 |
|
| 10 |
>>> Completed installing net-misc/whois-5.4.3 into /var/tmp/portage/net-misc/whois-5.4.3/image |
| 11 |
>>> net-misc/whois-5.4.3 merged. |
| 12 |
|
| 13 |
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> |
| 14 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 15 |
|
| 16 |
net-misc/whois/Manifest | 17 ------ |
| 17 |
net-misc/whois/files/whois-4.7.2-config-file.patch | 12 ---- |
| 18 |
.../whois/files/whois-5.3.0-libidn_automagic.patch | 23 -------- |
| 19 |
net-misc/whois/metadata.xml | 8 --- |
| 20 |
net-misc/whois/whois-5.2.20.ebuild | 64 --------------------- |
| 21 |
net-misc/whois/whois-5.3.2.ebuild | 66 ---------------------- |
| 22 |
net-misc/whois/whois-5.4.0.ebuild | 66 ---------------------- |
| 23 |
7 files changed, 256 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest |
| 26 |
deleted file mode 100644 |
| 27 |
index 8f3bac4..0000000 |
| 28 |
--- a/net-misc/whois/Manifest |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,17 +0,0 @@ |
| 31 |
------BEGIN PGP SIGNED MESSAGE----- |
| 32 |
-Hash: SHA256 |
| 33 |
- |
| 34 |
-DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808 |
| 35 |
-DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434 |
| 36 |
-DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e |
| 37 |
------BEGIN PGP SIGNATURE----- |
| 38 |
- |
| 39 |
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlvxp8cACgkQPcxEeC7Q |
| 40 |
-fhxtxwf/fwQ5e/COnOs+KVqgUnotdUWRp2lOYDWuU3w5A9VlyO5dMCvkstKi4xjE |
| 41 |
-xV1CH+UO0Tdw8KYf+A2HvVkjWukfd4VX7RRZzvHUZU95rkRuFr9ShvUcTGtxV9rI |
| 42 |
-56fO4o7R8JbExy1Z199/wIxwKggK3Qmqze7Qm7eweVE0OkZogRGEeOqsvg07BtPt |
| 43 |
-8+TfAFm4Oa17CndrroAZwI9ArpQyfFx5Hfa/nmlxUa8fRQ6CLfmN0EXMbPuWAMY5 |
| 44 |
-JXkn7CEtKOQjvsyUQFXU6UwugcJTRV6tHVg4Y/0CNBC4svtgC9rgm1whzkes8Zud |
| 45 |
-q6Bw510fgch/gtQe/34FU5Qo+9+SEA== |
| 46 |
-=zk1n |
| 47 |
------END PGP SIGNATURE----- |
| 48 |
|
| 49 |
diff --git a/net-misc/whois/files/whois-4.7.2-config-file.patch b/net-misc/whois/files/whois-4.7.2-config-file.patch |
| 50 |
deleted file mode 100644 |
| 51 |
index da91d5a..0000000 |
| 52 |
--- a/net-misc/whois/files/whois-4.7.2-config-file.patch |
| 53 |
+++ /dev/null |
| 54 |
@@ -1,12 +0,0 @@ |
| 55 |
-Enable /etc/whois.conf support. |
| 56 |
- |
| 57 |
-http://bugs.gentoo.org/show_bug.cgi?id=89417 |
| 58 |
- |
| 59 |
---- a/config.h |
| 60 |
-+++ b/config.h |
| 61 |
-@@ -13,5 +13,3 @@ |
| 62 |
- /* Configuration file */ |
| 63 |
--/* |
| 64 |
- #define CONFIG_FILE "/etc/whois.conf" |
| 65 |
--*/ |
| 66 |
- |
| 67 |
|
| 68 |
diff --git a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch b/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch |
| 69 |
deleted file mode 100644 |
| 70 |
index 4e01eb5..0000000 |
| 71 |
--- a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,23 +0,0 @@ |
| 74 |
-We don't want libidn(2) being detected automagically. |
| 75 |
-Partially reverting upstream stupidity. |
| 76 |
- |
| 77 |
---- whois-5.3.0/Makefile |
| 78 |
-+++ whois-5.3.0/Makefile |
| 79 |
-@@ -33,17 +33,9 @@ |
| 80 |
- DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" |
| 81 |
- endif |
| 82 |
- |
| 83 |
--# libidn support has been autodetected since 5.2.18 |
| 84 |
- ifdef HAVE_LIBIDN |
| 85 |
--$(error Please fix your build system to stop defining HAVE_LIBIDN!) |
| 86 |
--endif |
| 87 |
-- |
| 88 |
--ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),) |
| 89 |
- whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2) |
| 90 |
- DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2) |
| 91 |
--else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),) |
| 92 |
--whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn) |
| 93 |
--DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn) |
| 94 |
- endif |
| 95 |
- |
| 96 |
- ifdef HAVE_ICONV |
| 97 |
|
| 98 |
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml |
| 99 |
deleted file mode 100644 |
| 100 |
index 56c1244..0000000 |
| 101 |
--- a/net-misc/whois/metadata.xml |
| 102 |
+++ /dev/null |
| 103 |
@@ -1,8 +0,0 @@ |
| 104 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 105 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 106 |
-<pkgmetadata> |
| 107 |
-<maintainer type="project"> |
| 108 |
- <email>base-system@g.o</email> |
| 109 |
- <name>Gentoo Base System</name> |
| 110 |
-</maintainer> |
| 111 |
-</pkgmetadata> |
| 112 |
|
| 113 |
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild |
| 114 |
deleted file mode 100644 |
| 115 |
index e1481c8..0000000 |
| 116 |
--- a/net-misc/whois/whois-5.2.20.ebuild |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,64 +0,0 @@ |
| 119 |
-# Copyright 1999-2018 Gentoo Authors |
| 120 |
-# Distributed under the terms of the GNU General Public License v2 |
| 121 |
- |
| 122 |
-EAPI=6 |
| 123 |
-inherit toolchain-funcs flag-o-matic |
| 124 |
- |
| 125 |
-MY_P="${P/-/_}" |
| 126 |
-DESCRIPTION="improved Whois Client" |
| 127 |
-HOMEPAGE="https://www.linux.it/~md/software/" |
| 128 |
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" |
| 129 |
- |
| 130 |
-LICENSE="GPL-2" |
| 131 |
-SLOT="0" |
| 132 |
-KEYWORDS="amd64 arm arm64 x86" |
| 133 |
-IUSE="iconv idn nls" |
| 134 |
-RESTRICT="test" #59327 |
| 135 |
- |
| 136 |
-RDEPEND="iconv? ( virtual/libiconv ) |
| 137 |
- idn? ( net-dns/libidn:= ) |
| 138 |
- nls? ( virtual/libintl )" |
| 139 |
-DEPEND="${RDEPEND} |
| 140 |
- app-arch/xz-utils |
| 141 |
- >=dev-lang/perl-5 |
| 142 |
- nls? ( sys-devel/gettext )" |
| 143 |
- |
| 144 |
-PATCHES=( |
| 145 |
- "${FILESDIR}"/${PN}-4.7.2-config-file.patch |
| 146 |
-) |
| 147 |
- |
| 148 |
-src_prepare() { |
| 149 |
- default |
| 150 |
- if use nls ; then |
| 151 |
- sed -i -e 's:#\(.*pos\):\1:' Makefile || die |
| 152 |
- else |
| 153 |
- sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die |
| 154 |
- |
| 155 |
- # don't generate po files when nls is disabled (bug #419889) |
| 156 |
- sed -i -e '/^all:/s/ pos//' \ |
| 157 |
- -e '/^install:/s/ install-pos//' Makefile || die |
| 158 |
- fi |
| 159 |
-} |
| 160 |
- |
| 161 |
-src_configure() { :;} # expected no-op |
| 162 |
- |
| 163 |
-src_compile() { |
| 164 |
- unset HAVE_ICONV HAVE_LIBIDN |
| 165 |
- use iconv && export HAVE_ICONV=1 |
| 166 |
- use idn && export HAVE_LIBIDN=1 |
| 167 |
- use elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'" |
| 168 |
- tc-export CC |
| 169 |
- emake CFLAGS="${CFLAGS} ${CPPFLAGS}" |
| 170 |
-} |
| 171 |
- |
| 172 |
-src_install() { |
| 173 |
- emake BASEDIR="${ED}" prefix=/usr install |
| 174 |
- insinto /etc |
| 175 |
- doins whois.conf |
| 176 |
- dodoc README debian/changelog |
| 177 |
- |
| 178 |
- if [[ ${USERLAND} != "GNU" ]]; then |
| 179 |
- mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die |
| 180 |
- mv "${ED%/}"/usr/bin/{whois,mdwhois} || die |
| 181 |
- fi |
| 182 |
-} |
| 183 |
|
| 184 |
diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild |
| 185 |
deleted file mode 100644 |
| 186 |
index dcdcd9f..0000000 |
| 187 |
--- a/net-misc/whois/whois-5.3.2.ebuild |
| 188 |
+++ /dev/null |
| 189 |
@@ -1,66 +0,0 @@ |
| 190 |
-# Copyright 1999-2018 Gentoo Authors |
| 191 |
-# Distributed under the terms of the GNU General Public License v2 |
| 192 |
- |
| 193 |
-EAPI=6 |
| 194 |
-inherit toolchain-funcs flag-o-matic |
| 195 |
- |
| 196 |
-MY_P="${P/-/_}" |
| 197 |
-DESCRIPTION="improved Whois Client" |
| 198 |
-HOMEPAGE="https://www.linux.it/~md/software/" |
| 199 |
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" |
| 200 |
- |
| 201 |
-LICENSE="GPL-2" |
| 202 |
-SLOT="0" |
| 203 |
-KEYWORDS="amd64 arm ~arm64 x86" |
| 204 |
-IUSE="iconv idn nls" |
| 205 |
-RESTRICT="test" #59327 |
| 206 |
- |
| 207 |
-RDEPEND="iconv? ( virtual/libiconv ) |
| 208 |
- idn? ( net-dns/libidn2:= ) |
| 209 |
- nls? ( virtual/libintl )" |
| 210 |
-DEPEND="${RDEPEND} |
| 211 |
- app-arch/xz-utils |
| 212 |
- >=dev-lang/perl-5 |
| 213 |
- virtual/pkgconfig |
| 214 |
- nls? ( sys-devel/gettext )" |
| 215 |
- |
| 216 |
-PATCHES=( |
| 217 |
- "${FILESDIR}"/${PN}-4.7.2-config-file.patch |
| 218 |
- "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch |
| 219 |
-) |
| 220 |
- |
| 221 |
-src_prepare() { |
| 222 |
- default |
| 223 |
- if use nls ; then |
| 224 |
- sed -i -e 's:#\(.*pos\):\1:' Makefile || die |
| 225 |
- else |
| 226 |
- sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die |
| 227 |
- |
| 228 |
- # don't generate po files when nls is disabled (bug #419889) |
| 229 |
- sed -i -e '/^all:/s/ pos//' \ |
| 230 |
- -e '/^install:/s/ install-pos//' Makefile || die |
| 231 |
- fi |
| 232 |
-} |
| 233 |
- |
| 234 |
-src_configure() { :; } # expected no-op |
| 235 |
- |
| 236 |
-src_compile() { |
| 237 |
- unset HAVE_ICONV HAVE_LIBIDN |
| 238 |
- use iconv && export HAVE_ICONV=1 |
| 239 |
- use idn && export HAVE_LIBIDN=1 |
| 240 |
- use elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'" |
| 241 |
- tc-export CC |
| 242 |
- emake CFLAGS="${CFLAGS} ${CPPFLAGS}" |
| 243 |
-} |
| 244 |
- |
| 245 |
-src_install() { |
| 246 |
- emake BASEDIR="${ED}" prefix=/usr install |
| 247 |
- insinto /etc |
| 248 |
- doins whois.conf |
| 249 |
- dodoc README debian/changelog |
| 250 |
- |
| 251 |
- if [[ ${USERLAND} != "GNU" ]]; then |
| 252 |
- mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die |
| 253 |
- mv "${ED%/}"/usr/bin/{whois,mdwhois} || die |
| 254 |
- fi |
| 255 |
-} |
| 256 |
|
| 257 |
diff --git a/net-misc/whois/whois-5.4.0.ebuild b/net-misc/whois/whois-5.4.0.ebuild |
| 258 |
deleted file mode 100644 |
| 259 |
index 2a24ea9..0000000 |
| 260 |
--- a/net-misc/whois/whois-5.4.0.ebuild |
| 261 |
+++ /dev/null |
| 262 |
@@ -1,66 +0,0 @@ |
| 263 |
-# Copyright 1999-2018 Gentoo Authors |
| 264 |
-# Distributed under the terms of the GNU General Public License v2 |
| 265 |
- |
| 266 |
-EAPI=6 |
| 267 |
-inherit toolchain-funcs flag-o-matic |
| 268 |
- |
| 269 |
-MY_P="${P/-/_}" |
| 270 |
-DESCRIPTION="improved Whois Client" |
| 271 |
-HOMEPAGE="https://www.linux.it/~md/software/" |
| 272 |
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" |
| 273 |
- |
| 274 |
-LICENSE="GPL-2" |
| 275 |
-SLOT="0" |
| 276 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 277 |
-IUSE="iconv idn nls" |
| 278 |
-RESTRICT="test" #59327 |
| 279 |
- |
| 280 |
-RDEPEND="iconv? ( virtual/libiconv ) |
| 281 |
- idn? ( net-dns/libidn2:= ) |
| 282 |
- nls? ( virtual/libintl )" |
| 283 |
-DEPEND="${RDEPEND} |
| 284 |
- app-arch/xz-utils |
| 285 |
- >=dev-lang/perl-5 |
| 286 |
- virtual/pkgconfig |
| 287 |
- nls? ( sys-devel/gettext )" |
| 288 |
- |
| 289 |
-PATCHES=( |
| 290 |
- "${FILESDIR}"/${PN}-4.7.2-config-file.patch |
| 291 |
- "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch |
| 292 |
-) |
| 293 |
- |
| 294 |
-src_prepare() { |
| 295 |
- default |
| 296 |
- if use nls ; then |
| 297 |
- sed -i -e 's:#\(.*pos\):\1:' Makefile || die |
| 298 |
- else |
| 299 |
- sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die |
| 300 |
- |
| 301 |
- # don't generate po files when nls is disabled (bug #419889) |
| 302 |
- sed -i -e '/^all:/s/ pos//' \ |
| 303 |
- -e '/^install:/s/ install-pos//' Makefile || die |
| 304 |
- fi |
| 305 |
-} |
| 306 |
- |
| 307 |
-src_configure() { :; } # expected no-op |
| 308 |
- |
| 309 |
-src_compile() { |
| 310 |
- unset HAVE_ICONV HAVE_LIBIDN |
| 311 |
- use iconv && export HAVE_ICONV=1 |
| 312 |
- use idn && export HAVE_LIBIDN=1 |
| 313 |
- use elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'" |
| 314 |
- tc-export CC |
| 315 |
- emake CFLAGS="${CFLAGS} ${CPPFLAGS}" |
| 316 |
-} |
| 317 |
- |
| 318 |
-src_install() { |
| 319 |
- emake BASEDIR="${ED}" prefix=/usr install |
| 320 |
- insinto /etc |
| 321 |
- doins whois.conf |
| 322 |
- dodoc README debian/changelog |
| 323 |
- |
| 324 |
- if [[ ${USERLAND} != "GNU" ]]; then |
| 325 |
- mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die |
| 326 |
- mv "${ED%/}"/usr/bin/{whois,mdwhois} || die |
| 327 |
- fi |
| 328 |
-} |
Archives