From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 22 Oct 2018 11:09:47 +0100
Subject: gentoo resync : 22.10.2018
---
app-office/Manifest.gz | Bin 9234 -> 9230 bytes
app-office/gnucash/Manifest | 5 -
.../gnucash/files/gnucash-2.7.4-double_free.patch | 12 --
...ucash-2.7.4-fix-tests-for-32bit-platforms.patch | 56 -------
app-office/gnucash/gnucash-2.7.4-r1.ebuild | 165 ---------------------
app-office/gnucash/gnucash-3.2.ebuild | 160 --------------------
app-office/libalkimia/Manifest | 4 +-
app-office/libalkimia/libalkimia-7.0.1.ebuild | 33 -----
app-office/libalkimia/libalkimia-7.0.2.ebuild | 4 +-
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/metadata.xml | 1 -
app-office/upwork/Manifest | 13 +-
app-office/upwork/files/upwork-desktop-r1.patch | 14 ++
app-office/upwork/files/upwork-desktop.patch | 13 --
app-office/upwork/metadata.xml | 4 +-
app-office/upwork/upwork-4.1.134.ebuild | 51 -------
app-office/upwork/upwork-4.2.153.ebuild | 51 -------
app-office/upwork/upwork-5.1.0.562.ebuild | 51 +++++++
18 files changed, 76 insertions(+), 563 deletions(-)
delete mode 100644 app-office/gnucash/files/gnucash-2.7.4-double_free.patch
delete mode 100644 app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
delete mode 100644 app-office/gnucash/gnucash-2.7.4-r1.ebuild
delete mode 100644 app-office/gnucash/gnucash-3.2.ebuild
delete mode 100644 app-office/libalkimia/libalkimia-7.0.1.ebuild
create mode 100644 app-office/upwork/files/upwork-desktop-r1.patch
delete mode 100644 app-office/upwork/files/upwork-desktop.patch
delete mode 100644 app-office/upwork/upwork-4.1.134.ebuild
delete mode 100644 app-office/upwork/upwork-4.2.153.ebuild
create mode 100644 app-office/upwork/upwork-5.1.0.562.ebuild
(limited to 'app-office')
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2017e68d3f5c..b38c245577dd 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 086b185f0b2d..0f107945db41 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,12 +1,7 @@
-AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
-AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
-DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
EBUILD gnucash-3.2-r2.ebuild 3959 BLAKE2B 37cdc89d7db8903b4b89332d7f9b47cef47fb29588a443b979a49d43bad5e883158a939898368afc02cae89402b25a7498a5a373c51cb8fb9c5265c7d05c15ae SHA512 97da97ae88ed1aa564ec605d5e8d24852869745521457d98e76adbb4b72a2a28025bcddad413e2f85a2d3f6c4116c40a889438428c9c5197a873e1834077235b
-EBUILD gnucash-3.2.ebuild 3888 BLAKE2B 7c7f0231e94ea7c430c2007968e70cd69c74dbb804f4b8e9858eafffc29e05ad8e2a1528b902294c75115161466ae2558e1149fc8c98a2376bf3f609e742e794 SHA512 b767881302588a21edc469ca1ed91a47a4560a756e099914c23a5907c78b1b9cd615831c3024c1c6f00a4c444b7c1c03d7417e1b9d90aa967c2196ab09d22b06
EBUILD gnucash-3.3.ebuild 3964 BLAKE2B 8143c1d294c5b5df4cf83f0901919edbd44d2a22909cb09d9bccea15247c3e15ce050a8003f6845e00cf3cb74291f32e8c26700f851407ccbd5a83a5435d862e SHA512 3779398d4db88d1a8263fa4ffa44ca399b79e43fa0d956bedac9945d33bb90f2dc1fecca88c4321bfe1b5f43702cb8e2b49cdb007aea4756a3883099416c785b
MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
deleted file mode 100644
index 9d82e72f96b3..000000000000
--- a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c
-index 5a8cd5c50..a702a56aa 100644
---- a/libgnucash/core-utils/test/test-userdata-dir.c
-+++ b/libgnucash/core-utils/test/test-userdata-dir.c
-@@ -338,7 +338,6 @@ main(int argc, char **argv)
-
- /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */
- g_free (home_dir);
-- g_free (tmp_dir);
- tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL);
- g_rmdir (tmp_dir);
- g_free (tmp_dir);
diff --git a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
deleted file mode 100644
index ec0e83a80bf5..000000000000
--- a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 22 Feb 2018 12:27:36 +0100
-Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot
- be representated
-
-Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit
-platforms because the earliest timestamp which can be representated on a
-32-bit platform is "1901-12-13 20:45:52" but the test ranges start before
-that date.
-
-To be safe, this commit will add code to skip tests before year 1902 on
-32-bit platforms.
-
-Bug: https://bugs.gentoo.org/647596
----
- libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
-index 5c46b2618..298220f6e 100644
---- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
-+++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
-@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
- }
- else if (year < 1916)
- #else
-+ if (year < 1902)
-+ {
-+ // Earliest timestamp which can be represented on a 32-bit
-+ // system is "1901-12-13 20:45:52" -- so skip tests until we
-+ // reach a year >1901 to be safe
-+ continue;
-+ }
-+
- if (year < 1916)
- #endif
- {
-@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
- }
- else if (year < 1924)
- #else
-+ if (year < 1902)
-+ {
-+ // Earliest timestamp which can be represented on a 32-bit
-+ // system is "1901-12-13 20:45:52" -- so skip tests until we
-+ // reach a year >1901 to be safe
-+ continue;
-+ }
-+
- if (year < 1924)
- #endif
- {
---
-2.16.2
-
diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
deleted file mode 100644
index 770723b97a17..000000000000
--- a/app-office/gnucash/gnucash-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-# Add doc back in for 3.0 and bump app-doc/gnucash-docs
-IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres
- python quotes -register2 sqlite"
-REQUIRED_USE="
- chipcard? ( aqbanking )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/libxml2-2.7.0:2
- >=dev-scheme/guile-2.0.0:12=[regex]
- >=sys-libs/zlib-1.1.4
- >=x11-libs/gtk+-3.14.0:3
- dev-libs/boost:=[icu,nls]
- dev-libs/icu:=
- dev-libs/libxslt
- gnome-base/dconf
- net-libs/webkit-gtk:4=
- aqbanking? (
- >=net-libs/aqbanking-5[gtk,ofx?]
- sys-libs/gwenhywfar[gtk]
- chipcard? ( sys-libs/libchipcard )
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- mysql? (
- dev-db/libdbi
- dev-db/libdbi-drivers[mysql]
- )
- ofx? ( >=dev-libs/libofx-0.9.1 )
- postgres? (
- dev-db/libdbi
- dev-db/libdbi-drivers[postgres]
- )
- python? ( ${PYTHON_DEPS} )
- quotes? (
- >=dev-perl/Finance-Quote-1.11
- dev-perl/Date-Manip
- dev-perl/HTML-TableExtract
- )
- sqlite? (
- >=dev-db/libdbi-0.9.0
- >=dev-db/libdbi-drivers-0.9.0[sqlite]
- )
-"
-
-DEPEND="${RDEPEND}
- ~dev-cpp/gtest-${GV}
- dev-lang/perl
- dev-perl/XML-Parser
- dev-util/intltool
- gnome-base/gnome-common
- sys-devel/libtool
- virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# ~app-doc/gnucash-docs-${PV}
-# gnome-extra/yelp
-# )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-double_free.patch
- "${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- xdg_environment_reset
-}
-
-src_configure() {
- local sql_on_off="OFF"
- if use mysql || use postgres || use sqlite ; then
- sql_on_off="ON"
- fi
-
- local mycmakeargs=(
- -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
- -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
- -DDISABLE_NLS=$(usex !nls)
- -DENABLE_REGISTER2=$(usex register2)
- -DWITH_AQBANKING=$(usex aqbanking)
- -DWITH_OFX=$(usex ofx)
- -DWITH_PYTHON=$(usex python)
- -DWITH_SQL=${sql_on_off}
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- if use python ; then
- cp common/test-core/unittest_support.py \
- "${BUILD_DIR}"/common/test-core/ || die
- fi
-
- cd "${BUILD_DIR}" || die
- XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
- rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
- if use examples ; then
- mv "${ED%/}"/usr/share/doc/gnucash \
- "${ED%/}"/usr/share/doc/${PF}/examples || die
- pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
- rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
- *win32-bin.txt || die
- popd > /dev/null || die
- docompress -x /usr/share/doc/${PF}/examples/
- else
- rm -r "${ED%/}"/usr/share/doc/gnucash || die
- fi
-
- use aqbanking && dodoc doc/README.HBCI
- use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
- ewarn
- ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
- ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.2.ebuild b/app-office/gnucash/gnucash-3.2.ebuild
deleted file mode 100644
index 7d93329d0017..000000000000
--- a/app-office/gnucash/gnucash-3.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
- https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
- python quotes -register2 sqlite"
-REQUIRED_USE="
- chipcard? ( aqbanking )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/libxml2-2.7.0:2
- >=dev-scheme/guile-2.0.0:12=[regex]
- >=sys-libs/zlib-1.1.4
- >=x11-libs/gtk+-3.14.0:3
- dev-libs/boost:=[icu,nls]
- dev-libs/icu:=
- dev-libs/libxslt
- gnome-base/dconf
- net-libs/webkit-gtk:4=
- aqbanking? (
- >=net-libs/aqbanking-5[gtk,ofx?]
- sys-libs/gwenhywfar[gtk]
- chipcard? ( sys-libs/libchipcard )
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- mysql? (
- dev-db/libdbi
- dev-db/libdbi-drivers[mysql]
- )
- ofx? ( >=dev-libs/libofx-0.9.1 )
- postgres? (
- dev-db/libdbi
- dev-db/libdbi-drivers[postgres]
- )
- python? ( ${PYTHON_DEPS} )
- quotes? (
- >=dev-perl/Finance-Quote-1.11
- dev-perl/Date-Manip
- dev-perl/HTML-TableExtract
- )
- sqlite? (
- >=dev-db/libdbi-0.9.0
- >=dev-db/libdbi-drivers-0.9.0[sqlite]
- )
-"
-
-DEPEND="${RDEPEND}
- ~dev-cpp/gtest-${GV}
- >=sys-devel/gettext-0.19.6
- dev-lang/perl
- dev-perl/XML-Parser
- gnome-base/gnome-common
- sys-devel/libtool
- virtual/pkgconfig
-"
-
-PDEPEND="doc? (
- ~app-doc/gnucash-docs-${PV}
- gnome-extra/yelp
-)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- xdg_environment_reset
-}
-
-src_configure() {
- local sql_on_off="OFF"
- if use mysql || use postgres || use sqlite ; then
- sql_on_off="ON"
- fi
-
- local mycmakeargs=(
- -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
- -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
- -DDISABLE_NLS=$(usex !nls)
- -DENABLE_REGISTER2=$(usex register2)
- -DWITH_AQBANKING=$(usex aqbanking)
- -DWITH_OFX=$(usex ofx)
- -DWITH_PYTHON=$(usex python)
- -DWITH_SQL=${sql_on_off}
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- if use python ; then
- cp common/test-core/unittest_support.py \
- "${BUILD_DIR}"/common/test-core/ || die
- fi
-
- cd "${BUILD_DIR}" || die
- XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
- rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
- if use examples ; then
- mv "${ED%/}"/usr/share/doc/gnucash \
- "${ED%/}"/usr/share/doc/${PF}/examples || die
- pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
- rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
- *win32-bin.txt || die
- popd > /dev/null || die
- docompress -x /usr/share/doc/${PF}/examples/
- else
- rm -r "${ED%/}"/usr/share/doc/gnucash || die
- fi
-
- use aqbanking && dodoc doc/README.HBCI
- use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
- ewarn
- ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
- ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 558fdb697329..6e9943210a67 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,5 +1,3 @@
-DIST alkimia-7.0.1.tar.xz 38400 BLAKE2B c6dccf0702ae42bfcebfa20fc34233766ab4b08c81d7b8aa8af2be2003560f2e088e922a0ec5656c6f8e34d3f3a8348fb6315c3e5aecf72cda9fa2506e1a2161 SHA512 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
-EBUILD libalkimia-7.0.1.ebuild 716 BLAKE2B 1ed3a062482699441aca649c0907f5dbf836c66da3abf9a5fc710abd337683584112d546743932cadd3a8bb8f8bbb2a6048f9411370cb3b5a740a730c209110d SHA512 746880e0244af2c01c48759f53d0c81d4949a3faa9e9f5a5c47414746b6647af67f845eef5c40ab0f2c2676a31cae3fd6566dbd944bf318f7964e4afe064ecad
-EBUILD libalkimia-7.0.2.ebuild 762 BLAKE2B 2514096dcc7194868ee36bf13855578818279409248f19bad854f0ed443b52bb6819e08fb411940e17070973ad304b49ecb32e3bcc77c05486454595f9a4a751 SHA512 9e4f3b42a72e187c377ebe3f54009949e660a3bf68edb617fc07c4f0b13ba99c8181fc8e0f5e8d7b88af71de927745a71d4c9cef1acd6c62e5690c7dc6adeacf
+EBUILD libalkimia-7.0.2.ebuild 757 BLAKE2B 975665d1032105de21e1aa7d202234780b85f1e7c8e7fcdca1a55e28b8a500aa72585b1a1acc2fefff867426794d8e5eb3d58c0d41377a0fc6dea04ff83b265a SHA512 acf7cf9c0a56bb0ad937c9b0eff491cc16b3cd0b537bdff9b4f926ade4781b16009dc3d1bb90cebcef7dc82f395f2a556179d4d2774832f7a8cfa1f9b7af4cea
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-7.0.1.ebuild b/app-office/libalkimia/libalkimia-7.0.1.ebuild
deleted file mode 100644
index 410a813b42f5..000000000000
--- a/app-office/libalkimia/libalkimia-7.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-KMNAME="alkimia"
-inherit kde5
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
-SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
- $(add_qt_dep qtdbus)
- dev-libs/gmp:0=[cxx]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package doc Doxygen)
- )
- kde5_src_configure
-}
diff --git a/app-office/libalkimia/libalkimia-7.0.2.ebuild b/app-office/libalkimia/libalkimia-7.0.2.ebuild
index 6ddc34c445af..8c969cac92fa 100644
--- a/app-office/libalkimia/libalkimia-7.0.2.ebuild
+++ b/app-office/libalkimia/libalkimia-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/${KMNAME}-${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 270d000641e0..14129a90d155 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,4 +18,4 @@ EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507
EBUILD libreoffice-6.1.2.1.ebuild 16618 BLAKE2B 441609812a0aa894cbfef928847a2c835980ae70c549753cdaa143ca1bd6a72c31c500c7b1c3fdaec9bcb20a734d7d8732bab7195dd783f09b15b3e28371aca2 SHA512 a15b2d9b9ca06dca72ca99223b4e461acbd9f97253fff9679b51b40b63cfb141d683710858e6300bfe5e4dd40771bc2e58addf028cc03278b6ad2caa517c5eac
EBUILD libreoffice-6.1.9999.ebuild 16618 BLAKE2B 441609812a0aa894cbfef928847a2c835980ae70c549753cdaa143ca1bd6a72c31c500c7b1c3fdaec9bcb20a734d7d8732bab7195dd783f09b15b3e28371aca2 SHA512 a15b2d9b9ca06dca72ca99223b4e461acbd9f97253fff9679b51b40b63cfb141d683710858e6300bfe5e4dd40771bc2e58addf028cc03278b6ad2caa517c5eac
EBUILD libreoffice-9999.ebuild 16709 BLAKE2B 592d80e1376f0c90eb5ec8f8f38f7b25cfead38ae0f43750827b2770ee83d8b7bd7aee80758c55f373ada92b23831f404491aa4252449bb0ce05bc49b16ee713 SHA512 26c2071c5c1ce237032180ede3b8e9d7fa917115dab418d7e7b1726b169f381b93dbd10633923c1036ac4cbc2e909623c8535598ed22394404a105ffe5f2a025
-MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2
+MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index b63d524dac8d..103556859a03 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,6 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="gtk2">Enable legacy gtk2 frontend</flag>
- <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 3a82f1888cc4..aab1aca23760 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,8 +1,5 @@
-AUX upwork-desktop.patch 399 BLAKE2B a1b6f4e55eecf2d2d604ed76efcecc5dd4d58abb2d9958041761cbc6c7728ded1c4f0636c67a2d2d1b60641f0c5ddb5e6e5a2dd6de01570f5196b683a3df10cc SHA512 76386929bf4327b050149e00127876221091db36dc2daa4d2d2f2b71a52cbf6171c6912b70640f5342554c1fec840a192bf51ac7334954143a9bcec8ce6cbaef
-DIST upwork-4.1.134_i386.rpm 34420908 BLAKE2B a1a3e76e44faa26852f67bf65d2040a2e53056f54dca7075dd6126f657837f0ad640ce804995ca5c78f385c92b92cc8df81d895c51781bbad1bdde1209ae8e0b SHA512 68190c4aa26df36857311b5944d2cdc15930ff248d8a4c841785451c1a48bb15ad1bf7bdd586d109994de70cef493a98a198b68bd785df2e8b88e45b85a25f23
-DIST upwork-4.1.134_x86_64.rpm 34025281 BLAKE2B 659eec23d72c838c7725a88efb773825395c520814665bd592903a9e764ebe4723cf4548ce4fe4c6b2109fef2018694a9ad620fee620a4f81808353ddb5582c4 SHA512 65ef2e6552e34b50f24102c6227267a07881955bdf6b41571374167f844e07a0be6ee752c9fe3ff2b4280b58895ddeda86d0ba4aaa229bc12ff378ac5b6f730a
-DIST upwork-4.2.153_i386.rpm 45812396 BLAKE2B 1f71ae1e984fa8ce29a37674aae7491aa42fb821ea3dd71c3947ebb7db76da51b3b7567301ab6952d47a873c242c52abe6cd976ff324287104b8ff58eba10a16 SHA512 8117e98dc72b64e094bc73c249d040c96cd04e974182db575dfdcd40bd93e09ecda9f0619953b41b71cb0d6f286cd355df41ae68be3787aa7b507195a15104d3
-DIST upwork-4.2.153_x86_64.rpm 44008199 BLAKE2B 95ee207f66e4a9c6a82c6a98f90b26254e10fb01a858817f206a5fbc114ac551568010cb3f88bab9dae744b62c3e56ef91996e6d49dbc163652d0f5ead6818bd SHA512 4defc588a32462d825da0e95847bf6739b6f66d3095016dd9d3b7e502a470f086c13edfe36f6511f2961e91ec8b96a0e4eac4682409e0761a3d6abbb3db172d4
-EBUILD upwork-4.1.134.ebuild 1198 BLAKE2B f099693afe3260a33de64763fef99d076a463b17e6f672d5cf04d5d006871837fa0522461f553593416d265dc2204961d1d6c87c485ca2fa4b46d55d8ccd23fd SHA512 a988c40a156cc95c4bc9a76979006384ad592ec887afb1946a25bf462345791e08240e08bbb4bfe8a560467663e5ce031f8e5c45b5fceb11bc64347191a27d63
-EBUILD upwork-4.2.153.ebuild 1210 BLAKE2B 3c8285769ee3eb7ca4e7b6f10cffc217775ebe5f47a0a30975bb3ac020e955293714de8a9c2813c52a41ebc0179ce69ab9d2c5c0d2b8ab421b9431a09fab9fa9 SHA512 42575acfc5605e6ac446a3ed554de5ff89809b0861238407a154df10f11aa12559e71bd815b0a617824d85ca8cc8113ba41d0b054a11bf54813c1206ec11c7d8
-MISC metadata.xml 600 BLAKE2B 82f9d59c6892afb1d7886135972cbbea63b1a7738a919360b5fa00a535fb87854c4ca4b1f0a16ca833bc0a9662031535878258c7ee4518cba3cc6376e3a612fc SHA512 3312eb3a1051c2f7892e851235b728e1bbbe30918788f81e756ed1373ab98b027bbce8837e8b1965708003d161fe355295fff089f8294e27528e8688c8dd859a
+AUX upwork-desktop-r1.patch 480 BLAKE2B a296b0c5274adf65e3c1f1e65a30dea48d147632b1afc39e4688e4b0d23a4735c957ce4d451f040d34ae2996670350bf467bc87008e5814a3c5e9bfc5e717398 SHA512 dce08bf79e672c07fa8c11e00b68e5b4bd2176a606a1192fd6a0dbf9343e99c2aa70909506d71b35b04a3eaf6be0a61f62e65f6a3802a0e17967bfe4dbbd4aef
+DIST upwork-5.1.0.562_i386.rpm 51520094 BLAKE2B 00ae85aa45cd4c39d7c3dc89db9f490741ffb1b291df4c1cebbf2f4d0510bbe38696f65b2022a1b7881f93a3f882f9fd0947a4cbd186debf81255275ab60ce75 SHA512 37b93e61c69f2ec0c350e968fa9e0fd88ef5d9de252f24f1187574625a763a3b3e2ffeeded01bb415006d3b3426b29385d2b31c28a11044e46df0c21c6f334e0
+DIST upwork-5.1.0.562_x86_64.rpm 50518342 BLAKE2B cbb35b6cbf45393b6b6b9c91923f502fba9eb9edd9674b455ba3bbe3ac99c9d54fb35b0c6e13013728e1f2358c8bc9a8f2fc07faa30577df4ddac4c1d639145d SHA512 2f21e0a0756d669512260237bfd28c1cdb8bdb53846411340f574ef6c9c04ba8c8abd36e1197547eb7339cc17aa51dd1d2ccbfdd3fc66eacc7e3c83125391c38
+EBUILD upwork-5.1.0.562.ebuild 1227 BLAKE2B 2bcace55fbea9b468b82324bc3822ada0bb3c86b1db170b6e6934fd732f71a6fe39d5fe2a430c4ca5b4e6c29e1540067a4845a93a26f455cc02c5f0d5c5cbc24 SHA512 56609bc83e0876b2e39f99e44d531db0a25f4a101e31d530b747b2cd70219a72cb84d08d8a647918f69575c3bfd6532d2ae90654b92bebb0cdcf6f36d4c0b335
+MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
diff --git a/app-office/upwork/files/upwork-desktop-r1.patch b/app-office/upwork/files/upwork-desktop-r1.patch
new file mode 100644
index 000000000000..cffc1bb92e97
--- /dev/null
+++ b/app-office/upwork/files/upwork-desktop-r1.patch
@@ -0,0 +1,14 @@
+diff -ur a/usr/share/applications/upwork.desktop b/usr/share/applications/upwork.desktop
+--- a/usr/share/applications/upwork.desktop 2018-07-04 16:38:55.000000000 +0200
++++ b/usr/share/applications/upwork.desktop 2018-09-25 15:06:27.021679329 +0200
+@@ -2,8 +2,8 @@
+ Encoding=UTF-8
+ Name=Upwork
+ Exec=upwork
+-Icon=upwork.png
++Icon=upwork
+ Terminal=false
+ Type=Application
+-Categories=GTK;Network;Project Management
++Categories=GTK;Network;X-Project Management
+ StartupNotify=false
diff --git a/app-office/upwork/files/upwork-desktop.patch b/app-office/upwork/files/upwork-desktop.patch
deleted file mode 100644
index a7b76f815b00..000000000000
--- a/app-office/upwork/files/upwork-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/share/applications/upwork.desktop 2015-05-15 10:58:10.166313615 -0400
-+++ b/usr/share/applications/upwork.desktop 2015-05-15 10:58:29.929383130 -0400
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- Name=Upwork
- Exec=upwork
--Icon=upwork.png
-+Icon=upwork
- Terminal=false
- Type=Application
--Categories=Development;Project Management;GTK
-+Categories=Development;X-Project Management;GTK;
- StartupNotify=true
diff --git a/app-office/upwork/metadata.xml b/app-office/upwork/metadata.xml
index 6df5fcb9e08d..33ffa3148d10 100644
--- a/app-office/upwork/metadata.xml
+++ b/app-office/upwork/metadata.xml
@@ -7,10 +7,10 @@
</maintainer>
<maintainer type="person">
<email>stefantalpalaru@yahoo.com</email>
- <name>Stefan Talpalaru</name>
+ <name>Ștefan Talpalaru</name>
</maintainer>
<longdescription lang="en">
- upwork's desktop application enabling visibility, connectivity,
+ Upwork's desktop application enabling visibility, connectivity,
collaboration and guaranteed payment for guaranteed work.
</longdescription>
</pkgmetadata>
diff --git a/app-office/upwork/upwork-4.1.134.ebuild b/app-office/upwork/upwork-4.1.134.ebuild
deleted file mode 100644
index 2827201a56b9..000000000000
--- a/app-office/upwork/upwork-4.1.134.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm eutils pax-utils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
- amd64? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
- x86? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND="
- dev-libs/libgcrypt:11
- gnome-base/gconf
- media-libs/alsa-lib
- sys-libs/libcap
- virtual/udev
- x11-libs/gtk+:2
- x11-libs/gtkglext
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-desktop.patch"
-}
-
-src_install() {
- # Wrapper to the real executable
- dobin usr/bin/upwork
-
- insinto /usr/share
- pax-mark m usr/share/upwork/upwork
- doins -r usr/share/upwork
- dosym /usr/lib/libudev.so /usr/share/upwork/libudev.so.0
-
- # Make this executable because it's the real executable
- fperms 0755 /usr/share/upwork/upwork
-
- domenu usr/share/applications/upwork.desktop
- doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-4.2.153.ebuild b/app-office/upwork/upwork-4.2.153.ebuild
deleted file mode 100644
index cdc73b3508dc..000000000000
--- a/app-office/upwork/upwork-4.2.153.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm eutils pax-utils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
- amd64? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
- x86? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
- dev-libs/libgcrypt:11
- gnome-base/gconf
- media-libs/alsa-lib
- net-print/cups
- sys-libs/libcap
- x11-libs/gtk+:2
- x11-libs/gtkglext
-"
-
-PATCHES=( "${FILESDIR}/${PN}-desktop.patch" )
-
-src_install() {
- pax-mark m usr/share/upwork/upwork
-
- dobin usr/bin/upwork
-
- patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
- dolib usr/share/upwork/libcef.so
- rm usr/share/upwork/libcef.so
-
- insinto /usr/share
- doins -r usr/share/upwork
- fperms 0755 /usr/share/upwork/upwork
-
- domenu usr/share/applications/upwork.desktop
- doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.1.0.562.ebuild b/app-office/upwork/upwork-5.1.0.562.ebuild
new file mode 100644
index 000000000000..27e39f4e7bca
--- /dev/null
+++ b/app-office/upwork/upwork-5.1.0.562.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eutils pax-utils
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="
+ amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+ x86? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.i386.rpm -> ${P}_i386.rpm )
+"
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}/${PN}-desktop-r1.patch" )
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+ dev-libs/expat
+ dev-libs/nspr
+ dev-libs/nss
+ gnome-base/gconf
+ media-libs/alsa-lib
+ media-libs/freetype
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/gtk+:2[cups]
+ x11-libs/gtkglext
+"
+
+src_install() {
+ pax-mark m usr/share/upwork/upwork
+
+ dobin usr/bin/upwork
+
+ patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
+
+ insinto /usr/share
+ doins -r usr/share/upwork
+ fperms 0755 /usr/share/upwork/upwork
+
+ domenu usr/share/applications/upwork.desktop
+ doicon usr/share/pixmaps/upwork.png
+}
--
cgit v1.2.3