gentoo.git
17 years agocleanup old version
Christian Faulhammer [Wed, 6 Dec 2006 20:14:32 +0000 (20:14 +0000)]
cleanup old version
Package-Manager: portage-2.1.1-r2

17 years agocleanup old version
Christian Faulhammer [Wed, 6 Dec 2006 20:14:02 +0000 (20:14 +0000)]
cleanup old version
Package-Manager: portage-2.1.1-r2

17 years agoRemoved check on older CVS snapshot version of openal.
Chris Gianelloni [Wed, 6 Dec 2006 20:12:42 +0000 (20:12 +0000)]
Removed check on older CVS snapshot version of openal.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoving specific version of openal since the older CVS snapshot versions have been...
Chris Gianelloni [Wed, 6 Dec 2006 20:11:19 +0000 (20:11 +0000)]
Removing specific version of openal since the older CVS snapshot versions have been removed from the tree for some time now.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 20:09:38 +0000 (20:09 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoving specific version of openal since the older CVS snapshot versions have been...
Chris Gianelloni [Wed, 6 Dec 2006 20:07:50 +0000 (20:07 +0000)]
Removing specific version of openal since the older CVS snapshot versions have been removed from the tree for some time now.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 20:04:22 +0000 (20:04 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoAdd a check for ISA drivers, improve check for PNP/FW_LOADER drivers, properly check...
Diego Elio Pettenò [Wed, 6 Dec 2006 20:04:13 +0000 (20:04 +0000)]
Add a check for ISA drivers, improve check for PNP/FW_LOADER drivers, properly check for SND being disabled in kernel.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on MIPS.
Alexander Færøy [Wed, 6 Dec 2006 20:04:04 +0000 (20:04 +0000)]
Stable on MIPS.
Package-Manager: portage-2.1.2_rc2-r4

17 years agoStable on MIPS.
Alexander Færøy [Wed, 6 Dec 2006 20:03:38 +0000 (20:03 +0000)]
Stable on MIPS.
Package-Manager: portage-2.1.2_rc2-r4

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 19:58:23 +0000 (19:58 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoVersion bump, adding 2.6.18-028test007.1.
Christian Heim [Wed, 6 Dec 2006 19:56:19 +0000 (19:56 +0000)]
Version bump, adding 2.6.18-028test007.1.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoVersion bump (bug #121862) thanks to Timothy Redaelli <drizzt@gentoo.org>.
Sandro Bonazzola [Wed, 6 Dec 2006 19:52:39 +0000 (19:52 +0000)]
Version bump (bug #121862) thanks to Timothy Redaelli <drizzt@gentoo.org>.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoVersion bump
Markus Ullmann [Wed, 6 Dec 2006 19:52:39 +0000 (19:52 +0000)]
Version bump
Package-Manager: portage-2.1.2_rc2-r5

17 years agoChanged to use GAMES_PREFIX_OPT in ut2004.xml instead of a hard-coded /opt.
Chris Gianelloni [Wed, 6 Dec 2006 19:52:03 +0000 (19:52 +0000)]
Changed to use GAMES_PREFIX_OPT in ut2004.xml instead of a hard-coded /opt.
Package-Manager: portage-2.1.2_rc2-r2

17 years agonuppelvideo is partially broken, but may still be of use to someone.
Patrick Kursawe [Wed, 6 Dec 2006 19:46:15 +0000 (19:46 +0000)]
nuppelvideo is partially broken, but may still be of use to someone.

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 19:43:15 +0000 (19:43 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoVersion bump
Tristan Heaven [Wed, 6 Dec 2006 19:41:20 +0000 (19:41 +0000)]
Version bump
Package-Manager: portage-2.1.2_rc2-r5

17 years agoRemoving a comment that wasn't correct.
Chris Gianelloni [Wed, 6 Dec 2006 19:41:11 +0000 (19:41 +0000)]
Removing a comment that wasn't correct.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoUpdate wrt default-linux/pp
Diego Elio Pettenò [Wed, 6 Dec 2006 19:32:31 +0000 (19:32 +0000)]
Update wrt default-linux/pp

17 years agoUpdate wrt default-linux/ppc.
Diego Elio Pettenò [Wed, 6 Dec 2006 19:31:43 +0000 (19:31 +0000)]
Update wrt default-linux/ppc.

17 years agoMask the ISA cards, rather than just the PNP ones.
Diego Elio Pettenò [Wed, 6 Dec 2006 19:30:28 +0000 (19:30 +0000)]
Mask the ISA cards, rather than just the PNP ones.

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 19:25:46 +0000 (19:25 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoMarking hardened-sources-2.6.18 stable on amd64 (see bug #157356, on behalf of Mike...
Christian Heim [Wed, 6 Dec 2006 19:15:15 +0000 (19:15 +0000)]
Marking hardened-sources-2.6.18 stable on amd64 (see bug #157356, on behalf of Mike Doty).
Package-Manager: portage-2.1.2_rc2-r5

17 years agoinitial commit
Christian Faulhammer [Wed, 6 Dec 2006 19:06:21 +0000 (19:06 +0000)]
initial commit
Package-Manager: portage-2.1.1-r2

17 years agoUpdate wrt default-linux/ppc
Diego Elio Pettenò [Wed, 6 Dec 2006 19:02:53 +0000 (19:02 +0000)]
Update wrt default-linux/ppc

17 years agoUnmask specific MIPS ALSA drivers.
Diego Elio Pettenò [Wed, 6 Dec 2006 19:01:50 +0000 (19:01 +0000)]
Unmask specific MIPS ALSA drivers.

17 years agoMask specific MIPS drivers.
Diego Elio Pettenò [Wed, 6 Dec 2006 18:59:32 +0000 (18:59 +0000)]
Mask specific MIPS drivers.

17 years agoMask HPPA specific ALSA driver.
Diego Elio Pettenò [Wed, 6 Dec 2006 18:51:29 +0000 (18:51 +0000)]
Mask HPPA specific ALSA driver.

17 years agoUnmask HPPA specific ALSA driver.
Diego Elio Pettenò [Wed, 6 Dec 2006 18:51:12 +0000 (18:51 +0000)]
Unmask HPPA specific ALSA driver.

17 years agoUnmask ARM-specific ALSA drivers
Diego Elio Pettenò [Wed, 6 Dec 2006 18:49:36 +0000 (18:49 +0000)]
Unmask ARM-specific ALSA drivers

17 years agofix dbus deps in thoggen
Hanno Boeck [Wed, 6 Dec 2006 18:45:53 +0000 (18:45 +0000)]
fix dbus deps in thoggen
Package-Manager: portage-2.1.2_rc2-r5

17 years agoUpdate wrt default-linux/sparc profile.
Diego Elio Pettenò [Wed, 6 Dec 2006 18:45:07 +0000 (18:45 +0000)]
Update wrt default-linux/sparc profile.

17 years agoUpdate wrt default-linux/ppc profile.
Diego Elio Pettenò [Wed, 6 Dec 2006 18:42:50 +0000 (18:42 +0000)]
Update wrt default-linux/ppc profile.

17 years agoversion bump
Christian Faulhammer [Wed, 6 Dec 2006 18:36:20 +0000 (18:36 +0000)]
version bump
Package-Manager: portage-2.1.1-r2

17 years agoversion bump
Christian Faulhammer [Wed, 6 Dec 2006 18:27:42 +0000 (18:27 +0000)]
version bump
Package-Manager: portage-2.1.1-r2

17 years agoPut new versions in here
Caleb Tennis [Wed, 6 Dec 2006 18:26:35 +0000 (18:26 +0000)]
Put new versions in here

17 years agoversion bump, it is internal revision -2
Christian Faulhammer [Wed, 6 Dec 2006 18:22:51 +0000 (18:22 +0000)]
version bump, it is internal revision -2
Package-Manager: portage-2.1.1-r2

17 years agoSign Manfiest
Patrick McLean [Wed, 6 Dec 2006 18:15:25 +0000 (18:15 +0000)]
Sign Manfiest

17 years agoAdd dbus to IUSE (oops), bug #157312.
Patrick McLean [Wed, 6 Dec 2006 18:15:05 +0000 (18:15 +0000)]
Add dbus to IUSE (oops), bug #157312.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoReverting back to the liblua* naming
Matti Bickel [Wed, 6 Dec 2006 18:06:50 +0000 (18:06 +0000)]
Reverting back to the liblua* naming
Package-Manager: portage-2.1.1-r2

17 years agocleanup old versions
Christian Faulhammer [Wed, 6 Dec 2006 18:06:46 +0000 (18:06 +0000)]
cleanup old versions
Package-Manager: portage-2.1.1-r2

17 years agoReverting back to the liblua* naming
Matti Bickel [Wed, 6 Dec 2006 18:06:32 +0000 (18:06 +0000)]
Reverting back to the liblua* naming
Package-Manager: portage-2.1.1-r2

17 years agocleanup old versions
Christian Faulhammer [Wed, 6 Dec 2006 18:06:26 +0000 (18:06 +0000)]
cleanup old versions
Package-Manager: portage-2.1.1-r2

17 years agoKeyworded stable on x86 so that people moving from jgoodies-looks-bin have a new...
Petteri Räty [Wed, 6 Dec 2006 18:03:19 +0000 (18:03 +0000)]
Keyworded stable on x86 so that people moving from jgoodies-looks-bin have a new revision available.
Package-Manager: portage-2.1.2_rc2-r3

17 years agoAdd ~alpha and ~ia64 keyword.
Bryan Østergaard [Wed, 6 Dec 2006 17:55:25 +0000 (17:55 +0000)]
Add ~alpha and ~ia64 keyword.
Package-Manager: portage-2.1.2_rc2-r3

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 17:50:46 +0000 (17:50 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r3

17 years agoMask specific Sun drivers.
Diego Elio Pettenò [Wed, 6 Dec 2006 17:49:41 +0000 (17:49 +0000)]
Mask specific Sun drivers.

17 years agoRemove the (not yet committed) mask on Sun-specific ALSA drivers.
Diego Elio Pettenò [Wed, 6 Dec 2006 17:48:45 +0000 (17:48 +0000)]
Remove the (not yet committed) mask on Sun-specific ALSA drivers.

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 17:46:05 +0000 (17:46 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r3

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:29:50 +0000 (17:29 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:28:56 +0000 (17:28 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:28:04 +0000 (17:28 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:27:54 +0000 (17:27 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:27:35 +0000 (17:27 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:27:19 +0000 (17:27 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:24:00 +0000 (17:24 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:23:52 +0000 (17:23 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:22:55 +0000 (17:22 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved binary version of jgoodies-looks. The same version and newer are available...
William Thomson [Wed, 6 Dec 2006 17:21:37 +0000 (17:21 +0000)]
Removed binary version of jgoodies-looks. The same version and newer are available from source. Same version and newer are marked stable. Didn't find any reverse deps. Package move was recorded in updates.

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:21:07 +0000 (17:21 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:20:15 +0000 (17:20 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:18:20 +0000 (17:18 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:18:11 +0000 (17:18 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:13:28 +0000 (17:13 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:13:18 +0000 (17:13 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoMoving dev-java/jgoodies-looks-bin -> dev-java/jgoodies-looks
William Thomson [Wed, 6 Dec 2006 17:12:16 +0000 (17:12 +0000)]
Moving dev-java/jgoodies-looks-bin -> dev-java/jgoodies-looks

17 years agoMask ALSA drivers Apple specific so that they can't be enabled on other architectures.
Diego Elio Pettenò [Wed, 6 Dec 2006 17:11:51 +0000 (17:11 +0000)]
Mask ALSA drivers Apple specific so that they can't be enabled on other architectures.

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:09:56 +0000 (17:09 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemoved sed-4 from *DEPEND.
Chris Gianelloni [Wed, 6 Dec 2006 17:09:46 +0000 (17:09 +0000)]
Removed sed-4 from *DEPEND.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoUnmask (not yet masked) alsa_cards that are PPC specific.
Diego Elio Pettenò [Wed, 6 Dec 2006 17:09:19 +0000 (17:09 +0000)]
Unmask (not yet masked) alsa_cards that are PPC specific.

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:04:33 +0000 (17:04 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoRemove old virtual/x11 dependency.
Chris Gianelloni [Wed, 6 Dec 2006 17:04:24 +0000 (17:04 +0000)]
Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2

17 years agoVersion bump, add myself as another maintainer
Steve Dibb [Wed, 6 Dec 2006 17:03:50 +0000 (17:03 +0000)]
Version bump, add myself as another maintainer
Package-Manager: portage-2.1.1-r2

17 years agoDouble-check the ALSA_CARDS variable by checking that the requested drivers are suppo...
Diego Elio Pettenò [Wed, 6 Dec 2006 17:03:08 +0000 (17:03 +0000)]
Double-check the ALSA_CARDS variable by checking that the requested drivers are supported by the ebuild and they are available on the architecture.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoRevision bump - bug #157119
Yuval Yaari [Wed, 6 Dec 2006 17:01:37 +0000 (17:01 +0000)]
Revision bump - bug #157119
Package-Manager: portage-2.1.1-r2

17 years agoRevision bump - bug #157119
Yuval Yaari [Wed, 6 Dec 2006 17:01:25 +0000 (17:01 +0000)]
Revision bump - bug #157119
Package-Manager: portage-2.1.1-r2

17 years agoMask interwave and interwave-stb drivers (they depend on PNP functions not available...
Diego Elio Pettenò [Wed, 6 Dec 2006 17:00:26 +0000 (17:00 +0000)]
Mask interwave and interwave-stb drivers (they depend on PNP functions not available on ppc.
Acknowledged by lu_zero.

17 years agorepaired the ebuild
Christian Faulhammer [Wed, 6 Dec 2006 16:44:08 +0000 (16:44 +0000)]
repaired the ebuild
Package-Manager: portage-2.1.1-r2

17 years agoApply makefile.patch (#157331).
Alin Năstac [Wed, 6 Dec 2006 16:29:16 +0000 (16:29 +0000)]
Apply makefile.patch (#157331).
Package-Manager: portage-2.1.1-r1

17 years agoApply makefile.patch (#157331).
Alin Năstac [Wed, 6 Dec 2006 16:28:51 +0000 (16:28 +0000)]
Apply makefile.patch (#157331).
Package-Manager: portage-2.1.1-r1

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 16:11:31 +0000 (16:11 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 16:01:04 +0000 (16:01 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoAdded new snapshot.
Matthias Schwarzott [Wed, 6 Dec 2006 16:00:38 +0000 (16:00 +0000)]
Added new snapshot.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoAdded new snapshot.
Matthias Schwarzott [Wed, 6 Dec 2006 16:00:19 +0000 (16:00 +0000)]
Added new snapshot.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:54:24 +0000 (15:54 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:54:14 +0000 (15:54 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agofixed deps, squashfs building, added a few new patches
Guillaume Destuynder [Wed, 6 Dec 2006 15:53:29 +0000 (15:53 +0000)]
fixed deps, squashfs building, added a few new patches
Package-Manager: portage-2.1.2_rc2-r2

17 years agoAdd patch to fix compilation with D-Bus 1.x, Fixes bug #155279, Thanks to Priit Laes...
Stephen Klimaszewski [Wed, 6 Dec 2006 15:51:25 +0000 (15:51 +0000)]
Add patch to fix compilation with D-Bus 1.x, Fixes bug #155279, Thanks to Priit Laes for reporting.
Package-Manager: portage-2.1.1-r2

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:43:24 +0000 (15:43 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:43:14 +0000 (15:43 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoadded trailing slashes to all the HOMEPAGE URIs
Christian Faulhammer [Wed, 6 Dec 2006 15:37:47 +0000 (15:37 +0000)]
added trailing slashes to all the HOMEPAGE URIs
Package-Manager: portage-2.1.1-r2

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:24:19 +0000 (15:24 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoStable on Alpha.
Bryan Østergaard [Wed, 6 Dec 2006 15:24:10 +0000 (15:24 +0000)]
Stable on Alpha.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoVersion bump.
Piotr Jaroszyński [Wed, 6 Dec 2006 15:20:19 +0000 (15:20 +0000)]
Version bump.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoVersion bump.
Piotr Jaroszyński [Wed, 6 Dec 2006 15:20:02 +0000 (15:20 +0000)]
Version bump.
Package-Manager: portage-2.1.2_rc2-r5

17 years agoFix /dev creation thanks to zlin
Stefan Schweizer [Wed, 6 Dec 2006 15:05:42 +0000 (15:05 +0000)]
Fix /dev creation thanks to zlin
Package-Manager: portage-2.1.2_rc2-r5

17 years agoRemove OSS modules, they are not valid values for ALSA_CARDS.
Diego Elio Pettenò [Wed, 6 Dec 2006 15:04:59 +0000 (15:04 +0000)]
Remove OSS modules, they are not valid values for ALSA_CARDS.

17 years agoVersion bump. Fixes lots of bugs. Remove old ebuilds.
Michael Hanselmann [Wed, 6 Dec 2006 14:51:58 +0000 (14:51 +0000)]
Version bump. Fixes lots of bugs. Remove old ebuilds.
Package-Manager: portage-2.1.1-r2

17 years agoVersion bump. Fixes lots of bugs. Remove old ebuilds.
Michael Hanselmann [Wed, 6 Dec 2006 14:51:47 +0000 (14:51 +0000)]
Version bump. Fixes lots of bugs. Remove old ebuilds.
Package-Manager: portage-2.1.1-r2