[gentoo-commits] repo/gentoo:master commit in: dev-python/python-json-logger/
commit: 377d8b519542bc5ce691b33f8df38a2199b1bb23
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 07:13:34 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377d8b51
dev-python/python-json-logger: Bump to 2.0.6
Signed-off-by: Michał Górny gentoo.org>
dev-python/python-json-logger/Manifest | 1 +
.../python-json-logger-2.0.6.ebuild| 22 ++
2 files changed, 23 insertions(+)
diff --git a/dev-python/python-json-logger/Manifest
b/dev-python/python-json-logger/Manifest
index 6f8c9640d3f0..dee4d2cb7d6f 100644
--- a/dev-python/python-json-logger/Manifest
+++ b/dev-python/python-json-logger/Manifest
@@ -1 +1,2 @@
DIST python-json-logger-2.0.5.tar.gz 10224 BLAKE2B
3254b5240d6ece2cd267d82bde242bfbc28845bf6ad255a2be8bbc1b46cc5d04cba47c3f40f87b401c43e8bf26993210740c4e5aea8b4b737526d69a9dc789c7
SHA512
b9f768df8760c6f3660eb5036c8873bc1075fdca2d622b137af6a385e44e56e69a132df19472cba47dfb81d6699369822d83fdb85ad089ee3cc3a9b7fe428e6d
+DIST python-json-logger-2.0.6.tar.gz 10369 BLAKE2B
c33766ea303c8210670865ff6e38ceca536f8af3c4eec0d981ffc46328bb832db4c84ab4fbbf1dc970cef1f844fb461fcb364d7fe12e261f701ffda2ff6d600a
SHA512
0a4625f1f1aeff62f60bd48bcd695bce5bfb94aa907b41b2f20116fa8f63b84127486796539876c9d5392130c837c59c66b364e1b19225d0bd49899e8efe6b6b
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.6.ebuild
b/dev-python/python-json-logger/python-json-logger-2.0.6.ebuild
new file mode 100644
index ..3cf33e8f9d0d
--- /dev/null
+++ b/dev-python/python-json-logger/python-json-logger-2.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Standard python logging to output log data as json objects"
+HOMEPAGE="
+ https://github.com/madzak/python-json-logger/
+ https://pypi.org/project/python-json-logger/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests unittest
[gentoo-commits] repo/gentoo:master commit in: dev-python/pygame/
commit: 6fe0e4ca8ba67a27f18179f85d29190586e1c720
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 06:41:45 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe0e4ca
dev-python/pygame: Bump to 2.1.3
Signed-off-by: Michał Górny gentoo.org>
dev-python/pygame/Manifest| 1 +
dev-python/pygame/pygame-2.1.3.ebuild | 91 +++
2 files changed, 92 insertions(+)
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index fa5cbe30c92f..afb51634a1d4 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1 +1,2 @@
DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B
4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34
SHA512
531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
+DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B
9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9
SHA512
28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild
b/dev-python/pygame/pygame-2.1.3.ebuild
new file mode 100644
index ..855f68683bbc
--- /dev/null
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+ https://www.pygame.org/
+ https://github.com/pygame/pygame/
+ https://pypi.org/project/pygame/
+"
+SRC_URI="
+ https://github.com/pygame/pygame/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/freetype
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/portmidi
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+ X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+ !X? ( media-libs/libsdl2[threads] )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+ media-libs/sdl2-mixer[mp3,vorbis,wav]
+ )
+"
+# fontconfig used for fc-list
+RDEPEND+="
+ media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+ dev-python/cython[${PYTHON_USEDEP}]
+ test? (
+ media-libs/fontconfig
+ sys-apps/util-linux
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/pygame-2.1.2-libsdl2-2.26-tests.patch
+)
+
+python_configure() {
+ PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+ "${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+ find src_c/cython -name '*.pyx' -exec touch {} + || die
+ "${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+ local -x PYTHONPATH=${BUILD_DIR}/install/lib
+ local -x SDL_VIDEODRIVER=dummy
+ local -x SDL_AUDIODRIVER=disk
+ script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Bug #497720
+ rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ use examples && dodoc -r examples
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/werkzeug/
commit: 294d6a5aa82aecde3cf5e79cf64b29ce6c3824b0
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 06:51:31 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=294d6a5a
dev-python/werkzeug: Bump to 2.2.3
Signed-off-by: Michał Górny gentoo.org>
dev-python/werkzeug/Manifest | 1 +
dev-python/werkzeug/werkzeug-2.2.3.ebuild | 64 +++
2 files changed, 65 insertions(+)
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 7e9551fb2a90..5144e4372843 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1 +1,2 @@
DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B
84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935
SHA512
cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
+DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B
7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4
SHA512
3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482
diff --git a/dev-python/werkzeug/werkzeug-2.2.3.ebuild
b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
new file mode 100644
index ..a9d4ea56708e
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+ https://palletsprojects.com/p/werkzeug/
+ https://pypi.org/project/Werkzeug/
+ https://github.com/pallets/werkzeug/
+"
+SRC_URI="
+ https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+"
+# NOTE: remove the loong mask after greenlet gains support for loong
+# see https://github.com/python-greenlet/greenlet/pull/257
+BDEPEND="
+ test? (
+ dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+ dev-python/watchdog[${PYTHON_USEDEP}]
+ test-rust? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ )
+ !hppa? ( !ia64? ( !loong? (
+ $(python_gen_cond_dep '
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ ' python3_{8..10})
+ ) ) )
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=()
+ if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+ EPYTEST_DESELECT+=(
+ "tests/test_serving.py::test_server[https]"
+ tests/test_serving.py::test_ssl_dev_cert
+ tests/test_serving.py::test_ssl_object
+ )
+ fi
+
+ # the default portage tempdir is too long for AF_UNIX sockets
+ local -x TMPDIR=/tmp
+ epytest -p no:django -p no:httpbin tests
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/google-api-python-client/
commit: c301ba6b9dc54a4061a63f9d657b9f923cbe3dfa
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 06:25:24 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c301ba6b
dev-python/google-api-python-client: Bump to 2.78.0
Signed-off-by: Michał Górny gentoo.org>
dev-python/google-api-python-client/Manifest | 1 +
.../google-api-python-client-2.78.0.ebuild | 52 ++
2 files changed, 53 insertions(+)
diff --git a/dev-python/google-api-python-client/Manifest
b/dev-python/google-api-python-client/Manifest
index 993b8073f214..1505790e943f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
DIST google-api-python-client-2.74.0.gh.tar.gz 38189426 BLAKE2B
927345937faf574263df8a8c64949824bf371b5b881958b9d0e055ad8ee9bf5c758e173afa47274c6c1d10ebdd0c168f7d7763c8d66f664dc80bf253a391fb26
SHA512
831159d4a3c46b716ff1be64c13cbf37eebb96a75e3573bd8b1200930d465935569ceeb4caaa35bc24105087db06fa62306ef03ed4fb04c87b5d24826680b949
DIST google-api-python-client-2.76.0.gh.tar.gz 38245213 BLAKE2B
28d7ea8fb169b08cfc689b2957de84e1f860fb2857f4cf85e40bcdbe8c728e6179194d5dfe65103d1ed17a604d880011b2a82b4e555dc6ed6e9e73737fc5e8bc
SHA512
01f1245b8a64cf5adae42b941b88eb05db4a21db4e16b35f98a077c223e795538b654f348f4b0a7bfde8e8928c3c57cd841dca41755a57ee0a6965b89f58cdf9
DIST google-api-python-client-2.77.0.gh.tar.gz 38300787 BLAKE2B
c7d147b9ae78fff5aa70b2ba219888296d414c1f7b498c93bb424d06c437a50d5a1a2284062e58defb29ba3aa89b225e4218d9acd303a0e17f3ec4ab0380a2f6
SHA512
24aa2b3d709de83b76be2d8030a419d0e3f8f447852d7f95c6cf735134270a7af94edd86bcc3d82cd25af2497f30ac6c365ac88494c227b19faecb8e3706c261
+DIST google-api-python-client-2.78.0.gh.tar.gz 38327369 BLAKE2B
291941a44a6fc9da7df2cbb108ba90babac33916f9c36aeae6e8b1575e9851f7c93aaea09340d36acd8f80dbe5ebe63820d60edc0aec14ee4859a47dcf66e344
SHA512
fff05aa981106aaccb689aeeace62734df77fefe7132481a11bc81b249a7793c1743c7c7c21116b3f5d4d59230ec7adac090d478969f8847bc201a2a23dd072d
diff --git
a/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild
b/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild
new file mode 100644
index ..7f5368fd7fde
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+ https://github.com/googleapis/google-api-python-client/
+ https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+
https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+ =dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: dev-python/simber/
commit: 3ab76aa2eb6909c263082c758e6047a58b9c44ac
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 06:36:41 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab76aa2
dev-python/simber: Remove stale sed
Signed-off-by: Michał Górny gentoo.org>
dev-python/simber/simber-0.2.6.ebuild | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-python/simber/simber-0.2.6.ebuild
b/dev-python/simber/simber-0.2.6.ebuild
index dddba9b13604..8688468dfe1b 100644
--- a/dev-python/simber/simber-0.2.6.ebuild
+++ b/dev-python/simber/simber-0.2.6.ebuild
@@ -9,20 +9,22 @@ PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
DESCRIPTION="Simple, minimal and powerful logging library for Python"
-HOMEPAGE="https://simber.deepjyoti30.dev/";
-SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz"
+HOMEPAGE="
+ https://simber.deepjyoti30.dev/
+ https://github.com/deepjyoti30/simber/
+ https://pypi.org/project/simber/
+"
+SRC_URI="
+ https://github.com/deepjyoti30/simber/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+"
distutils_enable_tests pytest
-
-src_prepare() {
- sed -i '/ *python_requires/s|.*||' setup.py || die # bug #893620
-
- distutils-r1_src_prepare
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-json-logger/
commit: 089c9a3b1214165a610bed5239ba3474487b6d82
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 07:13:11 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089c9a3b
dev-python/python-json-logger: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/python-json-logger/Manifest | 1 -
.../python-json-logger-2.0.4.ebuild| 22 --
2 files changed, 23 deletions(-)
diff --git a/dev-python/python-json-logger/Manifest
b/dev-python/python-json-logger/Manifest
index b99f9e57cad7..6f8c9640d3f0 100644
--- a/dev-python/python-json-logger/Manifest
+++ b/dev-python/python-json-logger/Manifest
@@ -1,2 +1 @@
-DIST python-json-logger-2.0.4.tar.gz 9856 BLAKE2B
013dadb37044eb89976ab98309bbafaa348c0bfd82a75f7645d580212fb85ee2cb2bc70d455aec9da3424e89d5905d8e80a77d8c08d46443a8ee5ee9bebc3cdf
SHA512
5849e3780f9a4cb59baff2c73d872ca11c916af14337bada2de3620d5a5e9b138b7bd76a1a25001c4733c0074469bb579808a57d50f964f0fe0e4bf3a4bb1216
DIST python-json-logger-2.0.5.tar.gz 10224 BLAKE2B
3254b5240d6ece2cd267d82bde242bfbc28845bf6ad255a2be8bbc1b46cc5d04cba47c3f40f87b401c43e8bf26993210740c4e5aea8b4b737526d69a9dc789c7
SHA512
b9f768df8760c6f3660eb5036c8873bc1075fdca2d622b137af6a385e44e56e69a132df19472cba47dfb81d6699369822d83fdb85ad089ee3cc3a9b7fe428e6d
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
b/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
deleted file mode 100644
index a9e61666c3dc..
--- a/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Standard python logging to output log data as json objects"
-HOMEPAGE="
- https://github.com/madzak/python-json-logger
- https://pypi.org/project/python-json-logger/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests unittest
[gentoo-commits] repo/gentoo:master commit in: dev-python/fakeredis/
commit: 2c207111a22d06776d943d69c3e0ecfc2b83f8db
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 07:14:45 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:16:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c207111
dev-python/fakeredis: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/fakeredis/Manifest | 3 -
dev-python/fakeredis/fakeredis-2.5.0.ebuild | 88 -
dev-python/fakeredis/fakeredis-2.7.0.ebuild | 88 -
dev-python/fakeredis/fakeredis-2.7.1.ebuild | 88 -
4 files changed, 267 deletions(-)
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index f20c73ac4de6..b561f8a58cd0 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,6 +1,3 @@
DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B
fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3
SHA512
5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
-DIST fakeredis-py-2.5.0.gh.tar.gz 139911 BLAKE2B
4e9c616b0066012e1ed681d06e73390fb670969c15fa57689244147a0175dbb14ff1c312066ffdc6eb2c647f884c351a98eebfb2c1ba0e6c1bbe1e6c3553808a
SHA512
aff5a8679763d4cf1717f790c7c384aa8e5056e5f175c306626f3a1671fe27aa3caf24368831033c9cf5bffa2e3e6be1104b183f3912eadf34fd6f37ea0c63e8
DIST fakeredis-py-2.6.0.gh.tar.gz 151925 BLAKE2B
60538efa5de93436177aa019908f02affb9df9b2aaf1349e933da6f066f98aaa255bbdb3297645ad1dc3b67a57a61bb8081e476f451799b512719f5779c1218d
SHA512
19a23be7a182f962e66686f3c4ec3a5b9fbc847d97e48f19fde11ae268f4a70de567ff2ca302a9fe0e7080de2215698cf5b2ff2febda5eef6748f3ec8d601720
-DIST fakeredis-py-2.7.0.gh.tar.gz 162784 BLAKE2B
acb218c375785ad4b8419f08f9c328f33f97eedb0f13ae09b760b6c87849b3f8a4b9210fe6aea59d763b27909bff8297a009757a1f5fd9b58c1936e6705e0833
SHA512
fc11f3b59971ae50f59e9d1684827a8f4d1127813f7d55641b43b1edbb1e4c75c76aa0734ad55c98cca404c7e343a02f72644f05aceb72849ef6f18dc2418890
-DIST fakeredis-py-2.7.1.gh.tar.gz 162831 BLAKE2B
dec29c4b2f5e2c4f9492af00f7b6758ab18dba48ab92e382c78fa105a8bd6230cffc583876a203213d5e205c8cea5b0680518a48e74b7014b189e3b8f3ad3a65
SHA512
31a51feaaba208f4029e7c2030785f5c2fa670996d42ccde8f9e98f13d820fbaccfc17fa535589ec750625cdb0b13c40e57bf901f4bb73bae9054554698fcabf
DIST fakeredis-py-2.8.0.gh.tar.gz 163863 BLAKE2B
ccfb685e57e011afe22906751d3b48c8405ab71ce8b27a36c9168418dfcb4c3761d4162bc9f587396c04bbe4878675921bdfd43effa62ffc0ce6133d7aaf
SHA512
51199af0b3abada364664df8d0a091a7f200daf2c180f45488414672962338db8055488629f45d4a0046c48bcf711927c184726efe6cda4c4765fe9763447551
diff --git a/dev-python/fakeredis/fakeredis-2.5.0.ebuild
b/dev-python/fakeredis/fakeredis-2.5.0.ebuild
deleted file mode 100644
index 1d470272a507..
--- a/dev-python/fakeredis/fakeredis-2.5.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
- https://github.com/cunla/fakeredis-py/
- https://pypi.org/project/fakeredis/
-"
-SRC_URI="
- https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
- >=dev-python/redis-4.2[${PYTHON_USEDEP}]
- =dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-db/redis
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin redis
- sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # also lupa
- test/test_aioredis2.py::test_failed_script_error
- # TODO
- "test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
- "test/test_fakeredis.py::test_lpop_count[StrictRedis]"
- "test/test_fakeredis.py::test_rpop_count[StrictRedis]"
- "test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-
"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
- )
- local EPYTEST_IGNORE=(
- # these tests fail a lot...
- test/test_hypothesis.py
- )
- local args=(
- # tests requiring lupa (lua support)
- -k 'not test_eval and not test_lua and not
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 076708ac7139e30709bf7cb99d9e82c9bcfaec6d
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 15 07:13:46 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 15 07:18:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076708ac
sci-libs/caffe2: depends on kineto
Closes: https://bugs.gentoo.org/894436
Signed-off-by: Alfredo Tupone gentoo.org>
sci-libs/caffe2/Manifest | 1 +
sci-libs/caffe2/{caffe2-1.13.0.ebuild => caffe2-1.13.0-r1.ebuild} | 1 +
2 files changed, 2 insertions(+)
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index fba79e4a9a24..7a1c9e4370ae 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B
ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7
SHA512
c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B
e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99
SHA512
afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B
8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2
SHA512
5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20
+DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
diff --git a/sci-libs/caffe2/caffe2-1.13.0.ebuild
b/sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-1.13.0.ebuild
rename to sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
index f77c5dd01c55..ee1d1154a978 100644
--- a/sci-libs/caffe2/caffe2-1.13.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.13.0-r1.ebuild
@@ -59,6 +59,7 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/flatbuffers
+ sci-libs/kineto
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-python/fakeredis/
commit: b6b48b6e1dd802c7894247f45687fef2eabbf3fd
Author: Michał Górny gentoo org>
AuthorDate: Wed Feb 15 07:17:04 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Feb 15 07:25:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b48b6e
dev-python/fakeredis: Bump to 2.9.0
Signed-off-by: Michał Górny gentoo.org>
dev-python/fakeredis/Manifest | 1 +
dev-python/fakeredis/fakeredis-2.9.0.ebuild | 83 +
2 files changed, 84 insertions(+)
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index b561f8a58cd0..d62bc66fe1c0 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,4 @@
DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B
fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3
SHA512
5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
DIST fakeredis-py-2.6.0.gh.tar.gz 151925 BLAKE2B
60538efa5de93436177aa019908f02affb9df9b2aaf1349e933da6f066f98aaa255bbdb3297645ad1dc3b67a57a61bb8081e476f451799b512719f5779c1218d
SHA512
19a23be7a182f962e66686f3c4ec3a5b9fbc847d97e48f19fde11ae268f4a70de567ff2ca302a9fe0e7080de2215698cf5b2ff2febda5eef6748f3ec8d601720
DIST fakeredis-py-2.8.0.gh.tar.gz 163863 BLAKE2B
ccfb685e57e011afe22906751d3b48c8405ab71ce8b27a36c9168418dfcb4c3761d4162bc9f587396c04bbe4878675921bdfd43effa62ffc0ce6133d7aaf
SHA512
51199af0b3abada364664df8d0a091a7f200daf2c180f45488414672962338db8055488629f45d4a0046c48bcf711927c184726efe6cda4c4765fe9763447551
+DIST fakeredis-py-2.9.0.gh.tar.gz 165442 BLAKE2B
e71780b273f1847454d0e6e89f3f97a9d4a81d86345857fced39413521202f299b90c8a218f12b15d79a3bb7c865d7b0280798920cfd93120a553511b3a343ff
SHA512
2ddf2570e7f00647834f8f07a3fef6ec68d630ff93ddd5375dcc47a14a5a7bf430dbc4a1abfb38fa2b5e18f1aa1f4ef5413b39c4bb3ed9d167aa1729edfa9870
diff --git a/dev-python/fakeredis/fakeredis-2.9.0.ebuild
b/dev-python/fakeredis/fakeredis-2.9.0.ebuild
new file mode 100644
index ..11e604ae7bad
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.9.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+ https://github.com/cunla/fakeredis-py/
+ https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+ https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ =dev-python/redis-4.2[${PYTHON_USEDEP}]
+ =dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-db/redis
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # also lupa
+ test/test_aioredis2.py::test_failed_script_error
+ # TODO
+ "test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+ "test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+ "test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+ "test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+
"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+ )
+ local EPYTEST_IGNORE=(
+ # these tests fail a lot...
+ test/test_hypothesis.py
+ )
+ local args=(
+ # tests requiring lupa (lua support)
+ -k 'not test_eval and not test_lua and not test_script'
+ )
+ epytest "${args[@]}"
+}
+
+src_test() {
+ local redis_pid="${T}"/redis.pid
+ local redis_port=6379
+
+ einfo "Spawning Redis"
+ einfo "NOTE: Port ${redis_port} must be free"
+ "${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start
redis server"
+ daemonize yes
+ pidfile ${redis_pid}
+ port ${redis_port}
+ bind 127.0.0.1
+ EOF
+
+ # Run the tests
+ distutils-r1_src_test
+
+ # Clean up afterwards
+ kill "$(<"${redis_pid}")" || die
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
commit: 974a17b47648adf241d5bdba1291f2c2ed9b9592 Author: Sam James gentoo org> AuthorDate: Wed Feb 15 07:35:38 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 15 07:35:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974a17b4 sci-libs/caffe2: fix UnknownManifest Signed-off-by: Sam James gentoo.org> sci-libs/caffe2/Manifest | 1 - 1 file changed, 1 deletion(-) diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 7a1c9e4370ae..fba79e4a9a24 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,4 +1,3 @@ DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99 SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B 8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2 SHA512 5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20 -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
[gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
commit: 182bb7a92d0e6fc1f0bc32546d53d12f40d86215
Author: Sam James gentoo org>
AuthorDate: Wed Feb 15 07:25:19 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:25:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182bb7a9
media-video/mplayer: add 1.5_p20230215 (snapshot for >=ffmpeg-5, unkw'd for now)
Unkeyworded until had some more testing (please let us know in a comment
on one of the linked bugs if it works/doesn't).
Bug: https://bugs.gentoo.org/876760
Bug: https://bugs.gentoo.org/21
Signed-off-by: Sam James gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/files/prepare_mplayer.sh | 42 +-
...er-.ebuild => mplayer-1.5_p20230215.ebuild} | 16 +
media-video/mplayer/mplayer-.ebuild| 10 --
4 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a97a4832bde1..9fb82b326254 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,3 +2,4 @@ DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B
33c09025a9c521e1bc09a50fabb04e89493cbc4
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B
eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9
SHA512
4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B
0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0
SHA512
a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 08 BLAKE2B
94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454
SHA512
5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B
08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa
SHA512
f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
diff --git a/media-video/mplayer/files/prepare_mplayer.sh
b/media-video/mplayer/files/prepare_mplayer.sh
index 57d47425689f..88ae8773cea8 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -1,25 +1,35 @@
-#!/bin/sh
+#!/usr/bin/env bash
+. /lib/gentoo/functions.sh || { echo "Failed to source gentoo-functions!" ;
exit 1 ; }
VERSION=$(date +%Y%m%d)
-PACKAGE="mplayer-1.2_pre${VERSION}"
-DUMP_FFMPEG="$(dirname $0)/dump_ffmpeg.sh"
+PACKAGE="mplayer-1.5_p${VERSION}"
+DUMP_FFMPEG="$(realpath $(dirname $0)/dump_ffmpeg.sh)"
+ebegin "Fetching mplayer from svn"
svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
+eend $?
-pushd ${PACKAGE} > /dev/null
- # ffmpeg is in git now so no svn external anymore
- rm -rf ffmpeg
- git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg/
-sh "$DUMP_FFMPEG"
- STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut
-d' ' -f2)
- printf "$STORE_VERSION" > snapshot_version
-popd > /dev/null
+pushd ${PACKAGE} > /dev/null || { eerror "Moving to ${PACKAGE} dir failed!" ;
exit 1 ; }
+# ffmpeg is in git now so no svn external anymore
+rm -rf ffmpeg
+
+ebegin "Cloning ffmpeg from git"
+git clone https://git.ffmpeg.org/ffmpeg.git
+eend $?
+
+einfo "Extracting version"
+# This should be fatal but it hasn't been fatal in the live ebuild
+# for years and it needs fixing, so...
+bash "${DUMP_FFMPEG}" || ewarn "Dumping ffmpeg failed!"
+STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut
-d' ' -f2)
+ printf "${STORE_VERSION}" > snapshot_version
+einfo "Got version ${STORE_VERSION}"
+popd > /dev/null || { eerror "Returning to previous dir failed!" ; exit 1 ; }
find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
find "${PACKAGE}" -type d -name '.git' -prune -print0 | xargs -0 rm -rf
-tar cJf ${PACKAGE}.tar.xz ${PACKAGE}
-rm -rf ${PACKAGE}/
-
-echo "Tarball: \"${PACKAGE}.tar.xz\""
+tar --exclude-vcs -cJf ${PACKAGE}.tar.xz ${PACKAGE} || { eerror "Tar creation
failed! Error: $?" ; exit 1 ; }
+rm -rf ${PACKAGE}/ || { eerror "Removal of ${PACKAGE}? failed! Error: $?" ;
exit 1 ; }
-echo "** all done **"
+einfo "Tarball: \"${PACKAGE}.tar.xz\""
+einfo "** all done **"
diff --git a/media-video/mplayer/mplayer-.ebuild
b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
similarity index 96%
copy from media-video
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: 34abe2307694673a704009d3baf8862008711fab
Author: Kerin Millar plushkava net>
AuthorDate: Wed Feb 15 05:03:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:32:35 2023 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=34abe230
Implement - and integrate - an _eprint() helper function
The _eprint() function encapsulates some of the behaviour that the
following functions have in common.
- ebegin
- einfo
- einfon
- eerror
- eerrorn
- ewarnn
- ewarn
Additionally, have einfo() wrap einfon(), eerror() wrap eerrorn(), and
ewarn() wrap ewarnn().
All of this allows for a pleasing degree of code reduction while
improving the structure of the functions overall, partly owing to a
complementary reduction in the number of return statements. It also
plots a course for the eventual implementation of proper TTY detection,
in a context-sensitive manner.
Bug: https://bugs.gentoo.org/730432
Signed-off-by: Kerin Millar plushkava.net>
Signed-off-by: Sam James gentoo.org>
functions.sh | 109 ---
1 file changed, 37 insertions(+), 72 deletions(-)
diff --git a/functions.sh b/functions.sh
index bd45c6f..c1ff6a4 100644
--- a/functions.sh
+++ b/functions.sh
@@ -5,6 +5,20 @@
# shellcheck disable=2034
RC_GOT_FUNCTIONS="yes"
+#
+#This is a private function, called by ebegin, eerrorn, einfon, and ewarnn.
+#
+_eprint() {
+ local color
+ color=$1
+ shift
+
+ if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" = "ebegin" ];
then
+ printf '\n'
+ fi
+ printf ' %s*%s %s%b' "${color}" "${NORMAL}" "${genfun_indent}" "$*"
+}
+
#
#hard set the indent used for e-commands.
#num defaults to 0
@@ -102,15 +116,10 @@ esyslog()
#
einfon()
{
- if yesno "${EINFO_QUIET}"; then
- return 0
+ if ! yesno "${EINFO_QUIET}"; then
+ _eprint "${GOOD}" "$@"
+ genfun_lastcall="einfon"
fi
- if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" = "ebegin" ];
then
- printf "\n"
- fi
- printf " ${GOOD}*${NORMAL} ${genfun_indent}$*"
- genfun_lastcall="einfon"
- return 0
}
#
@@ -118,9 +127,8 @@ einfon()
#
einfo()
{
- einfon "$*\n"
+ einfon "$*\\n"
genfun_lastcall="einfo"
- return 0
}
#
@@ -128,20 +136,11 @@ einfo()
#
ewarnn()
{
- if yesno "${EINFO_QUIET}"; then
- return 0
- else
- if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" =
"ebegin" ]; then
- printf "\n" >&2
- fi
- printf " ${WARN}*${NORMAL} ${genfun_indent}$*" >&2
+ if ! yesno "${EINFO_QUIET}"; then
+ _eprint "${WARN}" "$@" >&2
+ esyslog "daemon.warning" "${0##*/}" "$@"
+ genfun_lastcall="ewarnn"
fi
-
- # Log warnings to system log
- esyslog "daemon.warning" "${0##*/}" "$@"
-
- genfun_lastcall="ewarnn"
- return 0
}
#
@@ -149,20 +148,8 @@ ewarnn()
#
ewarn()
{
- if yesno "${EINFO_QUIET}"; then
- return 0
- else
- if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" =
"ebegin" ]; then
- printf "\n" >&2
- fi
- printf " ${WARN}*${NORMAL} ${genfun_indent}$*\n" >&2
- fi
-
- # Log warnings to system log
- esyslog "daemon.warning" "${0##*/}" "$@"
-
+ ewarnn "$*\\n"
genfun_lastcall="ewarn"
- return 0
}
#
@@ -170,19 +157,11 @@ ewarn()
#
eerrorn()
{
- if yesno "${EERROR_QUIET}"; then
- return 1
- else
- if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" =
"ebegin" ]; then
- printf "\n" >&2
- fi
- printf " ${BAD}*${NORMAL} ${genfun_indent}$*" >&2
+ if ! yesno "${EERROR_QUIET}"; then
+ _eprint "${BAD}" "$@" >&2
+ esyslog "daemon.err" "${0##*/}" "$@"
+ genfun_lastcall="eerrorn"
fi
-
- # Log errors to system log
- esyslog "daemon.err" "${0##*/}" "$@"
-
- genfun_lastcall="eerrorn"
return 1
}
@@ -191,18 +170,7 @@ eerrorn()
#
eerror()
{
- if yesno "${EERROR_QUIET}"; then
- return 1
- else
- if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" =
"ebegin" ]; then
- printf "\n" >&2
- fi
- printf " ${BAD}*${NORMAL} ${genfun_indent}$*\n" >&2
- fi
-
- # Log errors to system log
- esyslog "daemon.err" "${0##*/}" "$@"
-
+ eerrorn "$*\\n"
genfun_lastcall="eerror"
return 1
}
@@ -212,20 +180,17 @@ eerror()
#
ebegin()
{
- local msg="$*"
- if yesno "${EINFO_QUIET}"; then
- return 0
- fi
+ local msg
- m
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: c7d99dc38a647899e8dad2e036439ecf4b1fdf2b
Author: Kerin Millar plushkava net>
AuthorDate: Wed Feb 15 06:27:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:32:40 2023 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=c7d99dc3
Don't use %b to format the "[ ok ]" and "[ !! ]" strings in _eend()
The success/failure strings were once injected into format strings. The
effect of doing so does not need to be mimicked because, even where
_eend() incororates ECMA-48 sequences, they are always in a raw form and
do not require decoding.
Signed-off-by: Kerin Millar plushkava.net>
Signed-off-by: Sam James gentoo.org>
functions.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/functions.sh b/functions.sh
index 4f94ab0..151775f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -229,10 +229,10 @@ _eend()
fi
if [ -n "${genfun_endcol}" ]; then
- printf '%s %b\n' "${genfun_endcol}" "${msg}"
+ printf '%s %s\n' "${genfun_endcol}" "${msg}"
else
[ "${genfun_lastcall}" = ebegin ] || genfun_lastbegun_strlen=0
- printf "%$(( genfun_cols - genfun_lastbegun_strlen - 6 ))s%b\n"
'' "${msg}"
+ printf "%$(( genfun_cols - genfun_lastbegun_strlen - 6 ))s%s\n"
'' "${msg}"
fi
return "${retval}"
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: eb36c3077fd69b7cbc5ef64c68d42baff50b3d43
Author: Kerin Millar plushkava net>
AuthorDate: Wed Feb 15 07:02:48 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:32:45 2023 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=eb36c307
Implement proper TTY detection, once and for all
Following a litany of ill-considered bodges and hacks over the years, it
is high time that the matter of tty detection was conclusively dealt
with. This commit aims to accomplish exactly that, in a fashion that can
be described twofold.
Firstly, the recently introduced _eprint() function will now test
whether STDOUT is a tty at the time of invocation. If found to be a tty,
ECMA-48 SGR sequences shall be incorporated into the message. Otherwise,
they shall not be. This positively affects the following functions.
- ebegin
- einfo
- einfon
- eerror
- eerrorn
- ewarnn
- ewarn
- vebegin
- veinfo
- veinfon
- veerror
- veerrorn
- vewarnn
- vewarn
Note that the *eerror* and *ewarn* functions duplicate file descriptor 2
(STDERR) to file descriptor 1 (STDOUT), meaning that the -t 1 test will
always be in the context of the appropriate file descriptor.
Secondly, the _eend() function will now test whether STDOUT is a tty at
the time of invocation. Just as with _eprint(), ECMA-48 SGR sequences
will be omitted in the case that STDOUT is found not to be a tty
However, the fact that _eend() prints a so-called end column must also
be taken into account. The end column string is not defined by this
function, but may or may not incorporate ECMA-48 CSI sequences that are
intended to move the cursor up - and to the end of - the previous line.
Previously, _eend() would always use the end column if was found to be
non-empty, despite containing such sequences. Now, it will refrain from
printing the end column where STDOUT is not a tty. Instead, it will fall
back to the method of printing the success/failure indicator on the
current line. Furthemore, if the fallback method is used under these
exact circumstances, the number of available columns will be assumed as
being 80 for the scope of the function call. After all, the width of the
controlling terminal is wholly immaterial unless printing to it. This
positively affects the following functions.
- eend
- ewend
- veend
- vewend
Consequently, all eighteen of the aformentioned functions will act
properly, in accordance with the state of both STDOUT and STDERR, at the
time that they are called. As such, the truly repulsive hack that was to
permanently disable colour if _either_ were found not to be a tty at the
time of sourcing functions.sh has been jettisoned. Good riddance.
Signed-off-by: Kerin Millar plushkava.net>
Bug: https://bugs.gentoo.org/631870
Signed-off-by: Sam James gentoo.org>
functions.sh | 47 ---
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/functions.sh b/functions.sh
index 151775f..a0422b6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -16,7 +16,11 @@ _eprint() {
if [ -z "${genfun_endcol}" ] && [ "${genfun_lastcall}" = "ebegin" ];
then
printf '\n'
fi
- printf ' %s*%s %s%b' "${color}" "${NORMAL}" "${genfun_indent}" "$*"
+ if [ -t 1 ]; then
+ printf ' %s*%s %s%b' "${color}" "${NORMAL}" "${genfun_indent}"
"$*"
+ else
+ printf ' * %s%b' "${genfun_indent}" "$*"
+ fi
}
#
@@ -202,7 +206,7 @@ ebegin()
#
_eend()
{
- local efunc msg retval
+ local cols efunc is_tty msg retval
efunc=$1
shift
@@ -217,22 +221,44 @@ _eend()
shift
fi
+ if [ -t 1 ]; then
+ is_tty=1
+ cols=${genfun_cols}
+ else
+ # STDOUT is not currently a TTY. Therefore, the width of the
+ # controlling terminal, if any, is irrelevant. For this call,
+ # consider the number of columns as being 80.
+ is_tty=0
+ cols=80
+ fi
+
if [ "${retval}" -ne 0 ]; then
+ # If a message was given, print it with the specified function.
if _is_visible "$*"; then
"${efunc}" "$*"
fi
- msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
+ # Generate an indicator for ebegin's unsuccessful conclusion.
+ if [ "${is_tty}" -eq 0 ]; then
+ msg="[ !! ]"
+ else
+ msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
+ fi
elif yesno "${EINFO_QUIET}"; then
return "${retval}"
else
- msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
+ # Generate an indicator for ebegin's successful conclusion.
+ if [ "${is_tty}" -eq 0 ]; then
+ msg="[ ok ]"
+ els
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: f100672645829212d8a2b2b3b273cecbee1e2f18 Author: Kerin Millar plushkava net> AuthorDate: Wed Feb 15 04:28:06 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 15 07:32:33 2023 + URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=f1006726 Remove the comment imploring developers not to use bashisms The shellcheck hint makes it clear that the target is sh(1) with support for the local builtin. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> functions.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/functions.sh b/functions.sh index b223ce8..bd45c6f 100644 --- a/functions.sh +++ b/functions.sh @@ -2,11 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # shellcheck shell=sh disable=3043 -# -# All functions in this file should be written in POSIX sh. Please do -# not use bashisms. -# - # shellcheck disable=2034 RC_GOT_FUNCTIONS="yes"
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: 93015498cc2167315dbde003ecd6b5cdef6a96bb
Author: Kerin Millar plushkava net>
AuthorDate: Wed Feb 15 05:20:36 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:32:39 2023 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=93015498
Fix an SC2059 warning in ebegin()
The SC2059 warning concerns potential injection into a format string.
At this point, and for the first ever time, functions.sh raises no
warnings in shellcheck
Signed-off-by: Kerin Millar plushkava.net>
Signed-off-by: Sam James gentoo.org>
functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions.sh b/functions.sh
index c1ff6a4..4f94ab0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -229,7 +229,7 @@ _eend()
fi
if [ -n "${genfun_endcol}" ]; then
- printf "${genfun_endcol} ${msg}\n"
+ printf '%s %b\n' "${genfun_endcol}" "${msg}"
else
[ "${genfun_lastcall}" = ebegin ] || genfun_lastbegun_strlen=0
printf "%$(( genfun_cols - genfun_lastbegun_strlen - 6 ))s%b\n"
'' "${msg}"
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: ce648e7539607a1809a1e4a037ade84bb4cde7b2
Author: Kerin Millar plushkava net>
AuthorDate: Wed Feb 15 07:35:20 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:43:55 2023 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=ce648e75
Do not use %b to decode user-supplied message strings
For a long time, user-supplied message strings were injected into format
strings used by printf. Obviously, doing so was a bad thing because it
would cause printf to interpret any escape sequences and format
specifiers that might be present in the string.
The issue of specifier injection was dealt with by the introduction of
_eprint(). This commit deals with the remaining issue by eliminating the
use of %b, whose only effect was to needlessly try to decode the message
string according to the same rules as echo -e (for XSI-conformant
systems).
Signed-off-by: Kerin Millar plushkava.net>
Bug: https://bugs.gentoo.org/730432
Signed-off-by: Sam James gentoo.org>
functions.sh | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/functions.sh b/functions.sh
index a0422b6..6b11645 100644
--- a/functions.sh
+++ b/functions.sh
@@ -17,9 +17,9 @@ _eprint() {
printf '\n'
fi
if [ -t 1 ]; then
- printf ' %s*%s %s%b' "${color}" "${NORMAL}" "${genfun_indent}"
"$*"
+ printf ' %s*%s %s%s' "${color}" "${NORMAL}" "${genfun_indent}"
"$*"
else
- printf ' * %s%b' "${genfun_indent}" "$*"
+ printf ' * %s%s' "${genfun_indent}" "$*"
fi
}
@@ -131,7 +131,8 @@ einfon()
#
einfo()
{
- einfon "$*\\n"
+ einfon "$*
+"
genfun_lastcall="einfo"
}
@@ -152,7 +153,8 @@ ewarnn()
#
ewarn()
{
- ewarnn "$*\\n"
+ ewarnn "$*
+"
genfun_lastcall="ewarn"
}
@@ -174,7 +176,8 @@ eerrorn()
#
eerror()
{
- eerrorn "$*\\n"
+ eerrorn "$*
+"
genfun_lastcall="eerror"
return 1
}
[gentoo-commits] proj/gentoo-functions:master commit in: /
commit: 7740d326249aee9f4e3b4032932e272792de16b2 Author: Sam James gentoo org> AuthorDate: Wed Feb 15 07:48:12 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 15 07:48:12 2023 + URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=7740d326 Makefile: crank version to 0.20 in preparation I'll likely forget otherwise. Signed-off-by: Sam James gentoo.org> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 739bfcb..3fa8d85 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -VERSION = 0.19 +VERSION = 0.20 GITREF ?= $(VERSION) PKG ?= gentoo-functions-$(VERSION)
[gentoo-commits] proj/portage:master commit in: /, lib/portage/emaint/
commit: 7358377160a877f920683324d7fee8b11a82ea93
Author: Noel Nyback nyback com>
AuthorDate: Thu Jan 19 20:48:21 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 07:53:21 2023 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=73583771
emaint: Changed default action for emaint target sync to 'auto'
When using 'sync' module of emaint the default option is '--check' when
none is provided which spits out an ERROR about '--check' not being an option
for module 'sync':
```
terminal ~ # emaint sync
ERROR: module 'sync' does not have option '--check'
sync module options:
-A, --allrepos (sync module only): -A, --allrepos Sync all repos that have a
sync-url defined
-a, --auto(sync module only): -a, --auto Sync auto-sync enabled repos only
-r, --repo(sync module only): -r, --repo Sync the specified repo
```
My idea was to change the default action for the 'sync' module to '--auto'. To
me '--auto'
seems to be the most useful default option for the 'sync' module since I would
imagine
that is the most common use case and presumably most users typing 'emaint sync'
would
be looking for this outcome.
Closes: https://github.com/gentoo/portage/pull/981
Signed-off-by: Noel Nyback nyback.com>
Signed-off-by: Sam James gentoo.org>
NEWS | 2 ++
lib/portage/emaint/main.py | 14 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index d81d5823f..881565634 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Bug fixes:
* portage(5): List volatile option as a separate entry (bug #888585).
+* emaint: Changed default action for emaint target sync to 'auto'.
+
portage-3.0.44 (2023-01-15)
--
diff --git a/lib/portage/emaint/main.py b/lib/portage/emaint/main.py
index af7420368..791adecfd 100644
--- a/lib/portage/emaint/main.py
+++ b/lib/portage/emaint/main.py
@@ -210,10 +210,16 @@ def emaint_main(myargv):
long_action = opt.long.lstrip("-")
if long_action is None:
-# print("DEBUG: long_action is None: setting to 'check'")
-long_action = "check"
-func = check_opt.func
-status = check_opt.status
+if args[0] == "sync":
+# print("DEBUG: long_action is None: setting to 'auto'")
+long_action = "auto"
+func = "auto_sync"
+status = "Syncing %s"
+else:
+# print("DEBUG: long_action is None: setting to 'check'")
+long_action = "check"
+func = check_opt.func
+status = check_opt.status
if args[0] == "all":
tasks = []
