gentoo.git
21 years agoChanged chown as requested by gentoo bsd team. Fixed bug #103563.
Christian Zoffoli [Fri, 2 Sep 2005 11:35:53 +0000 (11:35 +0000)]
Changed chown as requested by gentoo bsd team. Fixed bug #103563.
Package-Manager: portage-2.0.51.19

21 years agoDon't use -d option in cp.
Diego Elio Pettenò [Fri, 2 Sep 2005 11:28:04 +0000 (11:28 +0000)]
Don't use -d option in cp.
Package-Manager: portage-2.0.51.22

21 years agoRevision bump to Software Suspend 2.2-rc5.
Henrik Brix Andersen [Fri, 2 Sep 2005 11:24:48 +0000 (11:24 +0000)]
Revision bump to Software Suspend 2.2-rc5.
Package-Manager: portage-2.0.51.22-r2

21 years agoFix 6.1.6
Renat Lumpau [Fri, 2 Sep 2005 11:20:54 +0000 (11:20 +0000)]
Fix 6.1.6
Package-Manager: portage-2.0.51.22-r2

21 years agoAdd missing dev-perl/DateManip dependency wrt bug #104403.
Renat Lumpau [Fri, 2 Sep 2005 11:19:51 +0000 (11:19 +0000)]
Add missing dev-perl/DateManip dependency wrt bug #104403.
Package-Manager: portage-2.0.51.22-r2

21 years agofixed bug #104562, solved a conflict in my previous commit.
Christian Zoffoli [Fri, 2 Sep 2005 11:12:01 +0000 (11:12 +0000)]
fixed bug #104562, solved a conflict in my previous commit.

21 years agoInitial import
Roy Marples [Fri, 2 Sep 2005 11:11:21 +0000 (11:11 +0000)]
Initial import
Package-Manager: portage-2.0.51.22-r2

21 years agoFix reconfig script wrt bug #104495.
Renat Lumpau [Fri, 2 Sep 2005 11:09:14 +0000 (11:09 +0000)]
Fix reconfig script wrt bug #104495.
Package-Manager: portage-2.0.51.22-r2

21 years ago* branch update
Konstantin V. Arkhipov [Fri, 2 Sep 2005 10:48:40 +0000 (10:48 +0000)]
* branch update
Package-Manager: portage-2.0.51.22-r2

21 years agoRemove stale ebuilds.
Martin Schlemmer [Fri, 2 Sep 2005 10:42:10 +0000 (10:42 +0000)]
Remove stale ebuilds.
Package-Manager: portage-2.0.51.22-r2

21 years agoNew release.
Martin Schlemmer [Fri, 2 Sep 2005 10:39:33 +0000 (10:39 +0000)]
New release.
Package-Manager: portage-2.0.51.22-r2

21 years agoMissed an old patch when tidying.
Aaron Walker [Fri, 2 Sep 2005 10:03:03 +0000 (10:03 +0000)]
Missed an old patch when tidying.
Package-Manager: portage-2.0.51.22-r2

21 years agoDo not run elibtoolize again if already run. The check for no patches applied was...
Martin Schlemmer [Fri, 2 Sep 2005 10:02:50 +0000 (10:02 +0000)]
Do not run elibtoolize again if already run.  The check for no patches applied was in the wrong for loop.

21 years agoRevision bump; fix cron job to use mktemp. Keeping keywords. Tidy old ebuilds
Aaron Walker [Fri, 2 Sep 2005 09:58:35 +0000 (09:58 +0000)]
Revision bump; fix cron job to use mktemp.  Keeping keywords. Tidy old ebuilds
Package-Manager: portage-2.0.51.22-r2

21 years agoSome misc cleanups, and do not warn if portage patch seems to be applied.
Martin Schlemmer [Fri, 2 Sep 2005 09:35:17 +0000 (09:35 +0000)]
Some misc cleanups, and do not warn if portage patch seems to be applied.

21 years ago* fixed #103421
Konstantin V. Arkhipov [Fri, 2 Sep 2005 09:15:45 +0000 (09:15 +0000)]
* fixed #103421
Package-Manager: portage-2.0.51.22-r2

