| 1 |
commit: ec39e30795cbd9220b1d87a2afac6d7da88d0828 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 26 17:47:06 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 26 17:47:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec39e307 |
| 7 |
|
| 8 |
www-servers/cherokee: Revbump for dependencies and EAPI |
| 9 |
|
| 10 |
Non-maintainer commit |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/666084 |
| 13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 14 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 15 |
|
| 16 |
...e-1.2.104.ebuild => cherokee-1.2.104-r1.ebuild} | 24 +++++++++++----------- |
| 17 |
1 file changed, 12 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild |
| 20 |
similarity index 93% |
| 21 |
rename from www-servers/cherokee/cherokee-1.2.104.ebuild |
| 22 |
rename to www-servers/cherokee/cherokee-1.2.104-r1.ebuild |
| 23 |
index adff732826e..0908c4897ba 100644 |
| 24 |
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild |
| 25 |
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild |
| 26 |
@@ -1,13 +1,13 @@ |
| 27 |
-# Copyright 1999-2017 Gentoo Foundation |
| 28 |
+# Copyright 1999-2019 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
-EAPI="5" |
| 32 |
+EAPI=7 |
| 33 |
|
| 34 |
WANT_AUTOMAKE="1.11" |
| 35 |
|
| 36 |
PYTHON_COMPAT=( python2_7 ) |
| 37 |
|
| 38 |
-inherit autotools python-r1 eutils multilib pam systemd user |
| 39 |
+inherit autotools python-r1 pam systemd user |
| 40 |
|
| 41 |
DESCRIPTION="An extremely fast and tiny web server" |
| 42 |
SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip" |
| 43 |
@@ -27,7 +27,7 @@ COMMON_DEPEND=" |
| 44 |
ffmpeg? ( virtual/ffmpeg ) |
| 45 |
geoip? ( dev-libs/geoip ) |
| 46 |
ldap? ( net-nds/openldap ) |
| 47 |
- mysql? ( >=virtual/mysql-5 ) |
| 48 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
| 49 |
nls? ( virtual/libintl ) |
| 50 |
pam? ( virtual/pam ) |
| 51 |
php? ( || ( |
| 52 |
@@ -35,7 +35,7 @@ COMMON_DEPEND=" |
| 53 |
dev-lang/php:*[cgi] |
| 54 |
) ) |
| 55 |
ssl? ( |
| 56 |
- !libressl? ( dev-libs/openssl:0= ) |
| 57 |
+ !libressl? ( <dev-libs/openssl-1.1.0:0= ) |
| 58 |
libressl? ( dev-libs/libressl:0= ) |
| 59 |
) |
| 60 |
" |
| 61 |
@@ -48,10 +48,8 @@ RESTRICT="test" |
| 62 |
|
| 63 |
WEBROOT="/var/www/localhost" |
| 64 |
|
| 65 |
-src_unpack() { |
| 66 |
- unpack ${A} |
| 67 |
- mv "webserver-${PV}" "${S}" || die |
| 68 |
-} |
| 69 |
+PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" ) |
| 70 |
+S="${WORKDIR}/webserver-${PV}" |
| 71 |
|
| 72 |
pkg_setup() { |
| 73 |
enewgroup cherokee |
| 74 |
@@ -60,8 +58,7 @@ pkg_setup() { |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
python_setup |
| 78 |
- epatch \ |
| 79 |
- "${FILESDIR}/${PN}-1.2.99-gentoo.patch" |
| 80 |
+ default |
| 81 |
|
| 82 |
"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in |
| 83 |
eautoreconf |
| 84 |
@@ -123,7 +120,7 @@ src_configure() { |
| 85 |
} |
| 86 |
|
| 87 |
src_install() { |
| 88 |
- emake DESTDIR="${D}" install |
| 89 |
+ default |
| 90 |
|
| 91 |
if ! use static-libs ; then |
| 92 |
find "${ED}" -name '*.la' -delete || die |
| 93 |
@@ -171,6 +168,9 @@ src_install() { |
| 94 |
newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN} |
| 95 |
|
| 96 |
systemd_dounit "${FILESDIR}"/cherokee.service |
| 97 |
+ |
| 98 |
+ # Fix QA error - not important if it fails |
| 99 |
+ rmdir "${ED}"/var/run |
| 100 |
} |
| 101 |
|
| 102 |
pkg_postinst() { |
Archives