diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-portage/g-sorcery | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'app-portage/g-sorcery')
-rw-r--r-- | app-portage/g-sorcery/Manifest | 3 | ||||
-rw-r--r-- | app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch | 140 | ||||
-rw-r--r-- | app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild | 47 |
3 files changed, 0 insertions, 190 deletions
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest index 5fc3142f2d89..273611733a4c 100644 --- a/app-portage/g-sorcery/Manifest +++ b/app-portage/g-sorcery/Manifest @@ -1,6 +1,3 @@ -AUX g-sorcery-0.2.1-py3.7.tests-fix.patch 4455 BLAKE2B 631c028024312fd25f5191191a953cb9db9eda0de2f97ee84c1e5266fea99ddedb2faa36f24740561f181b76d311c0997cf5c1c04fe3bf69df0828b0d3ed96cd SHA512 68674b89fe101770adf7de711f828207856d97ecb0f66d4a369c90136fc8168095b2d5548e5d722eebabb5a7ed2eb91832c2dbd2618c97fb5961ffd2dc4186df -DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e DIST g-sorcery-0.2.2.tar.gz 55707 BLAKE2B 59466e116caff697618154f3c9d8a2c11809ac0c1d367a35a7773fdcad381e283c2426310ccd4f843e10e6fc5143061f2ee575bdd190a1a51d7691be0d452d73 SHA512 a63b6a49225fbf5105666a6d8094f04534674c4773eb8008e2cb8e2eb75291011d53ff3f1bf6dd456496469d537a97151feca73b9b26553cf1fda9d3128534cb -EBUILD g-sorcery-0.2.1-r1.ebuild 1080 BLAKE2B d649e5985064d02bdc2f97aa078088126da6317866221104933a8abac80cd86a08246a03fe95cab2b79ef511377a12750033349c08f2178f611956def0e025c2 SHA512 49982f740bd26e71b16347a5a3ebc9e6e2fd10ea67deb5f31d68684b686caa26ae98c1f1690eb8997e8ef20f71c2a00845f56ae7796ea2f6e4bd1f26deef08fe EBUILD g-sorcery-0.2.2.ebuild 1087 BLAKE2B 869ea4560a4bee1841b0dd78ae35f8fe72e4dfa37f9d9c3c57ab919cff9173c91bdf5307c4090139e9f2649b40827268085f67ebdbedf0f2f30ead13235324f5 SHA512 8cfcbab98a37f83484404e667015eaaf23bb15f0a796fb693980ca33b1eb5e64eba85b5af2b40a256f8940ab743a0d0c0c2a7ed4af8d7cfb96648cb9374c0867 MISC metadata.xml 335 BLAKE2B 3e6f323e6dfb1feb21d8bbb2c4b2ba3a16d7cbb302de4dd7a49b6878f44c92958fe2fd1d0b20fafe2a9b840fa19e33184096039ee31d6aaf3caf34406da32fdf SHA512 2fad27c61de25d403b79bb06e3bc4242edadf86fafb06c91e5560d51b69fe3652a18f28a998bee225706fd2b1319968f956e58f6d9c21e7c2dccd6d8988f6fdd diff --git a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch b/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch deleted file mode 100644 index 84a702413ac8..000000000000 --- a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/README.md b/README.md -index 9bdd5b7..c2eb5ad 100644 ---- a/README.md -+++ b/README.md -@@ -26,3 +26,5 @@ This project is aimed to create a framework for ebuild-generators for - 3rd party software providers. - - If you want to develop a new backend see [developer's instructions](https://github.com/jauhien/g-sorcery/blob/master/docs/developer_instructions.rst). -+ -+[TODO list](https://trello.com/b/8WdY2ZIs/framework-for-automated-ebuild-generators). -diff --git a/scripts/all_pythons.sh b/scripts/all_pythons.sh -index af4c1f1..3c85974 100755 ---- a/scripts/all_pythons.sh -+++ b/scripts/all_pythons.sh -@@ -2,7 +2,7 @@ - - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - --for VER in 2.7 3.3 3.4 -+for VER in 2.7 3.6 3.7 3.8 - do - echo - echo "testing python${VER}" -diff --git a/tests/server.py b/tests/server.py -index 51d49b7..aa895ea 100644 ---- a/tests/server.py -+++ b/tests/server.py -@@ -4,20 +4,21 @@ - """ - server.py - ~~~~~~~~~ -- -+ - test server -- -+ - :copyright: (c) 2013 by Jauhien Piatlicki - :license: GPL-2, see LICENSE for more details. - """ - - import os - import threading -+import time - - from g_sorcery.compatibility import py2k - - if py2k: -- from SocketServer import TCPServer as HTTPServer -+ from SocketServer import TCPServer as HTTPServer - from SimpleHTTPServer import SimpleHTTPRequestHandler - else: - from http.server import HTTPServer -@@ -26,26 +27,27 @@ else: - def HTTPRequestHandlerGenerator(direct): - - class HTTPRequestHandler(SimpleHTTPRequestHandler, object): -- directory = direct - - def __init__(self, request, client_address, server): -+ self.direct = direct - super(HTTPRequestHandler, self).__init__(request, client_address, server) - - def translate_path(self, path): -- return os.path.join(self.directory, path[1:]) -+ return os.path.join(self.direct, path[1:]) - - return HTTPRequestHandler - -- -+ - class Server(threading.Thread): - def __init__(self, directory, port=8080): - super(Server, self).__init__() - HTTPServer.allow_reuse_address = True - server_address = ('127.0.0.1', port) - self.httpd = HTTPServer(server_address, HTTPRequestHandlerGenerator(directory)) -- -+ - def run(self): - self.httpd.serve_forever() - - def shutdown(self): - self.httpd.shutdown() -+ time.sleep(0.5) -diff --git a/tests/test_DBGenerator.py b/tests/test_DBGenerator.py -index 9a47c86..3c28278 100644 ---- a/tests/test_DBGenerator.py -+++ b/tests/test_DBGenerator.py -@@ -4,9 +4,9 @@ - """ - test_DBGenerator.py - ~~~~~~~~~~~~~~~~~~~ -- -+ - DBGenerator test suite -- -+ - :copyright: (c) 2013 by Jauhien Piatlicki - :license: GPL-2, see LICENSE for more details. - """ -@@ -81,11 +81,13 @@ class TestDBGenerator(BaseTest): - srv = Server(orig_tempdir.name) - srv.start() - -- pkg_db = db_generator(self.tempdir.name, "test_repo", -+ try: -+ pkg_db = db_generator(self.tempdir.name, "test_repo", - common_config = common_config, config = config) - -- srv.shutdown() -- srv.join() -+ finally: -+ srv.shutdown() -+ srv.join() - - self.assertEqual(set(pkg_db.list_categories()), set(["app-test1", "app-test2"])) - self.assertTrue(pkg_db.in_category("app-test1", "test")) -diff --git a/tests/test_PackageDB.py b/tests/test_PackageDB.py -index 152c605..8be8f8a 100644 ---- a/tests/test_PackageDB.py -+++ b/tests/test_PackageDB.py -@@ -70,11 +70,13 @@ class TestPackageDB(BaseTest): - - srv = Server(orig_tempdir.name, port=port) - srv.start() -- self.assertRaises(IntegrityError, test_db.sync, sync_address) -- os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz") -- test_db.sync(sync_address) -- srv.shutdown() -- srv.join() -+ try: -+ self.assertRaises(IntegrityError, test_db.sync, sync_address) -+ os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz") -+ test_db.sync(sync_address) -+ finally: -+ srv.shutdown() -+ srv.join() - test_db.read() - self.assertEqual(orig_db.database, test_db.database) - self.assertEqual(orig_db.get_common_data("app-test1"), test_db.get_common_data("app-test1")) diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild deleted file mode 100644 index 50cc18f1bbde..000000000000 --- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_7,3_8} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 prefix - -DESCRIPTION="framework for ebuild generators" -HOMEPAGE="https://github.com/jauhien/g-sorcery" -SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="bson git test" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - git? ( dev-vcs/git ) - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/g-sorcery-0.2.1-py3.7.tests-fix.patch" -) - -src_prepare() { - hprefixify setup.py - default -} - -python_test() { - PYTHONPATH="." "${PYTHON}" scripts/run_tests.py -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/*.8 - dohtml docs/developer_instructions.html - diropts -m0777 - dodir /var/lib/g-sorcery -} |