From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- www-apps/prewikka/Manifest | 6 ---- .../files/prewikka-4.1.5-fix_rule_error.patch | 32 ------------------ .../files/prewikka-4.1.5-fix_siteconfig.patch | 12 ------- www-apps/prewikka/prewikka-4.0.0.ebuild | 32 ------------------ www-apps/prewikka/prewikka-4.1.5.ebuild | 38 ---------------------- 5 files changed, 120 deletions(-) delete mode 100644 www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch delete mode 100644 www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch delete mode 100644 www-apps/prewikka/prewikka-4.0.0.ebuild delete mode 100644 www-apps/prewikka/prewikka-4.1.5.ebuild (limited to 'www-apps/prewikka') diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest index 5c9474af8293..a5bd31efe5c0 100644 --- a/www-apps/prewikka/Manifest +++ b/www-apps/prewikka/Manifest @@ -1,9 +1,3 @@ -AUX prewikka-4.1.5-fix_rule_error.patch 1207 BLAKE2B 0c2b4400c1f463c0acd1ee19ad797abac57e0de5af86e1f7fded068f6aa62f9954fea08849a06d5fc42b41b6406a1b28007178ccb24e81fa73c66b445d8436aa SHA512 97d0c518fb4a941e0611d00d1ed4050c65f878998656731be449339f4796e29530381e55a712838b58e56271ff33cbadfc90b511022a4c10b32e19bc770b6b6e -AUX prewikka-4.1.5-fix_siteconfig.patch 618 BLAKE2B 44c24ebff3d06d50ef17d9b429918223dcdcf9bb3fed0f0f86d083e3619c3c4922ff322c2024584a0217aaad0214aa0a24f5695b1bfe0173846d27975d0b38ed SHA512 70412631cccd13495fd611f0623ab284e99151cfd8502924cb3c7f556e4216d1b8829bce52a504b08f0a398e59882369caa4628149853cbf1067f57c6752b233 -DIST prewikka-4.0.0.tar.gz 1365985 BLAKE2B 2248c80bebccf4a5f4b99f46d3af6f2aff433c19105e02dfa6c8570a6e41436a9f74971774f3963cbec9abcf70a2bf52b04cd99d930f3e193033aeb1246d1a18 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6 -DIST prewikka-4.1.5.tar.gz 1432885 BLAKE2B aa899eae92b7eee10c4e80544fc02c80fce403dd808464ef3ca21a6d8ddb052730314bd4b83970c684401c53f8398df0f9ca5180c946999e08a2faf9eb7b94f4 SHA512 f68fb6c893727e1bfc2611ef8e3327e6c44d24ea36239fb998675d0e8102dd9849990dbd344c9f584a045f9ed6b4208c3a9928c952ed6248e691687827677dd3 DIST prewikka-5.1.1.tar.gz 1662093 BLAKE2B a4057ee35bb2dbc55ee86c4f41c32074d20712e79fe62b4a409fb0c842ee6aac06418aeace8d11d3c74c99b6787a2e507d0e424180849b4acb3296ebc6c785f0 SHA512 97ac557964fc7a3a633d879830dbda1a263061acc7d943798638686a67db46f08371af081b07eded60dc9856dd47641fae5df50603e190f36acb71a45ee6089a -EBUILD prewikka-4.0.0.ebuild 964 BLAKE2B 4c87378418b75c9ccfd46f3a1089442fe427584cf337a3ba41b93f4e7d0c06e9cbfc48e608c0a9bed50a60f9d17c3504ed180156aaef2e75f66e0bccb966b305 SHA512 cad0bac73833ff273de437a0a8443bffd745437c4464381e16e86832de75cff5ece23642875189c0ae0422dba79ee9cf2b1bd6e3d9cfbd1159e27874b54e6a0b -EBUILD prewikka-4.1.5.ebuild 1112 BLAKE2B e00144a87aa4c9cba29a312ada04a7104f4081b60caad52d466a3a39fcb4291fbd8da75c441fcf5c8b23482d15904c6cf0b76e224b9487a1516d55d128ea1529 SHA512 a7ff9fc01016b30dcffb6b01409a43a23b2b9b626cbffde6e16628b304590eebca1b5d8f329b108658b979edb725cee6f92e0c8313127532e59eb14d8c9f9341 EBUILD prewikka-5.1.1.ebuild 1232 BLAKE2B 75e65f8ec0b5c3c1f57afd24db9c5ea99db5356d05185d7901dbc39adb3ac50407b32d9a632eccb2df82b8a53ca49ae2b8a017365e586386a4ccc5d0b5a93e18 SHA512 877ad958b4760a2bda4ddb58aaab2e2e346dbc1e40a5b4bb00af3aa919f32bf87cab0603f77d651233318d1a67c42a014c32976657523af8b10bce4fea318181 MISC metadata.xml 789 BLAKE2B cd4566869293a5c7d48ec9ebe94116da4c1955242e7d09eb2cb9c71a4251d05c44ad1b11a26c70b5e2abadee72fe642dd4aa1a8bd354253126bcd546735aeea8 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch deleted file mode 100644 index 64fd92f14ef8..000000000000 --- a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch +++ /dev/null @@ -1,32 +0,0 @@ -# Based on https://www.prelude-siem.org/projects/prewikka/repository/revisions/9814f708b6e157795b89f9edda32ab38d0a2ced7/diff/prewikka/view.py -# Already commited - ---- a/prewikka/view.py -+++ b/prewikka/view.py -@@ -523,7 +523,7 @@ - - try: - rule, view_kwargs = env.request.url_adapter.match(request.path, method=request.method, return_rule=True) -- view = self._views_rules[rule] -+ view = self._views_rules[rule.rule+rule.endpoint] - - except werkzeug.exceptions.MethodNotAllowed: - raise InvalidMethodError(N_("Method '%(method)s' is not allowed for view '%(view)s'", -@@ -580,7 +580,7 @@ - - rule = Rule(path, endpoint=v.view_endpoint, methods=methods, defaults=defaults) - -- self._views_rules[rule] = v -+ self._views_rules[rule.rule+rule.endpoint] = v - self._rule_map.add(rule) - - def addView(self, view): -@@ -601,7 +601,7 @@ - - rule = Rule((view.view_path or "/" + view.view_id), endpoint=view.view_endpoint) - -- self._views_rules[rule] = view -+ self._views_rules[rule.rule+rule.endpoint] = view - self._rule_map.add(rule) - self._views[view.view_id] = view - diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch deleted file mode 100644 index 773b2e984698..000000000000 --- a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -84,7 +84,8 @@ - - def init_siteconfig(self): - config = open("prewikka/siteconfig.py", "w") -- config.write("tmp_dir = '%s'\n" % (os.path.join(tempfile.gettempdir(), "prewikka"))) -+ config.write("import os, tempfile\n") -+ config.write("tmp_dir = os.path.join(tempfile.gettempdir(), 'prewikka')\n") - config.write("conf_dir = '%s'\n" % (os.path.abspath(self.conf_prefix))) - config.write("data_dir = '%s'\n" % (os.path.abspath(self.data_prefix))) - config.write("libprelude_required_version = '%s'\n" % (LIBPRELUDE_REQUIRED_VERSION)) diff --git a/www-apps/prewikka/prewikka-4.0.0.ebuild b/www-apps/prewikka/prewikka-4.0.0.ebuild deleted file mode 100644 index 5d997575de18..000000000000 --- a/www-apps/prewikka/prewikka-4.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ssl" - -inherit distutils-r1 - -DESCRIPTION="Graphical front-end analysis console for the Prelude Framework" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="adns" - -DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/gettext" - -RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}] - ~dev-libs/libpreludedb-${PV}[python,${PYTHON_USEDEP}] - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - media-fonts/font-xfree86-type1 - adns? ( dev-python/twisted[${PYTHON_USEDEP}] )" diff --git a/www-apps/prewikka/prewikka-4.1.5.ebuild b/www-apps/prewikka/prewikka-4.1.5.ebuild deleted file mode 100644 index 712e2dcd0579..000000000000 --- a/www-apps/prewikka/prewikka-4.1.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ssl" - -inherit distutils-r1 - -DESCRIPTION="Graphical front-end analysis console for the Prelude Framework" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="adns" - -DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/gettext" - -RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}] - ~dev-libs/libpreludedb-4.1.0[python,${PYTHON_USEDEP}] - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/croniter[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - media-fonts/font-xfree86-type1 - adns? ( dev-python/twisted[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.5-fix_siteconfig.patch" - "${FILESDIR}/${PN}-4.1.5-fix_rule_error.patch" -) -- cgit v1.2.3