[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/, www-servers/cherokee/files/, profiles/

2020-10-09 Thread Michał Górny
commit: 32b08650cb9978cfac955ab232858feea15e1a6b
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct  9 07:20:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct  9 07:21:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b08650

www-servers/cherokee: Remove last-rited pkg

Bug: https://bugs.gentoo.org/715204
Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask  |   8 -
 www-servers/cherokee/Manifest  |   1 -
 www-servers/cherokee/cherokee-1.2.104-r2.ebuild| 197 -
 .../cherokee/files/cherokee-1.2.99-gentoo.patch|  38 
 www-servers/cherokee/files/cherokee-confd-1.2.98   |   4 -
 www-servers/cherokee/files/cherokee-initd-1.2.99   |  67 ---
 www-servers/cherokee/files/cherokee.logrotate-r1   |  10 --
 www-servers/cherokee/files/cherokee.service|  10 --
 www-servers/cherokee/metadata.xml  |  15 --
 9 files changed, 350 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 83f88f3f70b..a4e8ad25bcc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -540,14 +540,6 @@ sys-fs/owfs
 # Backport of a module included in Python >= 3.3.
 dev-python/backports-unittest-mock
 
-# Michał Górny  (2020-09-09)
-# Multiple unresolved vulnerabilities.  Last release in 2013 (but has
-# some activity in git).  Not touched by maintainer since 2015.  Stuck
-# on Python 2 (bug #735522) with incorrect eclass usage (bug #710258).
-# Apparently broken with openssl-1.1 (bug #674246).
-# Removal in 30 days.  Bug #715204.
-www-servers/cherokee
-
 # Arfrever Frehtes Taifersar Arahesis  (2020-09-01)
 # Mismatched version (bug #695022). Masked to force upgrade to 
2.0.4_pre20200306162733.
 # (Mask should remain after ebuilds are deleted, until 2021-03-01 or

diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
deleted file mode 100644
index 4b45671aef7..000
--- a/www-servers/cherokee/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cherokee-1.2.104.zip 6200164 BLAKE2B 
55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2
 SHA512 
9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d

diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild 
b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
deleted file mode 100644
index 431f42db0e9..000
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-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"
-HOMEPAGE="https://www.cherokee-project.com/";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam 
php rrdtool ssl static static-libs"
-RDEPEND=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/libpcre
-   >=sys-libs/zlib-1.1.4-r1
-   ffmpeg? ( media-video/ffmpeg )
-   geoip? ( dev-libs/geoip )
-   ldap? ( net-nds/openldap )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   nls? ( virtual/libintl )
-   pam? ( sys-libs/pam )
-   php? ( || (
-   dev-lang/php:*[fpm]
-   dev-lang/php:*[cgi]
-   ) )
-   ssl? (
-   !libressl? (  po/admin/POTFILES.in
-   eautoreconf
-}
-
-src_configure() {
-   local myconf
-
-   if use admin ; then
-   myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
-   else
-   myconf="${myconf} --disable-admin"
-   fi
-
-   # Uses autodetect because --with-php requires path to php-{fpm,cgi}.
-   if ! use php ; then
-   myconf="${myconf} --without-php"
-   fi
-
-   if use static ; then
-   myconf="${myconf} --enable-static-module=all"
-   fi
-
-   local os="Unknown"
-   case "${CHOST}" in
-   *-freebsd*)
-   os="FreeBSD" ;;
-   *-netbsd*)
-   os="NetBSD" ;;
-   *-openbsd*)
-   os="OpenBSD" ;;
-   *)
-   os="Linux" ;;
-   esac
-
-   econf \
-   $(use_enable debug trace) \
-   $(use_enable debug backtraces) \
-   $(use_enable ipv6) \
-   $(use_enable kernel_linux epoll) \
-   $(use_enable nls) \
-   $(use_enable pam) \
-   $(use_enable static-libs static) \
-   $(use_with ffmpeg) \
-   $(use_with g

[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2020-07-28 Thread Aaron Bauman
commit: 5cef516c09efabe862c45a24b1f5d73ba72f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Jul 28 13:53:16 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jul 28 18:20:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cef516c

www-servers/cherokee: use HTTPS, add app-arch/unzip dependency

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16879
Signed-off-by: Aaron Bauman  gentoo.org>

 www-servers/cherokee/cherokee-1.2.104-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild 
b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index c93835e180e..431f42db0e9 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -11,7 +11,7 @@ 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"
-HOMEPAGE="http://www.cherokee-project.com/";
+HOMEPAGE="https://www.cherokee-project.com/";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -43,6 +43,7 @@ DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
 RDEPEND="${COMMON_DEPEND}
rrdtool? ( net-analyzer/rrdtool )"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2020-04-26 Thread David Seifert
commit: b02d95d505e7b12edf5d81e750a82e1efed82a72
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 26 10:59:24 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 26 10:59:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02d95d5

www-servers/cherokee: Replace virtual/ffmpeg

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 .../cherokee/{cherokee-1.2.104-r1.ebuild => cherokee-1.2.104-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild 
b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
similarity index 99%
rename from www-servers/cherokee/cherokee-1.2.104-r1.ebuild
rename to www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index 89557f2f8b9..c93835e180e 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? ( media-video/ffmpeg )
geoip? ( dev-libs/geoip )
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:0= )



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2019-10-12 Thread Mikle Kolyada
commit: 061a9a1f86047240770d9aebf51dd5f27718f350
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 12 18:14:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 12 18:14:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061a9a1f

www-servers/cherokee: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 www-servers/cherokee/cherokee-1.2.104-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild 
b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index 0908c4897ba..d73f066ac20 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:0= )
nls? ( virtual/libintl )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
php? ( || (
dev-lang/php:*[fpm]
dev-lang/php:*[cgi]



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2019-02-26 Thread Brian Evans
commit: ec39e30795cbd9220b1d87a2afac6d7da88d0828
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Feb 26 17:47:06 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Feb 26 17:47:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec39e307

www-servers/cherokee: Revbump for dependencies and EAPI

Non-maintainer commit

Closes: https://bugs.gentoo.org/666084
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 ...e-1.2.104.ebuild => cherokee-1.2.104-r1.ebuild} | 24 +++---
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild 
b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
similarity index 93%
rename from www-servers/cherokee/cherokee-1.2.104.ebuild
rename to www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index adff732826e..0908c4897ba 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? (  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() {



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2017-04-21 Thread David Seifert
commit: a2cb0a17ffc55a340ff461dfe7d172be0be07e0c
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 21 07:32:16 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 21 07:32:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cb0a17

www-servers/cherokee: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/cherokee/cherokee-1.2.104.ebuild | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild 
b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a791ec440a8..adff732826e 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,8 +17,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam 
php rrdtool ssl static static-libs"
+RDEPEND=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="dev-libs/libpcre
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
ffmpeg? ( virtual/ffmpeg )
geoip? ( dev-libs/geoip )
@@ -31,8 +35,8 @@ COMMON_DEPEND="dev-libs/libpcre
dev-lang/php:*[cgi]
) )
ssl? (
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
)
"
 DEPEND="${COMMON_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2015-10-11 Thread Anthony G. Basile
commit: 37c4dbc827282f57a21030df02f083dfeb4d026f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Oct 12 01:12:35 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Oct 12 01:12:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c4dbc8

www-servers/cherokee: allow any slot for php.

Package-Manager: portage-2.2.20.1

 www-servers/cherokee/cherokee-1.2.104.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild 
b/www-servers/cherokee/cherokee-1.2.104.ebuild
index 16b7110..6d4655b 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -28,8 +28,8 @@ COMMON_DEPEND="dev-libs/libpcre
nls? ( virtual/libintl )
pam? ( virtual/pam )
php? ( || (
-   dev-lang/php[fpm]
-   dev-lang/php[cgi]
+   dev-lang/php:*[fpm]
+   dev-lang/php:*[cgi]
) )
ssl? (
!libressl? ( dev-libs/openssl:0 )



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/

2015-10-11 Thread Anthony G. Basile
commit: d3fe3614718c6b8a325e838a9a8a9e0a15d7fda1
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Oct 12 01:10:07 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Oct 12 01:10:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fe3614

www-servers/cherokee: add libressl support

Package-Manager: portage-2.2.20.1

 www-servers/cherokee/cherokee-1.2.104.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild 
b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a78bc08..16b7110 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.cherokee-project.com/";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php 
rrdtool ssl static static-libs"
+IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam 
php rrdtool ssl static static-libs"
 
 COMMON_DEPEND="dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
@@ -31,7 +31,11 @@ COMMON_DEPEND="dev-libs/libpcre
dev-lang/php[fpm]
dev-lang/php[cgi]
) )
-   ssl? ( dev-libs/openssl )"
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   "
 DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
 RDEPEND="${COMMON_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: www-servers/cherokee/, www-servers/cherokee/files/

2015-10-11 Thread Anthony G. Basile
commit: 15f426d9bcbb3ec26e6ceb2e544bd31a993036bd
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Oct 12 01:03:19 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Oct 12 01:03:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f426d9

www-servers/cherokee: remove older 1.2.103 version

Package-Manager: portage-2.2.20.1

 www-servers/cherokee/Manifest  |   2 -
 www-servers/cherokee/cherokee-1.2.103-r2.ebuild| 194 -
 .../cherokee/files/cherokee-1.2.103-linux3.patch   |  36 
 3 files changed, 232 deletions(-)

diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index d62c419..8574268 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,3 +1 @@
-DIST cherokee-1.2.103.zip 5783906 SHA256 
0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 
63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab
 WHIRLPOOL 
00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754
 DIST cherokee-1.2.104.zip 6200164 SHA256 
1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 
9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
 WHIRLPOOL 
b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417
-DIST cherokee-ctk-master.zip 415092 SHA256 
dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 
c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7
 WHIRLPOOL 
92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57

diff --git a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild 
b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
deleted file mode 100644
index 1d87b9e..000
--- a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 eutils multilib pam systemd user
-
-DESCRIPTION="An extremely fast and tiny web server"
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip
-   https://github.com/cherokee/CTK/archive/master.zip   -> 
${PN}-ctk-master.zip"
-HOMEPAGE="http://www.cherokee-project.com/";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php 
rrdtool ssl static static-libs"
-
-COMMON_DEPEND="dev-libs/libpcre
-   >=sys-libs/zlib-1.1.4-r1
-   ffmpeg? ( virtual/ffmpeg )
-   geoip? ( dev-libs/geoip )
-   ldap? ( net-nds/openldap )
-   mysql? ( >=virtual/mysql-5 )
-   nls? ( virtual/libintl )
-   pam? ( virtual/pam )
-   php? ( || (
-   dev-lang/php[fpm]
-   dev-lang/php[cgi]
-   ) )
-   ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-   nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-   rrdtool? ( net-analyzer/rrdtool )"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-src_unpack() {
-   unpack ${A}
-   mv "webserver-${PV}" "${S}" || die
-   rmdir "${S}/admin/CTK" || die
-   mv "CTK-master" "${S}/admin/CTK" || die
-}
-
-pkg_setup() {
-   enewgroup cherokee
-   enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
-   python_setup
-   epatch \
-   "${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
-   "${FILESDIR}/${PN}-1.2.103-linux3.patch"
-
-   "${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
-   eautoreconf
-}
-
-src_configure() {
-   local myconf
-
-   if use admin ; then
-   myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
-   else
-   myconf="${myconf} --disable-admin"
-   fi
-
-   # Uses autodetect because --with-php requires path to php-{fpm,cgi}.
-   if ! use php ; then
-   myconf="${myconf} --without-php"
-   fi
-
-   if use static ; then
-   myconf="${myconf} --enable-static-module=all"
-   fi
-
-   local os="Unknown"
-   case "${CHOST}" in
-   *-freebsd*)
-   os="FreeBSD" ;;
-   *-netbsd*)
-   os="NetBSD" ;;
-   *-openbsd*)
-   os="OpenBSD" ;;
-   *)
-   os="Linux" ;;
-   esac
-
-   econf \
-   $(use_enable debug trace) \
-   $(use_enable debug backtraces) \
-