1 |
commit: ffd369f2e8879f47e4e884b17aec440823400d29 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 15 15:49:29 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 15 15:49:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ffd369f2 |
7 |
|
8 |
net-misc/wget: migrated to gx86 (again) |
9 |
|
10 |
net-misc/wget/Manifest | 1 - |
11 |
.../wget-1.17.1-gnulib-cygwin-sys_select.patch | 22 ----- |
12 |
net-misc/wget/metadata.xml | 15 --- |
13 |
net-misc/wget/wget-1.18.ebuild | 104 --------------------- |
14 |
4 files changed, 142 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest |
17 |
deleted file mode 100644 |
18 |
index 209346ea7c..0000000000 |
19 |
--- a/net-misc/wget/Manifest |
20 |
+++ /dev/null |
21 |
@@ -1 +0,0 @@ |
22 |
-DIST wget-1.18.tar.xz 1922376 SHA256 b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 SHA512 a3f6fe2f44a8d797659d55cffaf81eb82b770c96222a0ee29bc4931b13846f8d8b9a07806f2197723c873a1248922d59cca5a81869661d9c6c3107447c184338 WHIRLPOOL a9e467f8bd17909485329103c17a27da345421257ce82fdf77ff2e00bdae50b13570506a1887300868e99b608c71598596ee260d86879aaeddad14cbb5ec634d |
23 |
|
24 |
diff --git a/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch b/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch |
25 |
deleted file mode 100644 |
26 |
index 0755136179..0000000000 |
27 |
--- a/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch |
28 |
+++ /dev/null |
29 |
@@ -1,22 +0,0 @@ |
30 |
-https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00065.html |
31 |
- |
32 |
---- gnulib/lib/sys_select.in.h.orig 2014-08-03 15:31:22.000000000 +0200 |
33 |
-+++ gnulib/lib/sys_select.in.h 2016-05-19 12:57:51.243064700 +0200 |
34 |
-@@ -81,7 +81,7 @@ |
35 |
- Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() |
36 |
- in <sys/time.h>. |
37 |
- But avoid namespace pollution on glibc systems. */ |
38 |
--# ifndef __GLIBC__ |
39 |
-+# if !(defined __GLIBC__ || defined __NEWLIB__) |
40 |
- # include <sys/time.h> |
41 |
- # endif |
42 |
- |
43 |
-@@ -102,7 +102,7 @@ |
44 |
- But avoid namespace pollution on glibc systems. |
45 |
- Do this after the include_next (for the sake of OpenBSD 5.0) but before |
46 |
- the split double-inclusion guard (for the sake of Solaris). */ |
47 |
--#if !(defined __GLIBC__ && !defined __UCLIBC__) |
48 |
-+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) |
49 |
- # include <signal.h> |
50 |
- #endif |
51 |
- |
52 |
|
53 |
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml |
54 |
deleted file mode 100644 |
55 |
index 85b6f1cfa8..0000000000 |
56 |
--- a/net-misc/wget/metadata.xml |
57 |
+++ /dev/null |
58 |
@@ -1,15 +0,0 @@ |
59 |
-<?xml version="1.0" encoding="UTF-8"?> |
60 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
61 |
-<pkgmetadata> |
62 |
- <maintainer type="project"> |
63 |
- <email>base-system@g.o</email> |
64 |
- <name>Gentoo Base System</name> |
65 |
- </maintainer> |
66 |
-<use> |
67 |
- <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> |
68 |
- <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> |
69 |
-</use> |
70 |
-<upstream> |
71 |
- <remote-id type="cpe">cpe:/a:gnu:wget</remote-id> |
72 |
-</upstream> |
73 |
-</pkgmetadata> |
74 |
|
75 |
diff --git a/net-misc/wget/wget-1.18.ebuild b/net-misc/wget/wget-1.18.ebuild |
76 |
deleted file mode 100644 |
77 |
index 7535427622..0000000000 |
78 |
--- a/net-misc/wget/wget-1.18.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,104 +0,0 @@ |
81 |
-# Copyright 1999-2017 Gentoo Foundation |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Id$ |
84 |
- |
85 |
-EAPI="5" |
86 |
- |
87 |
-PYTHON_COMPAT=( python3_4 ) |
88 |
- |
89 |
-inherit flag-o-matic python-any-r1 toolchain-funcs eutils |
90 |
- |
91 |
-DESCRIPTION="Network utility to retrieve files from the WWW" |
92 |
-HOMEPAGE="https://www.gnu.org/software/wget/" |
93 |
-SRC_URI="mirror://gnu/wget/${P}.tar.xz" |
94 |
- |
95 |
-LICENSE="GPL-3" |
96 |
-SLOT="0" |
97 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
98 |
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" |
99 |
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |
100 |
- |
101 |
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) |
102 |
- pcre? ( dev-libs/libpcre[static-libs(+)] ) |
103 |
- ssl? ( |
104 |
- gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) |
105 |
- !gnutls? ( |
106 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
107 |
- libressl? ( dev-libs/libressl[static-libs(+)] ) |
108 |
- ) |
109 |
- ) |
110 |
- uuid? ( sys-apps/util-linux[static-libs(+)] ) |
111 |
- zlib? ( sys-libs/zlib[static-libs(+)] )" |
112 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
113 |
-DEPEND="${RDEPEND} |
114 |
- app-arch/xz-utils |
115 |
- virtual/pkgconfig |
116 |
- static? ( ${LIB_DEPEND} ) |
117 |
- test? ( |
118 |
- ${PYTHON_DEPS} |
119 |
- dev-lang/perl |
120 |
- dev-perl/HTTP-Daemon |
121 |
- dev-perl/HTTP-Message |
122 |
- dev-perl/IO-Socket-SSL |
123 |
- ) |
124 |
- nls? ( sys-devel/gettext )" |
125 |
- |
126 |
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
127 |
- |
128 |
-pkg_setup() { |
129 |
- use test && python-any-r1_pkg_setup |
130 |
-} |
131 |
- |
132 |
-src_prepare() { |
133 |
- epatch "${FILESDIR}"/${PN}-1.17.1-gnulib-cygwin-sys_select.patch |
134 |
- # revert some hack that breaks linking, bug #585924 |
135 |
- if [[ ${CHOST} == *-darwin* ]] \ |
136 |
- || [[ ${CHOST} == *-solaris* ]] \ |
137 |
- || [[ ${CHOST} == *-uclibc* ]] \ |
138 |
- || [[ ${CHOST} == *-cygwin* ]] \ |
139 |
- ; then |
140 |
- sed -i \ |
141 |
- -e 's/^ LIBICONV=$/:/' \ |
142 |
- configure || die |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
-src_configure() { |
147 |
- # fix compilation on Solaris, we need filio.h for FIONBIO as used in |
148 |
- # the included gnutls -- force ioctl.h to include this header |
149 |
- [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 |
150 |
- |
151 |
- if use static ; then |
152 |
- append-ldflags -static |
153 |
- tc-export PKG_CONFIG |
154 |
- PKG_CONFIG+=" --static" |
155 |
- fi |
156 |
- econf \ |
157 |
- --disable-assert \ |
158 |
- --disable-rpath \ |
159 |
- $(use_with ssl ssl $(usex gnutls gnutls openssl)) \ |
160 |
- $(use_enable ssl opie) \ |
161 |
- $(use_enable ssl digest) \ |
162 |
- $(use_enable idn iri) \ |
163 |
- $(use_enable ipv6) \ |
164 |
- $(use_enable nls) \ |
165 |
- $(use_enable ntlm) \ |
166 |
- $(use_enable pcre) \ |
167 |
- $(use_enable debug) \ |
168 |
- $(use_with uuid libuuid) \ |
169 |
- $(use_with zlib) |
170 |
-} |
171 |
- |
172 |
-src_test() { |
173 |
- emake check |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- default |
178 |
- |
179 |
- sed -i \ |
180 |
- -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ |
181 |
- "${ED}"/etc/wgetrc \ |
182 |
- "${ED}"/usr/share/man/man1/wget.1 \ |
183 |
- "${ED}"/usr/share/info/wget.info |
184 |
-} |