Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/sed/, sys-apps/sed/files/
Date: Tue, 22 Dec 2020 21:30:13
Message-Id: 1608671525.f6180a024263a7bb62d31874b19445c89fc9ae45.grobian@gentoo
1 commit: f6180a024263a7bb62d31874b19445c89fc9ae45
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 22 21:12:05 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 22 21:12:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6180a02
7
8 sys-apps/sed: drop ~ppc-aix
9
10 Bug: https://bugs.gentoo.org/760057
11 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 sys-apps/sed/Manifest | 2 -
15 sys-apps/sed/files/dos2unix | 2 -
16 sys-apps/sed/files/sed-4.1.4-aix-malloc.patch | 12 ----
17 .../files/sed-4.1.4-fix-invalid-ref-error.patch | 21 ------
18 .../sed/files/sed-4.1.4-makeinfo-c-locale.patch | 18 -----
19 sys-apps/sed/files/sed-4.1.5-alloca.patch | 14 ----
20 sys-apps/sed/files/sed-4.1.5-irix.patch | 36 ----------
21 sys-apps/sed/files/sed-4.1.5-regex-nobool.patch | 17 -----
22 sys-apps/sed/files/sed-4.2.1-espipe.patch | 20 ------
23 ...omplete-sequences-as-if-they-were-invalid.patch | 45 -------------
24 sys-apps/sed/files/unix2dos | 2 -
25 sys-apps/sed/sed-4.2.2.ebuild | 72 --------------------
26 sys-apps/sed/sed-4.5.ebuild | 77 ----------------------
27 sys-apps/sed/sed-4.8.ebuild | 2 +-
28 14 files changed, 1 insertion(+), 339 deletions(-)
29
30 diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
31 index d3aa8dd8fe..526fe0062a 100644
32 --- a/sys-apps/sed/Manifest
33 +++ b/sys-apps/sed/Manifest
34 @@ -1,3 +1 @@
35 -DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
36 -DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
37 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
38
39 diff --git a/sys-apps/sed/files/dos2unix b/sys-apps/sed/files/dos2unix
40 deleted file mode 100755
41 index b046880dd1..0000000000
42 --- a/sys-apps/sed/files/dos2unix
43 +++ /dev/null
44 @@ -1,2 +0,0 @@
45 -#!/bin/sh
46 -exec sed -e 's/\x0D$//' "$@"
47
48 diff --git a/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch b/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch
49 deleted file mode 100644
50 index bbe2fbbd49..0000000000
51 --- a/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch
52 +++ /dev/null
53 @@ -1,12 +0,0 @@
54 ---- sed-4.1.4/lib/regex_internal.c
55 -+++ sed-4.1.4/lib/regex_internal.c
56 -@@ -883,6 +883,9 @@
57 - re_node_set *set;
58 - int size;
59 - {
60 -+ if ( size == 0 )
61 -+ return REG_NOERROR;
62 -+
63 - set->alloc = size;
64 - set->nelem = 0;
65 - set->elems = re_malloc (int, size);
66
67 diff --git a/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch b/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch
68 deleted file mode 100644
69 index 3605e0bb0d..0000000000
70 --- a/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch
71 +++ /dev/null
72 @@ -1,21 +0,0 @@
73 -Grab fix from upstream for incorrect error msg display.
74 -
75 -http://bugs.gentoo.org/96009
76 -
77 -Index: regexp.c
78 -===================================================================
79 -RCS file: /cvsroot/sed/sed/sed/regexp.c,v
80 -retrieving revision 1.3
81 -retrieving revision 1.4
82 -diff -u -r1.3 -r1.4
83 ---- sed/regexp.c 27 Jan 2005 08:04:30 -0000 1.3
84 -+++ sed/regexp.c 10 Feb 2005 09:54:50 -0000 1.4
85 -@@ -113,7 +113,7 @@
86 - {
87 - char buf[200];
88 - sprintf(buf, _("invalid reference \\%d on `s' command's RHS"),
89 -- needed_sub);
90 -+ needed_sub - 1);
91 - bad_prog(buf);
92 - }
93 - }
94
95 diff --git a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch b/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
96 deleted file mode 100644
97 index ede6dc8e30..0000000000
98 --- a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
99 +++ /dev/null
100 @@ -1,18 +0,0 @@
101 -Running makeinfo on sed.texi in some locales can cause
102 -problems (probably due to range matching not being the
103 -same). So we force the C locale and just take the lazy
104 -way out.
105 -
106 -http://bugs.gentoo.org/show_bug.cgi?id=83984
107 -
108 ---- doc/Makefile.in
109 -+++ doc/Makefile.in
110 -@@ -615,7 +615,7 @@
111 -
112 - @MAKEINFO_HTML_TRUE@×××.html: sed.texi sed.info
113 - @MAKEINFO_HTML_TRUE@ builddir=`pwd` && cd $(srcdir) && \
114 --@MAKEINFO_HTML_TRUE@ $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
115 -+@MAKEINFO_HTML_TRUE@ LC_ALL="C" $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
116 -
117 - @MAKEINFO_HTML_TRUE@html: sed.html
118 -
119
120 diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch
121 deleted file mode 100644
122 index 89679c5362..0000000000
123 --- a/sys-apps/sed/files/sed-4.1.5-alloca.patch
124 +++ /dev/null
125 @@ -1,14 +0,0 @@
126 -fix building on BSD systems which often do not have alloca.h
127 -
128 ---- sed-4.1.5/lib/regex_internal.h
129 -+++ sed-4.1.5/lib/regex_internal.h
130 -@@ -410,7 +410,9 @@ static unsigned int re_string_context_at
131 - #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
132 - #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
133 -
134 -+#ifdef HAVE_ALLOCA_H
135 - #include <alloca.h>
136 -+#endif
137 -
138 - #ifndef _LIBC
139 - # if HAVE_ALLOCA
140
141 diff --git a/sys-apps/sed/files/sed-4.1.5-irix.patch b/sys-apps/sed/files/sed-4.1.5-irix.patch
142 deleted file mode 100644
143 index 34b3fa11f6..0000000000
144 --- a/sys-apps/sed/files/sed-4.1.5-irix.patch
145 +++ /dev/null
146 @@ -1,36 +0,0 @@
147 -* see http://bugs.gentoo.org/show_bug.cgi?id=209135
148 -
149 ---- lib/regcomp.c
150 -+++ lib/regcomp.c
151 -@@ -558,7 +558,18 @@
152 - static const bitset_t utf8_sb_map =
153 - {
154 - /* Set the first 128 bits. */
155 -- [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
156 -+ /* [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX */
157 -+#if BITSET_WORD_MAX == 0xffffffffULL
158 -+ [0] = BITSET_WORD_MAX,
159 -+ [1] = BITSET_WORD_MAX,
160 -+ [2] = BITSET_WORD_MAX,
161 -+ [3] = BITSET_WORD_MAX
162 -+#elif BITSET_WORD_MAX == 0xffffffffffffffffULL
163 -+ [0] = BITSET_WORD_MAX,
164 -+ [1] = BITSET_WORD_MAX
165 -+#else
166 -+# error "Unknown value for BITSET_WORD_MAX"
167 -+#endif
168 - };
169 - #endif
170 -
171 ---- lib/regexec.c
172 -+++ lib/regexec.c
173 -@@ -2894,7 +2894,8 @@
174 - sizeof (re_dfastate_t *) * (path->alloc - old_alloc));
175 - }
176 -
177 -- str_idx = path->next_idx ?: top_str;
178 -+ /* str_idx = path->next_idx ?: top_str; */
179 -+ str_idx = path->next_idx ? path->next_idx : top_str;
180 -
181 - /* Temporary modify MCTX. */
182 - backup_state_log = mctx->state_log;
183
184 diff --git a/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch b/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch
185 deleted file mode 100644
186 index 8338d84c38..0000000000
187 --- a/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch
188 +++ /dev/null
189 @@ -1,17 +0,0 @@
190 -* Most platforms don't define bool, true and false by default
191 -
192 ---- lib/regexec.c
193 -+++ lib/regexec.c
194 -@@ -3289,6 +3289,12 @@
195 - /* Build transition table for the state.
196 - Return 1 if succeeded, otherwise return NULL. */
197 -
198 -+#ifndef bool
199 -+# define bool int
200 -+# define false 0
201 -+# define true 1
202 -+#endif
203 -+
204 - static int
205 - internal_function
206 - build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
207
208 diff --git a/sys-apps/sed/files/sed-4.2.1-espipe.patch b/sys-apps/sed/files/sed-4.2.1-espipe.patch
209 deleted file mode 100644
210 index be624bedab..0000000000
211 --- a/sys-apps/sed/files/sed-4.2.1-espipe.patch
212 +++ /dev/null
213 @@ -1,20 +0,0 @@
214 -reported upstream on 20101019 15:39 at sed-users mailing list (yahoo group).
215 -http://tech.groups.yahoo.com/group/sed-users/message/8675
216 -
217 -diff -ru sed-4.2.1.orig/sed/utils.c sed-4.2.1/sed/utils.c
218 ---- sed-4.2.1.orig/sed/utils.c 2010-10-19 14:18:44 +0200
219 -+++ sed-4.2.1/sed/utils.c 2010-10-19 15:12:58 +0200
220 -@@ -284,7 +284,12 @@
221 - FILE *stream;
222 - {
223 - clearerr(stream);
224 -- if (fflush(stream) == EOF && errno != EBADF)
225 -+ if (fflush(stream) == EOF
226 -+ && errno != EBADF
227 -+#ifdef ESPIPE
228 -+ && errno != ESPIPE
229 -+#endif
230 -+ )
231 - panic("couldn't flush %s: %s", utils_fp_name(stream), strerror(errno));
232 - }
233 -
234
235 diff --git a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch
236 deleted file mode 100644
237 index dfd9206d3b..0000000000
238 --- a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch
239 +++ /dev/null
240 @@ -1,45 +0,0 @@
241 -http://bugs.gentoo.org/284403
242 -
243 -From 20f68fb1abe862a98bc0378e5bb54d94bb98b8fe Mon Sep 17 00:00:00 2001
244 -From: Paolo Bonzini <bonzini@×××.org>
245 -Date: Thu, 15 Oct 2009 19:56:12 +0200
246 -Subject: [PATCH] handle incomplete sequences as if they were invalid
247 -
248 -2009-10-15 Paolo Bonzini <bonzini@×××.org>
249 - WANG Yunfeng <uhuruh@×××××.com>
250 -
251 - * sed/execute.c (str_append, str_append_modified): Handle incomplete
252 - sequences as if they were invalid.
253 ----
254 - ChangeLog | 6 ++++++
255 - NEWS | 4 +++-
256 - sed/execute.c | 6 +++---
257 - 3 files changed, 12 insertions(+), 4 deletions(-)
258 -
259 -diff --git a/sed/execute.c b/sed/execute.c
260 -index 66cb809..d5903be 100644
261 ---- a/sed/execute.c
262 -+++ b/sed/execute.c
263 -@@ -254,8 +254,8 @@ str_append(to, string, length)
264 - {
265 - size_t n = MBRLEN (string, length, &to->mbstate);
266 -
267 -- /* An invalid sequence is treated like a singlebyte character. */
268 -- if (n == (size_t) -1)
269 -+ /* An invalid or imcomplete sequence is treated like a singlebyte character. */
270 -+ if (n == (size_t) -1 || n == (size_t) -2)
271 - {
272 - memset (&to->mbstate, 0, sizeof (to->mbstate));
273 - n = 1;
274 -@@ -341,7 +341,7 @@ str_append_modified(to, string, length, type)
275 - /* Copy the new wide character to the end of the string. */
276 - n = WCRTOMB (to->active + to->length, wc, &to->mbstate);
277 - to->length += n;
278 -- if (n == -1)
279 -+ if (n == -1 || n == -2)
280 - {
281 - fprintf (stderr, "Case conversion produced an invalid character!");
282 - abort ();
283 ---
284 -1.7.3.1
285 -
286
287 diff --git a/sys-apps/sed/files/unix2dos b/sys-apps/sed/files/unix2dos
288 deleted file mode 100755
289 index 4902a7c162..0000000000
290 --- a/sys-apps/sed/files/unix2dos
291 +++ /dev/null
292 @@ -1,2 +0,0 @@
293 -#!/bin/sh
294 -exec sed -e 's/$//' "$@"
295
296 diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
297 deleted file mode 100644
298 index 1b1ded7f80..0000000000
299 --- a/sys-apps/sed/sed-4.2.2.ebuild
300 +++ /dev/null
301 @@ -1,72 +0,0 @@
302 -# Copyright 1999-2017 Gentoo Foundation
303 -# Distributed under the terms of the GNU General Public License v2
304 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.2.ebuild,v 1.5 2014/02/08 13:24:00 vapier Exp $
305 -
306 -inherit eutils flag-o-matic toolchain-funcs
307 -
308 -DESCRIPTION="Super-useful stream editor"
309 -HOMEPAGE="http://sed.sourceforge.net/"
310 -SRC_URI="mirror://gnu/sed/${P}.tar.bz2"
311 -
312 -LICENSE="GPL-3"
313 -SLOT="0"
314 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
315 -IUSE="acl nls selinux static"
316 -
317 -RDEPEND="acl? ( virtual/acl )
318 - nls? ( virtual/libintl )
319 - selinux? ( sys-libs/libselinux )"
320 -DEPEND="${RDEPEND}
321 - nls? ( sys-devel/gettext )"
322 -
323 -src_bootstrap_sed() {
324 - # make sure system-sed works #40786
325 - export NO_SYS_SED=""
326 - if ! type -p sed > /dev/null ; then
327 - NO_SYS_SED="!!!"
328 - ./bootstrap.sh || die "couldnt bootstrap"
329 - cp sed/sed "${T}"/ || die "couldnt copy"
330 - export PATH="${PATH}:${T}"
331 - make clean || die "couldnt clean"
332 - fi
333 -}
334 -
335 -src_unpack() {
336 - unpack ${A}
337 - cd "${S}"
338 - epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch
339 - epatch "${FILESDIR}"/${PN}-4.1.4-aix-malloc.patch
340 - epatch "${FILESDIR}"/${PN}-4.2.1-espipe.patch
341 - # don't use sed here if we have to recover a broken host sed
342 -}
343 -
344 -src_compile() {
345 - src_bootstrap_sed
346 - # this has to be after the bootstrap portion
347 - sed -i \
348 - -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
349 - doc/Makefile.in || die "sed html doc"
350 -
351 - local myconf= bindir="${EPREFIX}"/bin
352 - if ! use userland_GNU ; then
353 - myconf="--program-prefix=g"
354 - bindir="${EPREFIX}"/usr/bin
355 - fi
356 -
357 - # Should be able to drop this hack in next release. #333887
358 - tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
359 - export ac_cv_search_setfilecon=$(usex selinux -lselinux)
360 - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
361 - use static && append-ldflags -static
362 - econf \
363 - --bindir="${bindir}" \
364 - $(use_enable acl) \
365 - $(use_enable nls) \
366 - ${myconf}
367 - emake || die "build failed"
368 -}
369 -
370 -src_install() {
371 - emake install DESTDIR="${D}" || die "Install failed"
372 - dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
373 -}
374
375 diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
376 deleted file mode 100644
377 index 593258ac36..0000000000
378 --- a/sys-apps/sed/sed-4.5.ebuild
379 +++ /dev/null
380 @@ -1,77 +0,0 @@
381 -# Copyright 1999-2018 Gentoo Foundation
382 -# Distributed under the terms of the GNU General Public License v2
383 -
384 -EAPI=6
385 -
386 -inherit flag-o-matic toolchain-funcs
387 -
388 -DESCRIPTION="Super-useful stream editor"
389 -HOMEPAGE="http://sed.sourceforge.net/"
390 -SRC_URI="mirror://gnu/sed/${P}.tar.xz"
391 -
392 -LICENSE="GPL-3"
393 -SLOT="0"
394 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
395 -IUSE="acl forced-sandbox nls selinux static"
396 -
397 -RDEPEND="acl? ( virtual/acl )
398 - nls? ( virtual/libintl )
399 - selinux? ( sys-libs/libselinux )"
400 -DEPEND="${RDEPEND}
401 - nls? ( sys-devel/gettext )"
402 -
403 -PATCHES=(
404 - "${FILESDIR}"/${PN}-4.1.4-aix-malloc.patch
405 - "${FILESDIR}"/${PN}-4.2.1-espipe.patch
406 -)
407 -
408 -src_bootstrap_sed() {
409 - # make sure system-sed works #40786 #650052
410 - if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
411 - mkdir -p "${T}/bootstrap"
412 - printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
413 - chmod a+rx "${T}/bootstrap/sed"
414 - PATH="${T}/bootstrap:${PATH}"
415 - fi
416 -}
417 -
418 -src_prepare() {
419 - # Don't use sed before bootstrap if we have to recover a broken host sed.
420 - src_bootstrap_sed
421 -
422 - default
423 -
424 - if use forced-sandbox ; then
425 - # Upstream doesn't want to add a configure flag for this.
426 - # https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
427 - sed -i \
428 - -e '/^bool sandbox = false;/s:false:true:' \
429 - sed/sed.c || die
430 - # Make sure the sed took.
431 - grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed"
432 - fi
433 -}
434 -
435 -src_configure() {
436 - local myconf=()
437 - if use userland_GNU; then
438 - myconf+=( --exec-prefix="${EPREFIX}" )
439 - else
440 - myconf+=( --program-prefix=g )
441 - fi
442 -
443 - export ac_cv_search_setfilecon=$(usex selinux -lselinux)
444 - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
445 - use static && append-ldflags -static
446 - myconf+=(
447 - $(use_enable acl)
448 - $(use_enable nls)
449 - )
450 - econf "${myconf[@]}"
451 -}
452 -
453 -src_install() {
454 - default
455 - # don't want charset.alias, installed by libiconv
456 - rm -f "${ED}"/lib/charset.alias
457 -}
458
459 diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
460 index d889186d10..bb43fd5b3e 100644
461 --- a/sys-apps/sed/sed-4.8.ebuild
462 +++ b/sys-apps/sed/sed-4.8.ebuild
463 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
464
465 LICENSE="GPL-3"
466 SLOT="0"
467 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
468 +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
469 IUSE="acl forced-sandbox nls selinux static"
470
471 RDEPEND="
Report Message
Find on MARC Find on Google Groups