21 years agoAdded mkvtoolnix 1.5.0. -amd64 until it's sorted out the crash on Add button.
Diego Elio Pettenò [Fri, 2 Sep 2005 08:25:27 +0000 (08:25 +0000)]
Added mkvtoolnix 1.5.0. -amd64 until it's sorted out the crash on Add button.
Package-Manager: portage-2.0.51.22

21 years agoAdd --automake to libtoolize if we are using automake.
Martin Schlemmer [Fri, 2 Sep 2005 08:23:30 +0000 (08:23 +0000)]
Add --automake to libtoolize if we are using automake.

21 years agoVersion bump, closes bug #104510
Michele Noberasco [Fri, 2 Sep 2005 08:23:05 +0000 (08:23 +0000)]
Version bump, closes bug #104510
Package-Manager: portage-2.0.51.22-r2

21 years agoFixed my spelling on ChangeLog.. again.
Diego Elio Pettenò [Fri, 2 Sep 2005 08:16:46 +0000 (08:16 +0000)]
Fixed my spelling on ChangeLog.. again.
Package-Manager: portage-2.0.51.22

21 years agoadded umount.cifs support (bug #104504)
Christian Andreetta [Fri, 2 Sep 2005 08:12:41 +0000 (08:12 +0000)]
added umount.cifs support (bug #104504)
Package-Manager: portage-2.0.51.22-r2

21 years agoFixing up the ebuild and adding a patch that allows compilation on ppc-macos
Fabian Groffen [Fri, 2 Sep 2005 08:10:39 +0000 (08:10 +0000)]
Fixing up the ebuild and adding a patch that allows compilation on ppc-macos
Package-Manager: portage-2.0.51.22-r2

21 years agoStable on alpha due to security bug #104010
José Luis Rivero [Fri, 2 Sep 2005 08:07:39 +0000 (08:07 +0000)]
Stable on alpha due to security bug #104010
Package-Manager: portage-2.0.51.22-r2

21 years agoRevision bump, with patch that adds support for Toshiba Satellite M30X series.
Michele Noberasco [Fri, 2 Sep 2005 07:36:09 +0000 (07:36 +0000)]
Revision bump, with patch that adds support for Toshiba Satellite M30X series.
Package-Manager: portage-2.0.51.22-r2

21 years ago* -pcre build issue fixed
Konstantin V. Arkhipov [Fri, 2 Sep 2005 07:29:10 +0000 (07:29 +0000)]
* -pcre build issue fixed
Package-Manager: portage-2.0.51.22-r2

21 years agoStable on alpha due to security bug #104010
José Luis Rivero [Fri, 2 Sep 2005 07:20:07 +0000 (07:20 +0000)]
Stable on alpha due to security bug #104010
Package-Manager: portage-2.0.51.22-r2

21 years agoInstall ifplugd.action to /usr/sbin and not /etc/init.d
Roy Marples [Fri, 2 Sep 2005 06:46:40 +0000 (06:46 +0000)]
Install ifplugd.action to /usr/sbin and not /etc/init.d
Package-Manager: portage-2.0.51.22-r2

21 years agofixed syslog-ng-1.6.8-r1.ebuild
Michael Sterrett [Fri, 2 Sep 2005 06:20:36 +0000 (06:20 +0000)]
fixed syslog-ng-1.6.8-r1.ebuild

21 years agofix another bad bit of autotooling related to --with-libol (bug #104538)
Michael Sterrett [Fri, 2 Sep 2005 06:16:10 +0000 (06:16 +0000)]
fix another bad bit of autotooling related to --with-libol (bug #104538)
Package-Manager: portage-2.0.51.22-r2

21 years ago+# masked until the libol bug is fixed:
Michael Sterrett [Fri, 2 Sep 2005 06:06:51 +0000 (06:06 +0000)]
+# masked until the libol bug is fixed:
+=app-admin/syslog-ng-1.6.8-r1

21 years agomoved header files to /usr/include/libdvb
Matthias Schwarzott [Fri, 2 Sep 2005 05:22:13 +0000 (05:22 +0000)]
moved header files to /usr/include/libdvb
Package-Manager: portage-2.0.51.22-r2

21 years agonot supposed to be in sparc/x86 stable
Mike Frysinger [Fri, 2 Sep 2005 05:11:39 +0000 (05:11 +0000)]
not supposed to be in sparc/x86 stable
Package-Manager: portage-2.0.51.22-r2

21 years agoAdded media-libs/libdvb-0.5.5.1-r1 for testing the header move
Matthias Schwarzott [Fri, 2 Sep 2005 05:11:10 +0000 (05:11 +0000)]
Added media-libs/libdvb-0.5.5.1-r1 for testing the header move

21 years agoVersion bump.
Mike Frysinger [Fri, 2 Sep 2005 05:06:09 +0000 (05:06 +0000)]
Version bump.
Package-Manager: portage-2.0.51.22-r2

21 years agoAdd support for FreeBSD #103388 by Diego Pettenò.
Mike Frysinger [Fri, 2 Sep 2005 05:05:55 +0000 (05:05 +0000)]
Add support for FreeBSD #103388 by Diego Pettenò.
Package-Manager: portage-2.0.51.22-r2

21 years agoinform user they are switching cross/native compiler
Mike Frysinger [Fri, 2 Sep 2005 05:05:37 +0000 (05:05 +0000)]
inform user they are switching cross/native compiler
Package-Manager: portage-2.0.51.22-r2

21 years agoinform user they are switching cross/native compiler
Mike Frysinger [Fri, 2 Sep 2005 05:05:28 +0000 (05:05 +0000)]
inform user they are switching cross/native compiler
Package-Manager: portage-2.0.51.22-r2

21 years agopull in localized man-pages if the user wants them
Mike Frysinger [Fri, 2 Sep 2005 04:30:52 +0000 (04:30 +0000)]
pull in localized man-pages if the user wants them
Package-Manager: portage-2.0.51.22-r2

21 years agoadd arm/s390 to keep manpages-ja happy
Mike Frysinger [Fri, 2 Sep 2005 04:30:37 +0000 (04:30 +0000)]
add arm/s390 to keep manpages-ja happy
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-ja
Mike Frysinger [Fri, 2 Sep 2005 04:30:28 +0000 (04:30 +0000)]
renamed from manpages-ja
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-pl
Mike Frysinger [Fri, 2 Sep 2005 04:29:32 +0000 (04:29 +0000)]
renamed from manpages-pl
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-es
Mike Frysinger [Fri, 2 Sep 2005 04:29:19 +0000 (04:29 +0000)]
renamed from manpages-es
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-ru
Mike Frysinger [Fri, 2 Sep 2005 04:28:58 +0000 (04:28 +0000)]
renamed from manpages-ru
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-fr
Mike Frysinger [Fri, 2 Sep 2005 04:28:51 +0000 (04:28 +0000)]
renamed from manpages-fr
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-it
Mike Frysinger [Fri, 2 Sep 2005 04:28:38 +0000 (04:28 +0000)]
renamed from manpages-it
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-de
Mike Frysinger [Fri, 2 Sep 2005 04:28:32 +0000 (04:28 +0000)]
renamed from manpages-de
Package-Manager: portage-2.0.51.22-r2

21 years agorenamed from manpages-cs
Mike Frysinger [Fri, 2 Sep 2005 04:28:25 +0000 (04:28 +0000)]
renamed from manpages-cs
Package-Manager: portage-2.0.51.22-r2

21 years agorename manpages-?? to man-pages-??
Mike Frysinger [Fri, 2 Sep 2005 04:28:01 +0000 (04:28 +0000)]
rename manpages-?? to man-pages-??

21 years agorenamed to man-pages-??
Mike Frysinger [Fri, 2 Sep 2005 04:27:51 +0000 (04:27 +0000)]
renamed to man-pages-??

21 years agoinitial import
Mike Frysinger [Fri, 2 Sep 2005 04:27:12 +0000 (04:27 +0000)]
initial import
Package-Manager: portage-2.0.51.22-r2

21 years agoinitial import
Mike Frysinger [Fri, 2 Sep 2005 04:27:08 +0000 (04:27 +0000)]
initial import
Package-Manager: portage-2.0.51.22-r2

21 years agoinitial import
Mike Frysinger [Fri, 2 Sep 2005 04:26:59 +0000 (04:26 +0000)]
initial import
Package-Manager: portage-2.0.51.22-r2

21 years agoVersion bump.
Robin H. Johnson [Fri, 2 Sep 2005 04:02:41 +0000 (04:02 +0000)]
Version bump.
Package-Manager: portage-2.0.51.22-r2

21 years agoAdded ~amd64 keywords. Closes bug #98166.
Luis Medinas [Fri, 2 Sep 2005 03:46:11 +0000 (03:46 +0000)]
Added ~amd64 keywords. Closes bug #98166.
Package-Manager: portage-2.0.51.22-r2

21 years agoMarked Stable on AMD64.
Luis Medinas [Fri, 2 Sep 2005 03:37:58 +0000 (03:37 +0000)]
Marked Stable on AMD64.
Package-Manager: portage-2.0.51.22-r2

21 years agoAdded ~amd64 keywords. Closes bug #104209.
Luis Medinas [Fri, 2 Sep 2005 03:32:22 +0000 (03:32 +0000)]
Added ~amd64 keywords. Closes bug #104209.
Package-Manager: portage-2.0.51.22-r2

21 years agoMarked Stable on AMD64.
Luis Medinas [Fri, 2 Sep 2005 03:27:28 +0000 (03:27 +0000)]
Marked Stable on AMD64.
Package-Manager: portage-2.0.51.22-r2

21 years agostabilize
Mike Frysinger [Fri, 2 Sep 2005 03:02:59 +0000 (03:02 +0000)]
stabilize
Package-Manager: portage-2.0.51.22-r2

21 years agoinitial commit
Chris PeBenito [Fri, 2 Sep 2005 02:52:33 +0000 (02:52 +0000)]
initial commit

21 years agoMarked ppc stable for bug #103291.
Joseph Jezak [Fri, 2 Sep 2005 02:31:01 +0000 (02:31 +0000)]
Marked ppc stable for bug #103291.
Package-Manager: portage-2.0.51.22-r2

21 years agoMakes certain draw code endian-safe. Should fix things for big-endian
Joshua Baergen [Fri, 2 Sep 2005 01:56:42 +0000 (01:56 +0000)]
Makes certain draw code endian-safe. Should fix things for big-endian
arches. Thanks to Stanislaw Skowronek and geoman in bug #104318.
Package-Manager: portage-2.0.51.22-r2

21 years agoMarked ppc stable for bug #101865.
Joseph Jezak [Fri, 2 Sep 2005 01:36:37 +0000 (01:36 +0000)]
Marked ppc stable for bug #101865.
Package-Manager: portage-2.0.51.22-r2

21 years agorev bump to fix missing dep on sys-apps/which (bug #104475)
Michael Sterrett [Fri, 2 Sep 2005 01:30:12 +0000 (01:30 +0000)]
rev bump to fix missing dep on sys-apps/which (bug #104475)
Package-Manager: portage-2.0.51.22-r2

21 years agoVersion bump #104492 by Martin Nowack.
Mike Frysinger [Fri, 2 Sep 2005 00:49:57 +0000 (00:49 +0000)]
Version bump #104492 by Martin Nowack.
Package-Manager: portage-2.0.51.22-r2

21 years agomore modular init scripts, so that client and server are separate; version bump to...
Stefaan De Roeck [Fri, 2 Sep 2005 00:48:27 +0000 (00:48 +0000)]
more modular init scripts, so that client and server are separate; version bump to 1.4.0 rc2 in the 1.4 family; and a bunch of other tweaks such as: starting after a local dns server when available, arrange a sensible default configuration, do parsing of cacheinfo during startup, etc. closing bugs #97478, #97480, #100837, #101128
Package-Manager: portage-2.0.51.22-r2

21 years agoClean up the way we disable wm97xx/sis315 and enable i830.
Mike Frysinger [Fri, 2 Sep 2005 00:18:45 +0000 (00:18 +0000)]
Clean up the way we disable wm97xx/sis315 and enable i830.
Package-Manager: portage-2.0.51.22-r2

21 years agoAdd missing automake-1.9 dep
Daniel Gryniewicz [Fri, 2 Sep 2005 00:16:17 +0000 (00:16 +0000)]
Add missing automake-1.9 dep
Package-Manager: portage-2.0.51.22-r2

21 years agoMarked ~amd64
Daniel Gryniewicz [Fri, 2 Sep 2005 00:04:27 +0000 (00:04 +0000)]
Marked ~amd64
Package-Manager: portage-2.0.51.22-r2

21 years agoclean up and remove hppa CHOST forcing #104461
Mike Frysinger [Fri, 2 Sep 2005 00:04:20 +0000 (00:04 +0000)]
clean up and remove hppa CHOST forcing #104461
Package-Manager: portage-2.0.51.22-r2

21 years agoinherit fixheadtails to fix bug #104475
Michael Sterrett [Fri, 2 Sep 2005 00:03:02 +0000 (00:03 +0000)]
inherit fixheadtails to fix bug #104475
Package-Manager: portage-2.0.51.22-r2

21 years agoRemove doc useflag, always install user docs, fixes #95653. Install man page from...
Diego Elio Pettenò [Thu, 1 Sep 2005 23:56:55 +0000 (23:56 +0000)]
Remove doc useflag, always install user docs, fixes #95653. Install man page from debian, close #95655. Use newinitd.
Package-Manager: portage-2.0.51.22

21 years agoversion bump to 1.4.0 rc2 in the 1.4 family
Stefaan De Roeck [Thu, 1 Sep 2005 23:51:34 +0000 (23:51 +0000)]
version bump to 1.4.0 rc2 in the 1.4 family
Package-Manager: portage-2.0.51.22-r2

21 years agoamd64/hppa stable
Mike Frysinger [Thu, 1 Sep 2005 23:30:31 +0000 (23:30 +0000)]
amd64/hppa stable
Package-Manager: portage-2.0.51.22-r2

21 years agoamd64/hppa stable
Mike Frysinger [Thu, 1 Sep 2005 23:30:27 +0000 (23:30 +0000)]
amd64/hppa stable
Package-Manager: portage-2.0.51.22-r2

21 years agoamd64/hppa stable
Mike Frysinger [Thu, 1 Sep 2005 23:30:18 +0000 (23:30 +0000)]
amd64/hppa stable
Package-Manager: portage-2.0.51.22-r2

21 years agobug 104503
Marcelo Góes [Thu, 1 Sep 2005 23:30:10 +0000 (23:30 +0000)]
bug 104503
Package-Manager: portage-2.0.51.22-r2

21 years agostabilize #104454
Mike Frysinger [Thu, 1 Sep 2005 23:28:34 +0000 (23:28 +0000)]
stabilize #104454
Package-Manager: portage-2.0.51.22-r2

21 years agobug 104502
Marcelo Góes [Thu, 1 Sep 2005 23:14:22 +0000 (23:14 +0000)]
bug 104502
Package-Manager: portage-2.0.51.22-r2

21 years agofixed bug #103793
Christian Zoffoli [Thu, 1 Sep 2005 23:07:25 +0000 (23:07 +0000)]
fixed bug #103793
Package-Manager: portage-2.0.51.19

21 years agoadd musicbrainz dep
Zaheer Abbas Merali [Thu, 1 Sep 2005 22:46:14 +0000 (22:46 +0000)]
add musicbrainz dep
Package-Manager: portage-2.0.51.22-r2

21 years agoNew version.
Olivier Fisette [Thu, 1 Sep 2005 22:14:58 +0000 (22:14 +0000)]
New version.
Package-Manager: portage-2.0.51.22-r2

21 years agoremoved obsolete unicode dependency (see bug 104490).
Stefan Briesenick [Thu, 1 Sep 2005 20:44:37 +0000 (20:44 +0000)]
removed obsolete unicode dependency (see bug 104490).
Package-Manager: portage-2.0.51.22-r2

21 years agoversion bump + ebuild cleanup
Stefan Briesenick [Thu, 1 Sep 2005 20:34:05 +0000 (20:34 +0000)]
version bump + ebuild cleanup
Package-Manager: portage-2.0.51.22-r2

21 years agoVersion bump for 2.4. Cleaning digest files to make repoman happy.
Edgar Hucek [Thu, 1 Sep 2005 20:04:39 +0000 (20:04 +0000)]
Version bump for 2.4. Cleaning digest files to make repoman happy.
Package-Manager: portage-2.0.51.22-r2

21 years agosort
Sven Wegener [Thu, 1 Sep 2005 19:48:00 +0000 (19:48 +0000)]
sort

21 years agoStable on ppc64 (bug #104010)
Markus Rothe [Thu, 1 Sep 2005 19:36:11 +0000 (19:36 +0000)]
Stable on ppc64 (bug #104010)
Package-Manager: portage-2.0.51.22-r2

21 years agoebuild cleanups
Harald van Dijk [Thu, 1 Sep 2005 19:33:55 +0000 (19:33 +0000)]
ebuild cleanups
Package-Manager: portage-1.589-cvs

21 years agomany cleanups and fixes
Harald van Dijk [Thu, 1 Sep 2005 19:20:34 +0000 (19:20 +0000)]
many cleanups and fixes
Package-Manager: portage-1.589-cvs

21 years agoKeyworded sparc stable and -sparc
Gustavo Zacarias [Thu, 1 Sep 2005 19:20:15 +0000 (19:20 +0000)]
Keyworded sparc stable and -sparc
Package-Manager: portage-2.0.51.22-r2

21 years agoManual Manifest commit.
Sven Wegener [Thu, 1 Sep 2005 19:18:51 +0000 (19:18 +0000)]
Manual Manifest commit.

21 years agotrim whitespace
Sven Wegener [Thu, 1 Sep 2005 19:18:33 +0000 (19:18 +0000)]
trim whitespace
Package-Manager: portage-2.0.51.22-r2

21 years agoNew upstream version; Resolves Bug #103899; Keywording stable amd64, sparc and x86...
Matthew Kennedy [Thu, 1 Sep 2005 18:40:50 +0000 (18:40 +0000)]
New upstream version; Resolves Bug #103899; Keywording stable amd64, sparc and x86 for =dev-lisp/sbcl-0.9.3; Resolves Bug #103902; Remove older ebuilds: <=dev-lisp/sbcl-0.9.1; Remove ppc keywords from >=dev-lisp/sbcl-0.9.3 (see Bug #99456).
Package-Manager: portage-2.0.51.22-r2

21 years agoCorrect documentation install path; Resolves Bug #99387.
Matthew Kennedy [Thu, 1 Sep 2005 18:37:01 +0000 (18:37 +0000)]
Correct documentation install path; Resolves Bug #99387.
Package-Manager: portage-2.0.51.22-r2

21 years agoKeywording stable amd64, sparc; Remove dependency on syslogger.
Matthew Kennedy [Thu, 1 Sep 2005 18:35:21 +0000 (18:35 +0000)]
Keywording stable amd64, sparc; Remove dependency on syslogger.
Package-Manager: portage-2.0.51.22-r2

21 years agoKeywording stable amd64, sparc; Remove dependency on syslogger.
Matthew Kennedy [Thu, 1 Sep 2005 18:34:23 +0000 (18:34 +0000)]
Keywording stable amd64, sparc; Remove dependency on syslogger.
Package-Manager: portage-2.0.51.22-r2

21 years agoKeywording stable amd64, sparc.
Matthew Kennedy [Thu, 1 Sep 2005 18:30:03 +0000 (18:30 +0000)]
Keywording stable amd64, sparc.
Package-Manager: portage-2.0.51.22-r2

21 years agoManual Manifest commit.
Sven Wegener [Thu, 1 Sep 2005 18:26:48 +0000 (18:26 +0000)]
Manual Manifest commit.

21 years agoRemoved old ebuild.
Sven Wegener [Thu, 1 Sep 2005 18:26:28 +0000 (18:26 +0000)]
Removed old ebuild.
Package-Manager: portage-2.0.51.22-r2

21 years agoStable on sparc
Gustavo Zacarias [Thu, 1 Sep 2005 18:23:49 +0000 (18:23 +0000)]
Stable on sparc
Package-Manager: portage-2.0.51.22-r2

21 years agoKeywording ~ppc-macos; Resolves Bug #103168.
Matthew Kennedy [Thu, 1 Sep 2005 18:05:36 +0000 (18:05 +0000)]
Keywording ~ppc-macos; Resolves Bug #103168.
Package-Manager: portage-2.0.51.22-r2