Hans de Graaff [Sat, 6 May 2017 05:05:54 +0000 (07:05 +0200)]
dev-ruby/rspec-expectations: add 3.6.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Hans de Graaff [Sat, 6 May 2017 05:04:58 +0000 (07:04 +0200)]
dev-ruby/rspec-core: add 3.6.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Hans de Graaff [Sat, 6 May 2017 05:04:21 +0000 (07:04 +0200)]
dev-ruby/rspec: add 3.6.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Zac Medico [Sat, 6 May 2017 04:58:37 +0000 (21:58 -0700)]
dev-db/cockroach: check MERGE_TYPE in pkg_pretend
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Hans de Graaff [Sat, 6 May 2017 04:05:11 +0000 (06:05 +0200)]
dev-ruby/protected_attributes: add 1.1.4
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Michael Orlitzky [Sat, 6 May 2017 02:06:59 +0000 (22:06 -0400)]
dev-util/a8: remove unused version 0.11-r2.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Sat, 6 May 2017 02:04:27 +0000 (22:04 -0400)]
dev-util/lcov: remove unused version 1.13.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Sat, 6 May 2017 02:03:03 +0000 (22:03 -0400)]
dev-util/hxd: remove unused version 0.70.02-r1.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Sat, 6 May 2017 02:00:23 +0000 (22:00 -0400)]
dev-util/scanmem: remove unused version 0.15.2.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Daniel Campbell [Sat, 6 May 2017 01:49:16 +0000 (18:49 -0700)]
media-video/smtube: version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Michael Orlitzky [Sat, 6 May 2017 01:38:51 +0000 (21:38 -0400)]
dev-util/trinity: remove unused version 1.5 and two unused patches.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Sat, 6 May 2017 01:37:44 +0000 (21:37 -0400)]
dev-util/trinity: new version 1.7.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Daniel Campbell [Sat, 6 May 2017 01:18:17 +0000 (18:18 -0700)]
media-sound/apulse: Remove self from metadata.xml
I have switched to PA due to gaming, and can no longer test this package
at runtime.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Daniel Campbell [Sat, 6 May 2017 01:13:57 +0000 (18:13 -0700)]
media-sound/apulse: version bump wrt bug 617216
Gentoo-Bug: 617216
Gentoo-Bug-URL: https://bugs.gentoo.org/617216
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Michael Orlitzky [Sat, 6 May 2017 01:06:59 +0000 (21:06 -0400)]
dev-vcs/colorsvn: new version 0.3.3.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 23:44:23 +0000 (19:44 -0400)]
dev-lang/coffee-script: new version 1.12.5.
Gentoo-Bug: 617500
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 23:15:43 +0000 (19:15 -0400)]
dev-vcs/git-imerge: new version 1.0.0.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 22:50:47 +0000 (18:50 -0400)]
dev-vcs/git-imerge: remove unused version 0.7.0.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 22:43:03 +0000 (18:43 -0400)]
dev-vcs/gitinspector: new version 0.4.4.
New version, new EAPI, and some fixes to the install process. Some
docs were being missed, and others installed to the wrong place. All
better now.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 22:26:04 +0000 (18:26 -0400)]
dev-vcs/gitinspector: remove unused versions 0.3.1 and 0.3.2.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 22:24:08 +0000 (18:24 -0400)]
dev-vcs/gitsh: remove unused version 0.10.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Andreas Sturmlechner [Fri, 5 May 2017 21:57:40 +0000 (23:57 +0200)]
profiles: Update LO-5.3 mask
Andreas Sturmlechner [Fri, 5 May 2017 21:54:41 +0000 (23:54 +0200)]
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Andreas Sturmlechner [Fri, 5 May 2017 21:34:25 +0000 (23:34 +0200)]
app-office/libreoffice: 5.3.3.2 version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Sebastian Pipping [Fri, 5 May 2017 21:45:53 +0000 (23:45 +0200)]
dev-python/html2text: 2016.9.19
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Andreas Sturmlechner [Mon, 1 May 2017 15:17:01 +0000 (17:17 +0200)]
app-office/libreoffice: 5.2.7.2 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Ilya Tumaykin [Fri, 5 May 2017 17:09:36 +0000 (20:09 +0300)]
sparc: drop obsolete media-video/mpv entries
Closes: https://github.com/gentoo/gentoo/pull/4546
Ilya Tumaykin [Fri, 5 May 2017 17:07:14 +0000 (20:07 +0300)]
media-video/mpv: sync KEYWORDS between 9999 and 0.25.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Ilya Tumaykin [Fri, 5 May 2017 17:02:17 +0000 (20:02 +0300)]
media-video/mpv: drop unmaintained sparc keywords
Sadly, sparc team appears to be inactive and still struggling with
keyword requests dating back to 2012--2014. Some of these keyword
requests are for security vulnerabilities, e.g. bug 574786.
Rekeyword request for mpv (bug 608316) hasn't seen any action from sparc
team for 3 months. Thus dropping sparc keywords from all mpv ebuilds.
Gentoo-Bug: 608316
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Sven Wegener [Fri, 5 May 2017 19:58:25 +0000 (19:58 +0000)]
net-dns/pdns: Remove non-compatible code from init script
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Mike Frysinger [Fri, 5 May 2017 19:47:12 +0000 (15:47 -0400)]
app-admin/sysstat: fix from Chromium OS for unaligned memory errors
Markus Meier [Fri, 5 May 2017 19:43:33 +0000 (21:43 +0200)]
sys-apps/s6: add ~arm, bug #609728
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:43:28 +0000 (21:43 +0200)]
dev-lang/execline: add ~arm, bug #609728
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:43:19 +0000 (21:43 +0200)]
dev-libs/skalibs: add ~arm, bug #609728
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Michael Orlitzky [Fri, 5 May 2017 19:29:05 +0000 (15:29 -0400)]
dev-vcs/guilt: new version 0.36.
This new version comes with an update to EAPI=6 and rewrite of parts
of the ebuild. By passing some variables to emake, I was able to get
the "make install" targets to do the right thing on their own.
There's also a new HOMEPAGE, and the SRC_URI is a gitweb tarball
associated with a tag upstream.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Markus Meier [Fri, 5 May 2017 19:11:48 +0000 (21:11 +0200)]
sys-apps/hwids: arm stable, bug #615522
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:11:21 +0000 (21:11 +0200)]
app-text/hunspell: arm stable, bug #615478
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:10:51 +0000 (21:10 +0200)]
media-libs/glew: arm stable, bug #615476
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:10:24 +0000 (21:10 +0200)]
dev-lang/swig: arm stable, bug #615342
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:09:57 +0000 (21:09 +0200)]
dev-util/patchutils: arm stable, bug #615340
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:09:30 +0000 (21:09 +0200)]
dev-util/byacc: arm stable, bug #615338
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Markus Meier [Fri, 5 May 2017 19:08:58 +0000 (21:08 +0200)]
dev-perl/Carp-Clan: arm stable, bug #614208
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
Pawel Hajdan, Jr [Fri, 5 May 2017 18:26:59 +0000 (20:26 +0200)]
www-client/chromium: dev channel bump (60.0.3088.3)
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 18:18:32 +0000 (14:18 -0400)]
dev-vcs/git-sh: remove unused version 1.1.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Michael Orlitzky [Fri, 5 May 2017 18:17:58 +0000 (14:17 -0400)]
dev-vcs/git-sh: new EAPI=6 revision.
A more-or-less standard revision bump. I've removed the postinst
message about bash-completion, because the flag is no longer present
in dev-vcs/git.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manuel Rüger [Fri, 5 May 2017 15:54:34 +0000 (17:54 +0200)]
x11-drivers/xf86-input-libinput: Version bump to 0.25.1
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Mike Gilbert [Fri, 5 May 2017 15:53:44 +0000 (11:53 -0400)]
www-client/google-chrome-unstable: automated update (60.0.3088.3)
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61
Mike Gilbert [Fri, 5 May 2017 15:53:33 +0000 (11:53 -0400)]
www-plugins/chrome-binary-plugins: automated update (60.0.3088.3)
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61
Manuel Rüger [Fri, 5 May 2017 15:48:57 +0000 (17:48 +0200)]
dev-python/binaryornot: Version bump to 0.4.3
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 15:29:59 +0000 (17:29 +0200)]
app-crypt/manuale: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Tobias Klausmann [Fri, 5 May 2017 15:29:18 +0000 (17:29 +0200)]
media-video/mpv-0.25.0-r0: add ~alpha keyword
Gentoo-Bug: 608316
Manuel Rüger [Fri, 5 May 2017 15:28:17 +0000 (17:28 +0200)]
dev-java/java-config: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 15:20:20 +0000 (17:20 +0200)]
x11-libs/libxcb: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Patrice Clement [Fri, 5 May 2017 15:09:52 +0000 (17:09 +0200)]
dev-java/jsr305: version bump.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Manuel Rüger [Fri, 5 May 2017 15:05:32 +0000 (17:05 +0200)]
dev-python/pypax: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:59:33 +0000 (16:59 +0200)]
dev-python/rebulk: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:57:12 +0000 (16:57 +0200)]
dev-python/rarfile: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:56:13 +0000 (16:56 +0200)]
dev-python/httpbin: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:51:37 +0000 (16:51 +0200)]
dev-libs/libgit2-glib: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:33:32 +0000 (16:33 +0200)]
dev-python/pyicu: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:30:21 +0000 (16:30 +0200)]
www-apps/gitea: Version bump to 1.1.1
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:25:08 +0000 (16:25 +0200)]
dev-python/bsddb3: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Agostino Sarubbo [Fri, 5 May 2017 14:10:51 +0000 (16:10 +0200)]
app-editors/retext: amd64 stable wrt bug #617470
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:41 +0000 (16:10 +0200)]
net-dialup/freeradius: amd64 stable wrt bug #617468
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:28 +0000 (16:10 +0200)]
x11-misc/qt5ct: amd64 stable wrt bug #617496
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:22 +0000 (16:10 +0200)]
games-action/teeworlds: amd64 stable wrt bug #600178
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:15 +0000 (16:10 +0200)]
media-libs/glfw: amd64 stable wrt bug #617522
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:08 +0000 (16:10 +0200)]
dev-python/setuptools: amd64 stable wrt bug #617156
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:10:01 +0000 (16:10 +0200)]
dev-python/packaging: amd64 stable wrt bug #617156
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Agostino Sarubbo [Fri, 5 May 2017 14:09:55 +0000 (16:09 +0200)]
dev-python/appdirs: amd64 stable wrt bug #617156
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Manuel Rüger [Fri, 5 May 2017 14:08:56 +0000 (16:08 +0200)]
dev-python/repoze-who: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 14:04:37 +0000 (16:04 +0200)]
dev-python/pdoc: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 13:52:46 +0000 (15:52 +0200)]
sys-auth/docker_auth: Version bump to 1.2.1
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 13:49:26 +0000 (15:49 +0200)]
app-misc/ca-certificates: Removed old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 13:48:53 +0000 (15:48 +0200)]
app-misc/ca-certificates: Bump to version
20161130.3.30.2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 13:44:35 +0000 (15:44 +0200)]
games-strategy/warzone2100: Make myeconfargs local.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 13:27:06 +0000 (15:27 +0200)]
media-sound/lmms: Re-added ~x86 keyword.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 13:26:32 +0000 (15:26 +0200)]
media-libs/libsoundio: Added ~x86 keyword.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Agostino Sarubbo [Fri, 5 May 2017 13:10:41 +0000 (15:10 +0200)]
sys-kernel/vanilla-sources: Automated version bump to {4.4.66,4.9.26,4.10.14} - remove old.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Michał Górny [Fri, 5 May 2017 12:57:57 +0000 (14:57 +0200)]
xfce-extra/xfce4-dict: Bump to 0.8.0, stable GTK+3 release
Michał Górny [Fri, 5 May 2017 12:45:52 +0000 (14:45 +0200)]
xfce-base/xfdesktop: Bump to 4.13.0, development GTK+3 release
Manuel Rüger [Fri, 5 May 2017 12:47:54 +0000 (14:47 +0200)]
dev-python/readlike: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 12:47:02 +0000 (14:47 +0200)]
dev-python/diff-match-patch: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Agostino Sarubbo [Fri, 5 May 2017 12:45:56 +0000 (14:45 +0200)]
sys-devel/gcc: alpha stable wrt bug #603260
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Manuel Rüger [Fri, 5 May 2017 12:44:10 +0000 (14:44 +0200)]
dev-python/voluptuous: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 12:43:13 +0000 (14:43 +0200)]
dev-python/speaklater: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 12:41:27 +0000 (14:41 +0200)]
dev-python/oauthlib: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 12:35:27 +0000 (14:35 +0200)]
dev-python/ReParser: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manuel Rüger [Fri, 5 May 2017 12:33:01 +0000 (14:33 +0200)]
dev-python/configargparse: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Lars Wendler [Fri, 5 May 2017 12:35:26 +0000 (14:35 +0200)]
games-util/grfcodec: Bump to version 6.0.6 (bug #614996).
This also fixes the gcc-6 issue reported in bug #594146.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Jeroen Roovers [Fri, 5 May 2017 12:34:36 +0000 (14:34 +0200)]
dev-python/pypcap: Version bump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Jeroen Roovers [Fri, 5 May 2017 12:29:45 +0000 (14:29 +0200)]
x11-misc/dmenu: Version bump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Thomas Deutschmann [Fri, 5 May 2017 11:11:29 +0000 (13:11 +0200)]
app-arch/rar: Bump to v5.5.0 Beta 2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Thomas Deutschmann [Fri, 5 May 2017 10:56:17 +0000 (12:56 +0200)]
dev-libs/librdkafka: Cleanup old version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Thomas Deutschmann [Fri, 5 May 2017 10:55:44 +0000 (12:55 +0200)]
dev-libs/librdkafka: Bump to v0.9.5
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Thomas Deutschmann [Fri, 5 May 2017 10:52:25 +0000 (12:52 +0200)]
dev-libs/libfastjson: Bump to v0.99.5
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Christian Roessner [Wed, 3 May 2017 05:35:19 +0000 (07:35 +0200)]
mail-filter/rspamd: Bump to version 1.5.7
Jeroen Roovers [Fri, 5 May 2017 08:49:54 +0000 (10:49 +0200)]
x11-misc/nitrogen: Remove obsolete patch.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Chema Alonso Josa [Fri, 5 May 2017 08:04:50 +0000 (10:04 +0200)]
app-emulation/free42: Drops old version
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Hans de Graaff [Fri, 5 May 2017 05:01:19 +0000 (07:01 +0200)]
dev-ruby/mysql2: add 0.4.6
Package-Manager: Portage-2.3.5, Repoman-2.3.1