diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
| commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
| tree | 3cb05783d73b2c33589ba305144a31c718e123cd /www-servers/cherokee | |
| parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) | |
gentoo resync : 03.03.2019
Diffstat (limited to 'www-servers/cherokee')
| -rw-r--r-- | www-servers/cherokee/Manifest | 2 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.2.104-r1.ebuild (renamed from www-servers/cherokee/cherokee-1.2.104.ebuild) | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index fc457d40b88f..4c88db6892bd 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -4,5 +4,5 @@ AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4 AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d -EBUILD cherokee-1.2.104.ebuild 4947 BLAKE2B ff30d65f366172c7459c8a0c1f14e0c5e588f88c52d1435e880a963b6a9f5ce8e77cc6e58b845c6fbc7f371bc5c475730639b7e77e7cd3319b5487abf4edaa96 SHA512 715f2e8bdbc7a98cedd60bd685195b02b7e3026f247d6f18f67ba14ed0ffa43bfcc8e97d6ab20fe7c0d64a4808cd62b623ee51d9ae567dd711a87d8385dd8a9c +EBUILD cherokee-1.2.104-r1.ebuild 4964 BLAKE2B 029d8ad7715dfdff093e455fcf9fab5d24822dfc078b3a3af33036d0f565df2a38bc83db0f3495e12801cd6c7148fe553cf7863632e6c31e50ac1709d887973f SHA512 191da8332104f432303da4614088861195bcd2d7cec8db8b09547e8a69408cc05245e72b2d9fa99f2c65f22f7f32226d92dcc0d2a2a669f195ece722eafc50c3 MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild index adff732826e5..0908c4897baa 100644 --- a/www-servers/cherokee/cherokee-1.2.104.ebuild +++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 WANT_AUTOMAKE="1.11" PYTHON_COMPAT=( python2_7 ) -inherit autotools python-r1 eutils multilib pam systemd user +inherit autotools python-r1 pam systemd user DESCRIPTION="An extremely fast and tiny web server" SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip" @@ -27,7 +27,7 @@ COMMON_DEPEND=" ffmpeg? ( virtual/ffmpeg ) geoip? ( dev-libs/geoip ) ldap? ( net-nds/openldap ) - mysql? ( >=virtual/mysql-5 ) + mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libintl ) pam? ( virtual/pam ) php? ( || ( @@ -35,7 +35,7 @@ COMMON_DEPEND=" dev-lang/php:*[cgi] ) ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) + !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) " @@ -48,10 +48,8 @@ RESTRICT="test" WEBROOT="/var/www/localhost" -src_unpack() { - unpack ${A} - mv "webserver-${PV}" "${S}" || die -} +PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" ) +S="${WORKDIR}/webserver-${PV}" pkg_setup() { enewgroup cherokee @@ -60,8 +58,7 @@ pkg_setup() { src_prepare() { python_setup - epatch \ - "${FILESDIR}/${PN}-1.2.99-gentoo.patch" + default "${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in eautoreconf @@ -123,7 +120,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default if ! use static-libs ; then find "${ED}" -name '*.la' -delete || die @@ -171,6 +168,9 @@ src_install() { newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN} systemd_dounit "${FILESDIR}"/cherokee.service + + # Fix QA error - not important if it fails + rmdir "${ED}"/var/run } pkg_postinst() { |