Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-misc/whois/
Date: Sun, 18 Nov 2018 20:23:08
Message-Id: 1542572448.51efe469308e5371d9879407ac5db0e403f450f7.blueness@gentoo
1 commit: 51efe469308e5371d9879407ac5db0e403f450f7
2 Author: xdch47 <xdch47 <AT> posteo <DOT> de>
3 AuthorDate: Sun Nov 18 17:56:25 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 18 20:20:48 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=51efe469
7
8 net-misc/whois: version bump
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Manifest-Sign-Key: 0DEDF1A904568BAD1FC45C283DCC44782ED07E1C
12 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
13
14 net-misc/whois/Manifest | 16 ++++++++++++++++
15 net-misc/whois/whois-5.2.20.ebuild | 8 ++++----
16 .../whois/{whois-5.2.20.ebuild => whois-5.3.2.ebuild} | 14 ++++++++------
17 .../whois/{whois-5.2.20.ebuild => whois-5.4.0.ebuild} | 14 ++++++++------
18 4 files changed, 36 insertions(+), 16 deletions(-)
19
20 diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
21 index 46bee29..8f3bac4 100644
22 --- a/net-misc/whois/Manifest
23 +++ b/net-misc/whois/Manifest
24 @@ -1 +1,17 @@
25 +-----BEGIN PGP SIGNED MESSAGE-----
26 +Hash: SHA256
27 +
28 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
29 +DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
30 +DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
31 +-----BEGIN PGP SIGNATURE-----
32 +
33 +iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlvxp8cACgkQPcxEeC7Q
34 +fhxtxwf/fwQ5e/COnOs+KVqgUnotdUWRp2lOYDWuU3w5A9VlyO5dMCvkstKi4xjE
35 +xV1CH+UO0Tdw8KYf+A2HvVkjWukfd4VX7RRZzvHUZU95rkRuFr9ShvUcTGtxV9rI
36 +56fO4o7R8JbExy1Z199/wIxwKggK3Qmqze7Qm7eweVE0OkZogRGEeOqsvg07BtPt
37 +8+TfAFm4Oa17CndrroAZwI9ArpQyfFx5Hfa/nmlxUa8fRQ6CLfmN0EXMbPuWAMY5
38 +JXkn7CEtKOQjvsyUQFXU6UwugcJTRV6tHVg4Y/0CNBC4svtgC9rgm1whzkes8Zud
39 +q6Bw510fgch/gtQe/34FU5Qo+9+SEA==
40 +=zk1n
41 +-----END PGP SIGNATURE-----
42
43 diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
44 index ebbe2d8..69a6d5d 100644
45 --- a/net-misc/whois/whois-5.2.20.ebuild
46 +++ b/net-misc/whois/whois-5.2.20.ebuild
47 @@ -4,14 +4,14 @@
48 EAPI=6
49 inherit toolchain-funcs flag-o-matic
50
51 -MY_P=${P/-/_}
52 +MY_P="${P/-/_}"
53 DESCRIPTION="improved Whois Client"
54 HOMEPAGE="https://www.linux.it/~md/software/"
55 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
56
57 LICENSE="GPL-2"
58 SLOT="0"
59 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
60 +KEYWORDS="amd64 arm arm64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
61 IUSE="iconv idn nls"
62 RESTRICT="test" #59327
63
64 @@ -58,7 +58,7 @@ src_install() {
65 dodoc README debian/changelog
66
67 if [[ ${USERLAND} != "GNU" ]]; then
68 - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
69 - mv "${ED}"/usr/bin/{whois,mdwhois} || die
70 + mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
71 + mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
72 fi
73 }
74
75 diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.3.2.ebuild
76 similarity index 80%
77 copy from net-misc/whois/whois-5.2.20.ebuild
78 copy to net-misc/whois/whois-5.3.2.ebuild
79 index ebbe2d8..762508c 100644
80 --- a/net-misc/whois/whois-5.2.20.ebuild
81 +++ b/net-misc/whois/whois-5.3.2.ebuild
82 @@ -4,27 +4,29 @@
83 EAPI=6
84 inherit toolchain-funcs flag-o-matic
85
86 -MY_P=${P/-/_}
87 +MY_P="${P/-/_}"
88 DESCRIPTION="improved Whois Client"
89 HOMEPAGE="https://www.linux.it/~md/software/"
90 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
91
92 LICENSE="GPL-2"
93 SLOT="0"
94 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
95 +KEYWORDS="amd64 arm ~arm64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
96 IUSE="iconv idn nls"
97 RESTRICT="test" #59327
98
99 RDEPEND="iconv? ( virtual/libiconv )
100 - idn? ( net-dns/libidn:= )
101 + idn? ( net-dns/libidn2:= )
102 nls? ( virtual/libintl )"
103 DEPEND="${RDEPEND}
104 app-arch/xz-utils
105 >=dev-lang/perl-5
106 + virtual/pkgconfig
107 nls? ( sys-devel/gettext )"
108
109 PATCHES=(
110 "${FILESDIR}"/${PN}-4.7.2-config-file.patch
111 + "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
112 )
113
114 src_prepare() {
115 @@ -40,7 +42,7 @@ src_prepare() {
116 fi
117 }
118
119 -src_configure() { :;} # expected no-op
120 +src_configure() { :; } # expected no-op
121
122 src_compile() {
123 unset HAVE_ICONV HAVE_LIBIDN
124 @@ -58,7 +60,7 @@ src_install() {
125 dodoc README debian/changelog
126
127 if [[ ${USERLAND} != "GNU" ]]; then
128 - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
129 - mv "${ED}"/usr/bin/{whois,mdwhois} || die
130 + mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
131 + mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
132 fi
133 }
134
135 diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.4.0.ebuild
136 similarity index 80%
137 copy from net-misc/whois/whois-5.2.20.ebuild
138 copy to net-misc/whois/whois-5.4.0.ebuild
139 index ebbe2d8..b4c9d2a 100644
140 --- a/net-misc/whois/whois-5.2.20.ebuild
141 +++ b/net-misc/whois/whois-5.4.0.ebuild
142 @@ -4,27 +4,29 @@
143 EAPI=6
144 inherit toolchain-funcs flag-o-matic
145
146 -MY_P=${P/-/_}
147 +MY_P="${P/-/_}"
148 DESCRIPTION="improved Whois Client"
149 HOMEPAGE="https://www.linux.it/~md/software/"
150 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
151
152 LICENSE="GPL-2"
153 SLOT="0"
154 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
155 +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
156 IUSE="iconv idn nls"
157 RESTRICT="test" #59327
158
159 RDEPEND="iconv? ( virtual/libiconv )
160 - idn? ( net-dns/libidn:= )
161 + idn? ( net-dns/libidn2:= )
162 nls? ( virtual/libintl )"
163 DEPEND="${RDEPEND}
164 app-arch/xz-utils
165 >=dev-lang/perl-5
166 + virtual/pkgconfig
167 nls? ( sys-devel/gettext )"
168
169 PATCHES=(
170 "${FILESDIR}"/${PN}-4.7.2-config-file.patch
171 + "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
172 )
173
174 src_prepare() {
175 @@ -40,7 +42,7 @@ src_prepare() {
176 fi
177 }
178
179 -src_configure() { :;} # expected no-op
180 +src_configure() { :; } # expected no-op
181
182 src_compile() {
183 unset HAVE_ICONV HAVE_LIBIDN
184 @@ -58,7 +60,7 @@ src_install() {
185 dodoc README debian/changelog
186
187 if [[ ${USERLAND} != "GNU" ]]; then
188 - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
189 - mv "${ED}"/usr/bin/{whois,mdwhois} || die
190 + mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
191 + mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
192 fi
193 }