| 1 |
commit: 5458af5f9efaca5a968acbdc71dddfe240da70d4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 7 03:19:11 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 7 03:19:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5458af5f |
| 7 |
|
| 8 |
net-misc/socat: unify style |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/socat/socat-1.7.3.4.ebuild | 19 +++++++++++-------- |
| 14 |
net-misc/socat/socat-2.0.0_beta9.ebuild | 18 +++++++++++------- |
| 15 |
2 files changed, 22 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild |
| 18 |
index ea696ac13e6..3eba54db2ef 100644 |
| 19 |
--- a/net-misc/socat/socat-1.7.3.4.ebuild |
| 20 |
+++ b/net-misc/socat/socat-1.7.3.4.ebuild |
| 21 |
@@ -2,13 +2,14 @@ |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
+ |
| 26 |
inherit flag-o-matic toolchain-funcs |
| 27 |
|
| 28 |
+MY_P=${P/_beta/-b} |
| 29 |
DESCRIPTION="Multipurpose relay (SOcket CAT)" |
| 30 |
HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" |
| 31 |
-MY_P=${P/_beta/-b} |
| 32 |
-S="${WORKDIR}/${MY_P}" |
| 33 |
SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" |
| 34 |
+S="${WORKDIR}/${MY_P}" |
| 35 |
|
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
@@ -23,16 +24,17 @@ DEPEND=" |
| 39 |
readline? ( sys-libs/readline:= ) |
| 40 |
tcpd? ( sys-apps/tcp-wrappers ) |
| 41 |
" |
| 42 |
-RDEPEND=" |
| 43 |
- ${DEPEND} |
| 44 |
-" |
| 45 |
+RDEPEND="${DEPEND}" |
| 46 |
+ |
| 47 |
+# Tests are a large bash script |
| 48 |
+# Hard to disable individual tests needing network or privileges |
| 49 |
RESTRICT=" |
| 50 |
test |
| 51 |
ssl? ( readline? ( bindist ) ) |
| 52 |
" |
| 53 |
-DOCS=( |
| 54 |
- BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY |
| 55 |
-) |
| 56 |
+ |
| 57 |
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) |
| 58 |
+ |
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch |
| 61 |
) |
| 62 |
@@ -49,6 +51,7 @@ pkg_setup() { |
| 63 |
src_configure() { |
| 64 |
filter-flags '-Wno-error*' #293324 |
| 65 |
tc-export AR |
| 66 |
+ |
| 67 |
econf \ |
| 68 |
$(use_enable ssl openssl) \ |
| 69 |
$(use_enable readline) \ |
| 70 |
|
| 71 |
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild |
| 72 |
index 3745b7704e2..0f00e144582 100644 |
| 73 |
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild |
| 74 |
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild |
| 75 |
@@ -2,13 +2,14 @@ |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
EAPI=7 |
| 79 |
+ |
| 80 |
inherit autotools flag-o-matic toolchain-funcs |
| 81 |
|
| 82 |
+MY_P=${P/_beta/-b} |
| 83 |
DESCRIPTION="Multipurpose relay (SOcket CAT)" |
| 84 |
HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" |
| 85 |
-MY_P=${P/_beta/-b} |
| 86 |
-S="${WORKDIR}/${MY_P}" |
| 87 |
SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" |
| 88 |
+S="${WORKDIR}/${MY_P}" |
| 89 |
|
| 90 |
LICENSE="GPL-2" |
| 91 |
SLOT="0" |
| 92 |
@@ -25,12 +26,14 @@ DEPEND=" |
| 93 |
" |
| 94 |
RDEPEND="${DEPEND}" |
| 95 |
|
| 96 |
-RESTRICT="test |
| 97 |
- ssl? ( readline? ( bindist ) )" |
| 98 |
+# Tests are a large bash script |
| 99 |
+# Hard to disable individual tests needing network or privileges |
| 100 |
+RESTRICT=" |
| 101 |
+ test |
| 102 |
+ ssl? ( readline? ( bindist ) ) |
| 103 |
+" |
| 104 |
|
| 105 |
-DOCS=( |
| 106 |
- BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY |
| 107 |
-) |
| 108 |
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) |
| 109 |
|
| 110 |
PATCHES=( |
| 111 |
"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch |
| 112 |
@@ -59,6 +62,7 @@ src_prepare() { |
| 113 |
src_configure() { |
| 114 |
filter-flags -Wall '-Wno-error*' #293324 |
| 115 |
tc-export AR |
| 116 |
+ |
| 117 |
econf \ |
| 118 |
$(use_enable ssl openssl) \ |
| 119 |
$(use_enable readline) \ |
Archives