commit: 6da4f1bad335348ecdf329655d84987f70542770
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 09:30:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 09:38:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da4f1ba
net-misc/socat: drop 1.7.3.4, 1.7.4.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/socat/Manifest | 2 --
net-misc/socat/socat-1.7.3.4.ebuild | 66 -------------------------------------
net-misc/socat/socat-1.7.4.1.ebuild | 61 ----------------------------------
3 files changed, 129 deletions(-)
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 6a41e2eecbf2..671f546425ff 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,4 +1,2 @@
-DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B
68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666
SHA512
f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
-DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B
9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568
SHA512
7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B
0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab
SHA512
c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B
808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31
SHA512
f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild
b/net-misc/socat/socat-1.7.3.4.ebuild
deleted file mode 100644
index be9f48e777e4..000000000000
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
- test
- ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README
SECURITY )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
-)
-
-pkg_setup() {
- # bug #587740
- if use readline && use ssl ; then
- elog "You are enabling both readline and openssl USE flags, the
licenses"
- elog "for these packages conflict. You may not be able to
legally"
- elog "redistribute the resulting binary."
- fi
-}
-
-src_configure() {
- # bug #293324
- filter-flags '-Wno-error*'
-
- tc-export AR
-
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- docinto html
- dodoc doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild
b/net-misc/socat/socat-1.7.4.1.ebuild
deleted file mode 100644
index 7a65f4b61cdc..000000000000
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git";
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
- test
- ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README
SECURITY )
-
-pkg_setup() {
- # bug #587740
- if use readline && use ssl ; then
- elog "You are enabling both readline and openssl USE flags, the
licenses"
- elog "for these packages conflict. You may not be able to
legally"
- elog "redistribute the resulting binary."
- fi
-}
-
-src_configure() {
- # bug #293324
- filter-flags '-Wno-error*'
- tc-export AR
-
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- docinto html
- dodoc doc/*.html doc/*.css
-}
