From: | Johannes Huber <johu@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] repo/gentoo:master commit in: www-apache/modsec-flameeyes/ |
Date: | Sun, 27 May 2018 21:59:43 |
Message-Id: | 1527458374.3316755ba6657748293c9df96eef227e4dc5be22.johu@gentoo |
1 | commit: 3316755ba6657748293c9df96eef227e4dc5be22 |
2 | Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 | AuthorDate: Sun May 20 23:47:10 2018 +0000 |
4 | Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 | CommitDate: Sun May 27 21:59:34 2018 +0000 |
6 | URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3316755b |
7 | |
8 | www-apache/modsec-flameeyes: git-2->git-r3 |
9 | |
10 | Closes: https://github.com/gentoo/gentoo/pull/8502 |
11 | Package-Manager: Portage-2.3.38, Repoman-2.3.9 |
12 | Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
13 | |
14 | .../modsec-flameeyes-20130216.ebuild | 20 ++++++++++---------- |
15 | .../modsec-flameeyes-99999999.ebuild | 20 ++++++++++---------- |
16 | 2 files changed, 20 insertions(+), 20 deletions(-) |
17 | |
18 | diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild |
19 | index 673802ff0da..6428a8a1346 100644 |
20 | --- a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild |
21 | +++ b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild |
22 | @@ -1,22 +1,22 @@ |
23 | -# Copyright 1999-2013 Gentoo Foundation |
24 | +# Copyright 1999-2018 Gentoo Foundation |
25 | # Distributed under the terms of the GNU General Public License v2 |
26 | |
27 | -EAPI=5 |
28 | +EAPI=6 |
29 | |
30 | -inherit readme.gentoo |
31 | - |
32 | -GITHUB_USER=Flameeyes |
33 | -GITHUB_PROJECT=${PN} |
34 | - |
35 | -EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}.git" |
36 | +inherit readme.gentoo-r1 |
37 | |
38 | DESCRIPTION="Flameeyes's Ruleset for ModSecurity" |
39 | HOMEPAGE="http://www.flameeyes.eu/projects/modsec" |
40 | -SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
41 | +if [[ ${PV} == "99999999" ]]; then |
42 | + EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git" |
43 | + inherit git-r3 |
44 | +else |
45 | + KEYWORDS="~amd64" |
46 | + SRC_URI="https://github.com/Flameeyes/modsec-flameeyes/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 | +fi |
48 | |
49 | LICENSE="CC-BY-SA-3.0" |
50 | SLOT="0" |
51 | -KEYWORDS="~amd64" |
52 | |
53 | RDEPEND=">=www-apache/mod_security-2.5.1" |
54 | DEPEND="" |
55 | |
56 | diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild |
57 | index b8557517b9b..6428a8a1346 100644 |
58 | --- a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild |
59 | +++ b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild |
60 | @@ -1,22 +1,22 @@ |
61 | -# Copyright 1999-2013 Gentoo Foundation |
62 | +# Copyright 1999-2018 Gentoo Foundation |
63 | # Distributed under the terms of the GNU General Public License v2 |
64 | |
65 | -EAPI=5 |
66 | +EAPI=6 |
67 | |
68 | -inherit readme.gentoo git-2 |
69 | - |
70 | -GITHUB_USER=Flameeyes |
71 | -GITHUB_PROJECT=${PN} |
72 | - |
73 | -EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}.git" |
74 | +inherit readme.gentoo-r1 |
75 | |
76 | DESCRIPTION="Flameeyes's Ruleset for ModSecurity" |
77 | HOMEPAGE="http://www.flameeyes.eu/projects/modsec" |
78 | -#SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
79 | +if [[ ${PV} == "99999999" ]]; then |
80 | + EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git" |
81 | + inherit git-r3 |
82 | +else |
83 | + KEYWORDS="~amd64" |
84 | + SRC_URI="https://github.com/Flameeyes/modsec-flameeyes/archive/${PV}.tar.gz -> ${P}.tar.gz" |
85 | +fi |
86 | |
87 | LICENSE="CC-BY-SA-3.0" |
88 | SLOT="0" |
89 | -KEYWORDS="" |
90 | |
91 | RDEPEND=">=www-apache/mod_security-2.5.1" |
92 | DEPEND="" |