commit: 15f426d9bcbb3ec26e6ceb2e544bd31a993036bd Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Mon Oct 12 01:03:19 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Oct 12 01:03:19 2015 +0000 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..0000000 --- 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) \ - $(use_enable ipv6) \ - $(use_enable kernel_linux epoll) \ - $(use_enable nls) \ - $(use_enable pam) \ - $(use_enable static-libs static) \ - $(use_with ffmpeg) \ - $(use_with geoip) \ - $(use_with ldap) \ - $(use_with mysql) \ - $(use_with ssl libssl) \ - --disable-dependency-tracking \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-os-string="Gentoo ${os}" \ - --enable-tmpdir="${EPREFIX}/var/tmp" \ - --localstatedir="${EPREFIX}/var" \ - --with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \ - --with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \ - --with-wwwuser=cherokee \ - --with-wwwgroup=cherokee \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - elif ! use static ; then - find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die - fi - - dodoc AUTHORS NEWS README.rst - - if use pam ; then - pamd_mimic system-auth cherokee auth account session || die - fi - - newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN} - newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} - - if ! use admin ; then - rm -r \ - "${ED}"/usr/bin/cherokee-admin-launcher \ - "${ED}"/usr/bin/CTK-run \ - "${ED}"/usr/sbin/cherokee-admin \ - "${ED}"/usr/share/cherokee/admin || die - fi - - exeinto /usr/share/doc/${PF}/contrib - doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} - - #move the htdocs to docdir, bug #429632 - docompress -x /usr/share/doc/"${PF}"/htdocs.dist - mv "${ED}"${WEBROOT}/htdocs \ - "${ED}"/usr/share/doc/"${PF}"/htdocs.dist - mkdir "${ED}"${WEBROOT}/htdocs - - keepdir \ - "${WEBROOT}"/htdocs \ - /var/log/cherokee \ - /var/lib/cherokee/graphs/images - fowners cherokee:cherokee \ - /var/log/cherokee \ - /var/lib/cherokee/graphs \ - /var/lib/cherokee/graphs/images - - # logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN} - - systemd_dounit "${FILESDIR}"/cherokee.service -} - -pkg_postinst() { - elog - if use admin ; then - elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"; - elog - elog "Cherokee currently supports configuration versioning, so from now on," - elog "whenever a change is made to the configuration file format," - elog "Cherokee-Admin will be able to automatically convert yours to the new" - elog "release. You simply have to load Cherokee-Admin and it will be converted" - elog "once you proceed to saving it." - elog - elog "There is also a command line utility that you can use to do the exact" - elog "same thing. Config format can change in different versions. It is" - elog "provided under:" - elog " ${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py" - else - elog "Try USE=admin if you want an easy way to configure cherokee." - fi - elog - elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}." - elog -} diff --git a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch deleted file mode 100644 index 7f96f68..0000000 --- a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur webserver-1.2.103.orig/admin/SystemStats.py webserver-1.2.103/admin/SystemStats.py ---- webserver-1.2.103.orig/admin/SystemStats.py 2013-01-26 17:52:44.000000000 -0500 -+++ webserver-1.2.103/admin/SystemStats.py 2013-07-15 07:27:11.000000000 -0400 -@@ -39,7 +39,7 @@ - global _stats - - if not _stats: -- if sys.platform == 'linux2': -+ if sys.platform == 'linux2' or sys.platform == 'linux3': - _stats = System_stats__Linux() - elif sys.platform == 'darwin': - _stats = System_stats__Darwin() -diff -Naur webserver-1.2.103.orig/admin/util.py webserver-1.2.103/admin/util.py ---- webserver-1.2.103.orig/admin/util.py 2013-01-26 17:52:44.000000000 -0500 -+++ webserver-1.2.103/admin/util.py 2013-07-15 07:29:12.000000000 -0400 -@@ -341,7 +341,7 @@ - def os_get_document_root(): - if sys.platform == 'darwin': - return "/Library/WebServer/Documents" -- elif sys.platform == 'linux2': -+ elif sys.platform == 'linux2' or sys.platform == 'linux3': - if os.path.exists ("/etc/redhat-release"): - return '/var/www' - elif os.path.exists ("/etc/fedora-release"): -diff -Naur webserver-1.2.103.orig/admin/wizards/php.py webserver-1.2.103/admin/wizards/php.py ---- webserver-1.2.103.orig/admin/wizards/php.py 2013-01-26 17:52:44.000000000 -0500 -+++ webserver-1.2.103/admin/wizards/php.py 2013-07-15 07:29:47.000000000 -0400 -@@ -607,7 +607,7 @@ - first_group = str(root_group) - - # Systems -- if sys.platform == 'linux2': -+ if sys.platform == 'linux2' or sys.platform == 'linux3': - if os.getuid() == 0: - return root_group - return first_group
