1 |
commit: 1e32e5cf1c1cf8cf0346a1c7134866dfc949a829 |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Tue Aug 16 10:21:07 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 16 15:26:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e32e5cf |
7 |
|
8 |
sys-apps/s6: drop 2.11.1.0-r1, 2.11.1.1 |
9 |
|
10 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
11 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
12 |
|
13 |
sys-apps/s6/Manifest | 2 -- |
14 |
sys-apps/s6/s6-2.11.1.0-r1.ebuild | 54 --------------------------------------- |
15 |
sys-apps/s6/s6-2.11.1.1.ebuild | 51 ------------------------------------ |
16 |
3 files changed, 107 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest |
19 |
index 7a5041c837b1..3877a13ec004 100644 |
20 |
--- a/sys-apps/s6/Manifest |
21 |
+++ b/sys-apps/s6/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738 |
24 |
-DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752 |
25 |
DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d |
26 |
|
27 |
diff --git a/sys-apps/s6/s6-2.11.1.0-r1.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 65697c3d13b7..000000000000 |
30 |
--- a/sys-apps/s6/s6-2.11.1.0-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,54 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=8 |
37 |
- |
38 |
-inherit toolchain-funcs |
39 |
- |
40 |
-DESCRIPTION="skarnet.org's small and secure supervision software suite" |
41 |
-HOMEPAGE="https://www.skarnet.org/software/s6/" |
42 |
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="ISC" |
45 |
-SLOT="0/$(ver_cut 1-2)" |
46 |
-KEYWORDS="amd64 ~arm x86" |
47 |
-IUSE="+execline static static-libs" |
48 |
- |
49 |
-REQUIRED_USE="static? ( static-libs )" |
50 |
- |
51 |
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) |
52 |
- >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] |
53 |
-" |
54 |
-DEPEND="${RDEPEND}" |
55 |
- |
56 |
-HTML_DOCS=( doc/. ) |
57 |
- |
58 |
-src_prepare() { |
59 |
- default |
60 |
- |
61 |
- # Avoid QA warning for LDFLAGS addition |
62 |
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die |
63 |
- |
64 |
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die |
65 |
-} |
66 |
- |
67 |
-src_configure() { |
68 |
- tc-export AR CC RANLIB |
69 |
- |
70 |
- local myconf=( |
71 |
- --bindir=/bin |
72 |
- --dynlibdir=/usr/$(get_libdir) |
73 |
- --libdir=/usr/$(get_libdir)/${PN} |
74 |
- --with-dynlib=/usr/$(get_libdir) |
75 |
- --with-lib=/usr/$(get_libdir)/execline |
76 |
- --with-lib=/usr/$(get_libdir)/skalibs |
77 |
- --with-sysdeps=/usr/$(get_libdir)/skalibs |
78 |
- $(usex execline '' '--disable-execline' ) |
79 |
- --enable-shared |
80 |
- $(use_enable static allstatic) |
81 |
- $(use_enable static static-libc) |
82 |
- $(use_enable static-libs static) |
83 |
- ) |
84 |
- |
85 |
- econf "${myconf[@]}" |
86 |
-} |
87 |
|
88 |
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild |
89 |
deleted file mode 100644 |
90 |
index dcdeeef35af5..000000000000 |
91 |
--- a/sys-apps/s6/s6-2.11.1.1.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,51 +0,0 @@ |
94 |
-# Copyright 1999-2022 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=8 |
98 |
- |
99 |
-inherit toolchain-funcs |
100 |
- |
101 |
-DESCRIPTION="skarnet.org's small and secure supervision software suite" |
102 |
-HOMEPAGE="https://www.skarnet.org/software/s6/" |
103 |
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
104 |
- |
105 |
-LICENSE="ISC" |
106 |
-SLOT="0/$(ver_cut 1-2)" |
107 |
-KEYWORDS="~amd64 ~arm ~x86" |
108 |
-IUSE="+execline" |
109 |
- |
110 |
-RDEPEND="dev-libs/skalibs:= |
111 |
- execline? ( dev-lang/execline:= ) |
112 |
-" |
113 |
-DEPEND="${RDEPEND}" |
114 |
- |
115 |
-HTML_DOCS=( doc/. ) |
116 |
- |
117 |
-src_prepare() { |
118 |
- default |
119 |
- |
120 |
- # Avoid QA warning for LDFLAGS addition |
121 |
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die |
122 |
- |
123 |
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die |
124 |
-} |
125 |
- |
126 |
-src_configure() { |
127 |
- tc-export AR CC RANLIB |
128 |
- |
129 |
- local myconf=( |
130 |
- --bindir=/bin |
131 |
- --dynlibdir=/usr/$(get_libdir) |
132 |
- --libdir=/usr/$(get_libdir)/${PN} |
133 |
- --with-dynlib=/usr/$(get_libdir) |
134 |
- --with-lib=/usr/$(get_libdir)/execline |
135 |
- --with-lib=/usr/$(get_libdir)/skalibs |
136 |
- --with-sysdeps=/usr/$(get_libdir)/skalibs |
137 |
- --enable-shared |
138 |
- --disable-allstatic |
139 |
- --disable-static-libc |
140 |
- $(use_enable execline) |
141 |
- ) |
142 |
- |
143 |
- econf "${myconf[@]}" |
144 |
-} |