1 |
commit: 6da4f1bad335348ecdf329655d84987f70542770 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 09:30:53 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 09:38:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da4f1ba |
7 |
|
8 |
net-misc/socat: drop 1.7.3.4, 1.7.4.1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-misc/socat/Manifest | 2 -- |
13 |
net-misc/socat/socat-1.7.3.4.ebuild | 66 ------------------------------------- |
14 |
net-misc/socat/socat-1.7.4.1.ebuild | 61 ---------------------------------- |
15 |
3 files changed, 129 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest |
18 |
index 6a41e2eecbf2..671f546425ff 100644 |
19 |
--- a/net-misc/socat/Manifest |
20 |
+++ b/net-misc/socat/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 |
23 |
-DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 |
24 |
DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab SHA512 c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972 |
25 |
DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 |
26 |
|
27 |
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild |
28 |
deleted file mode 100644 |
29 |
index be9f48e777e4..000000000000 |
30 |
--- a/net-misc/socat/socat-1.7.3.4.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,66 +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 flag-o-matic toolchain-funcs |
39 |
- |
40 |
-MY_P=${P/_beta/-b} |
41 |
-DESCRIPTION="Multipurpose relay (SOcket CAT)" |
42 |
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" |
43 |
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" |
44 |
-S="${WORKDIR}/${MY_P}" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
49 |
-IUSE="bindist ipv6 readline ssl tcpd" |
50 |
- |
51 |
-DEPEND=" |
52 |
- ssl? ( dev-libs/openssl:0= ) |
53 |
- readline? ( sys-libs/readline:= ) |
54 |
- tcpd? ( sys-apps/tcp-wrappers ) |
55 |
-" |
56 |
-RDEPEND="${DEPEND}" |
57 |
- |
58 |
-# Tests are a large bash script |
59 |
-# Hard to disable individual tests needing network or privileges |
60 |
-RESTRICT=" |
61 |
- test |
62 |
- ssl? ( readline? ( bindist ) ) |
63 |
-" |
64 |
- |
65 |
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) |
66 |
- |
67 |
-PATCHES=( |
68 |
- "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch |
69 |
-) |
70 |
- |
71 |
-pkg_setup() { |
72 |
- # bug #587740 |
73 |
- if use readline && use ssl ; then |
74 |
- elog "You are enabling both readline and openssl USE flags, the licenses" |
75 |
- elog "for these packages conflict. You may not be able to legally" |
76 |
- elog "redistribute the resulting binary." |
77 |
- fi |
78 |
-} |
79 |
- |
80 |
-src_configure() { |
81 |
- # bug #293324 |
82 |
- filter-flags '-Wno-error*' |
83 |
- |
84 |
- tc-export AR |
85 |
- |
86 |
- econf \ |
87 |
- $(use_enable ssl openssl) \ |
88 |
- $(use_enable readline) \ |
89 |
- $(use_enable ipv6 ip6) \ |
90 |
- $(use_enable tcpd libwrap) |
91 |
-} |
92 |
- |
93 |
-src_install() { |
94 |
- default |
95 |
- |
96 |
- docinto html |
97 |
- dodoc doc/*.html doc/*.css |
98 |
-} |
99 |
|
100 |
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild |
101 |
deleted file mode 100644 |
102 |
index 7a65f4b61cdc..000000000000 |
103 |
--- a/net-misc/socat/socat-1.7.4.1.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,61 +0,0 @@ |
106 |
-# Copyright 1999-2021 Gentoo Authors |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
- |
109 |
-EAPI=7 |
110 |
- |
111 |
-inherit flag-o-matic toolchain-funcs |
112 |
- |
113 |
-MY_P=${P/_beta/-b} |
114 |
-DESCRIPTION="Multipurpose relay (SOcket CAT)" |
115 |
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" |
116 |
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" |
117 |
-S="${WORKDIR}/${MY_P}" |
118 |
- |
119 |
-LICENSE="GPL-2" |
120 |
-SLOT="0" |
121 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
122 |
-IUSE="bindist ipv6 readline ssl tcpd" |
123 |
- |
124 |
-DEPEND=" |
125 |
- ssl? ( dev-libs/openssl:0= ) |
126 |
- readline? ( sys-libs/readline:= ) |
127 |
- tcpd? ( sys-apps/tcp-wrappers ) |
128 |
-" |
129 |
-RDEPEND="${DEPEND}" |
130 |
- |
131 |
-# Tests are a large bash script |
132 |
-# Hard to disable individual tests needing network or privileges |
133 |
-RESTRICT=" |
134 |
- test |
135 |
- ssl? ( readline? ( bindist ) ) |
136 |
-" |
137 |
- |
138 |
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) |
139 |
- |
140 |
-pkg_setup() { |
141 |
- # bug #587740 |
142 |
- if use readline && use ssl ; then |
143 |
- elog "You are enabling both readline and openssl USE flags, the licenses" |
144 |
- elog "for these packages conflict. You may not be able to legally" |
145 |
- elog "redistribute the resulting binary." |
146 |
- fi |
147 |
-} |
148 |
- |
149 |
-src_configure() { |
150 |
- # bug #293324 |
151 |
- filter-flags '-Wno-error*' |
152 |
- tc-export AR |
153 |
- |
154 |
- econf \ |
155 |
- $(use_enable ssl openssl) \ |
156 |
- $(use_enable readline) \ |
157 |
- $(use_enable ipv6 ip6) \ |
158 |
- $(use_enable tcpd libwrap) |
159 |
-} |
160 |
- |
161 |
-src_install() { |
162 |
- default |
163 |
- |
164 |
- docinto html |
165 |
- dodoc doc/*.html doc/*.css |
166 |
-} |