commit: c321e4e027f0d071033831c1eb09e068a05bd5e6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Feb 5 05:14:30 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 5 05:18:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c321e4e0
www-apps/prewikka: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> www-apps/prewikka/Manifest | 2 -- .../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, 116 deletions(-) diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest index 38f2d6e1ded..871f7538d92 100644 --- a/www-apps/prewikka/Manifest +++ b/www-apps/prewikka/Manifest @@ -1,3 +1 @@ -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 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 64fd92f14ef..00000000000 --- 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 773b2e98469..00000000000 --- 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 5d997575de1..00000000000 --- 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 712e2dcd057..00000000000 --- 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" -)
