Removing old
authorPatrick Lauer <patrick@gentoo.org>
Wed, 28 Dec 2011 05:56:19 +0000 (05:56 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Wed, 28 Dec 2011 05:56:19 +0000 (05:56 +0000)
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

www-servers/nginx/ChangeLog
www-servers/nginx/Manifest
www-servers/nginx/nginx-1.1.11.ebuild [deleted file]
www-servers/nginx/nginx-1.1.12.ebuild [deleted file]

index d2ee6d795c12960c728b4c0ec1f3d7210334cea3..4104cb73525f9a888770add6ea0037654abb1a18 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.303 2011/12/28 05:49:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.304 2011/12/28 05:56:19 patrick Exp $
+
+  28 Dec 2011; Patrick Lauer <patrick@gentoo.org> -nginx-1.1.11.ebuild,
+  -nginx-1.1.12.ebuild:
+  Removing old
 
 *nginx-1.1.12-r1 (28 Dec 2011)
 
index 09308b9ceb12c50fb0f7c612409fbb4e879dc1c3..4843eb0aa2501792de7650b1aed1a2e41e7bbcfb 100644 (file)
@@ -2,7 +2,6 @@ AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db
 AUX nginx.init-r2 1867 RMD160 8e23982092f54d973c21519dea5b8c2300c0ba39 SHA1 80a1e9c7cc37dd8cdd1eda689d24b4b3ee19379c SHA256 fe2903b81be956d37feb09ee99ba0b9c952909d6b1165637c893621764bc40c5
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
 DIST nginx-1.0.10.tar.gz 686011 RMD160 875082ff6e9197cc26adf4ee51eeda34b9531e29 SHA1 01304d44048aa57944e935dda8523afd5e5d1e23 SHA256 7221fdb0f2a94875252cb3c406a2cd5895d9bc57874fc1b4f588964fd3361e3c
-DIST nginx-1.1.11.tar.gz 704239 RMD160 8eef7fa6fea1834329b531167130a8102b817747 SHA1 73d65404879d5c130149d9147a16d724b08db62c SHA256 0350274c7b072293f98166a44597e7dddd2c249a1be6bfbeafd97868f49b01a1
 DIST nginx-1.1.12.tar.gz 707120 RMD160 1d09c3b17ee27774657c5be32f7fdcc20252c0b0 SHA1 78e8de01206fa5a150c3494ed313ea1d6b74353a SHA256 0d00f0f928bc8637f200de7bc405ebb95730c923df208624ea56529be44c08f9
 DIST nginx-1.1.8.tar.gz 695829 RMD160 60a8ddd0885b7cb08d5eb1f526dd40f4e4614abd SHA1 e93c4b48379c0240fd4c7af8982faa3c4a7c834f SHA256 2f5d2d08fa59043aaae45c72c16ff052fabe1f5ba95fe5475d4994a5a55c9945
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
@@ -13,9 +12,7 @@ DIST ngx_http_headers_more-0.15.tar.gz 22738 RMD160 2200ab529a086dd6bcf11a9a0470
 DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d142af2d3 SHA1 072d06b7547629b244bebeef7df7425567f264c9 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
 DIST ngx_upload_progress-0.8.3.tar.gz 16694 RMD160 b3c8835a270cda2224f5be35f1afb818821609b3 SHA1 0edae535d1efd50524d9947acaebe3979b06fcfb SHA256 f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
 EBUILD nginx-1.0.10.ebuild 11069 RMD160 e4309920e0541ffffe5b74708e212d7aeb076bf5 SHA1 6272bc96ad05d277565c96db01e2f98152c2a794 SHA256 1d6ebdf3d1fc4d056adcb8181bb9acd5a43d89f5f7c7f3f7b336c42d0559231e
-EBUILD nginx-1.1.11.ebuild 11072 RMD160 6eb91e57beebd9991a2cdff9a81b714953f58e33 SHA1 7850f60ddc10d19fe97433085059edd7af3fd083 SHA256 9977f24f74ed3834ef39eb1635b760769675d273fbdccf9285f9d5631e6b9e5b
 EBUILD nginx-1.1.12-r1.ebuild 11163 RMD160 9d4cf8f51bc375ca730359f6fa8aabd5af388d79 SHA1 1cec7c47048f043a603011c5e6ab11d3d4f3c701 SHA256 0aa0bba8491947fae265a8d1eca717571cd171a475c284b9be00b5ba8085b48f
-EBUILD nginx-1.1.12.ebuild 11072 RMD160 79e855406ba5a1000efbcb00d7344c43e9bb5913 SHA1 63b5eb5db3985b2bcaae2b3bf14eb914e45b23aa SHA256 03d0b3de40667e80f1e3a05f9db8a9e7037e423a1c57bbfd2995fd00abdd26ff
 EBUILD nginx-1.1.8.ebuild 11070 RMD160 f9218657dc97cab0ed43fd6555c9238e10232457 SHA1 94977416cffb30d1dbe953557362c16bd6e8e754 SHA256 d7bad33340ca1089ae68e2b78a0927dabb07756874ffd237b445bcd3fb92d0e0
-MISC ChangeLog 49662 RMD160 b392967e815b0410920199c8b6a4bb5df5dbc64a SHA1 5f020eb4652d4874ca7fe39c85de66e504ede110 SHA256 226436700bafb0e9d4071343b165d04dd12cf9fb3c5f541e8596a8164e694692
+MISC ChangeLog 49774 RMD160 05a2bb7dfb752c91cce6cd6f9e2c9c81fdcd9bfe SHA1 215f9ec29fe3483225e99b73c26cc982ee29ed3a SHA256 fa464ab7806c3c21d7f6f3659f35fd2e55f77ad1a9bf4ac6dd8279698b7ae9a0
 MISC metadata.xml 2465 RMD160 0997961bf70f680aedae4dbca6d77fbc4ef0a8d3 SHA1 f3722efd8f9faea7aaa16cba3ee8a5e195845aca SHA256 803c729fd73dee3a1db72b9130c44d4fed071480206180b2f01e420a03ce0fa8
diff --git a/www-servers/nginx/nginx-1.1.11.ebuild b/www-servers/nginx/nginx-1.1.11.ebuild
deleted file mode 100644 (file)
index 8a04794..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.11.ebuild,v 1.1 2011/12/25 14:48:32 patrick Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="c7c663f"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.15"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-       nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-       nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-       nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-       nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-       nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-       http_upload_progress
-       http_headers_more
-       http_passenger
-       http_push
-       http_cache_purge
-       http_upload
-       http_slowfs_cache"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-       IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-       IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-       IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-       IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       ssl? ( dev-libs/openssl )
-       http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-       nginx_modules_http_geo? ( dev-libs/geoip )
-       nginx_modules_http_gzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip_static? ( sys-libs/zlib )
-       nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-       nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-       nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-       nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-       nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-       if use nginx_modules_http_passenger; then
-               einfo
-               einfo "Passenger support has been removed from the nginx ebuild to"
-               einfo "get rid of file collisions, its broken build system and"
-               einfo "incompatibilities between passenger 2 and 3."
-               einfo
-               einfo "Please switch to passenger-3 standalone or use the"
-               einfo "unicorn gem which provides a sane nginx-like architecture"
-               einfo "out of the box."
-               einfo
-               einfo "For more information on sane ruby deployments with"
-               einfo "passenger-3/unicorn go to:"
-               einfo
-               einfo "https://rvm.beginrescueend.com"
-               einfo
-               die "nginx_modules_http_passenger still in IUSE"
-       fi
-
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 -1 ${PN}
-       eend $?
-
-       if use libatomic; then
-               ewarn "GCC 4.1+ features built-in atomic operations."
-               ewarn "Using libatomic_ops is only needed if using"
-               ewarn "a different compiler or a GCC prior to 4.1"
-       fi
-
-       if [[ -n $NGINX_ADD_MODULES ]]; then
-               ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-               ewarn "This nginx installation is not supported!"
-               ewarn "Make sure you can reproduce the bug without those modules"
-               ewarn "_before_ reporting bugs."
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have to disable"
-               ewarn "all nginx http modules."
-       fi
-}
-
-src_prepare() {
-       sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-}
-
-src_configure() {
-       local myconf= http_enabled= mail_enabled=
-
-       use aio       && myconf+=" --with-file-aio --with-aio_module"
-       use debug     && myconf+=" --with-debug"
-       use ipv6      && myconf+=" --with-ipv6"
-       use libatomic && myconf+=" --with-libatomic"
-       use pcre      && myconf+=" --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf+=" --without-http_${mod}_module"
-               fi
-       done
-
-       for mod in $NGINX_MODULES_OPT; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-                       myconf+=" --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf+=" --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_upload_progress; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_push; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_upload; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-       fi
-
-       if use http || use http-cache; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf+=" --without-http-cache"
-               use ssl && myconf+=" --with-http_ssl_module"
-       else
-               myconf+=" --without-http --without-http-cache"
-       fi
-
-       # MAIL modules
-       for mod in $NGINX_MODULES_MAIL; do
-               if use nginx_modules_mail_${mod}; then
-                       mail_enabled=1
-               else
-                       myconf+=" --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf+=" --with-mail"
-               use ssl && myconf+=" --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf+=" --add-module=${mod}"
-       done
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       tc-export CC
-
-       ./configure \
-               --prefix=/usr \
-               --sbin-path=/usr/sbin/nginx \
-               --conf-path=/etc/${PN}/${PN}.conf \
-               --error-log-path=/var/log/${PN}/error_log \
-               --pid-path=/var/run/${PN}.pid \
-               --lock-path=/var/lock/nginx.lock \
-               --user=${PN} --group=${PN} \
-               --with-cc-opt="-I${ROOT}usr/include" \
-               --with-ld-opt="-L${ROOT}usr/lib" \
-               --http-log-path=/var/log/${PN}/access_log \
-               --http-client-body-temp-path=/var/tmp/${PN}/client \
-               --http-proxy-temp-path=/var/tmp/${PN}/proxy \
-               --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-               --http-scgi-temp-path=/var/tmp/${PN}/scgi \
-               --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
-               ${myconf} || die "configure failed"
-}
-
-src_compile() {
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-       keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-       keepdir /var/www/localhost/htdocs
-
-       dosbin objs/nginx
-       newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
-       cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-       rm conf/win-utf conf/koi-win conf/koi-utf
-
-       dodir /etc/${PN}
-       insinto /etc/${PN}
-       doins conf/*
-
-       doman man/nginx.8
-       dodoc CHANGES* README
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/nginx.logrotate nginx
-
-       if use nginx_modules_http_perl; then
-               cd "${S}"/objs/src/http/modules/perl/
-               einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-               fixlocalpod
-       fi
-
-       if use nginx_modules_http_push; then
-               docinto ${HTTP_PUSH_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               docinto ${HTTP_CACHE_PURGE_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-       fi
-
-       if use nginx_modules_http_upload; then
-               docinto ${HTTP_UPLOAD_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
-       fi
-}
-
-pkg_postinst() {
-       if use ssl; then
-               if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-                       install_cert /etc/ssl/${PN}/${PN}
-                       chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-               fi
-       fi
-}
diff --git a/www-servers/nginx/nginx-1.1.12.ebuild b/www-servers/nginx/nginx-1.1.12.ebuild
deleted file mode 100644 (file)
index 44a278c..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.12.ebuild,v 1.1 2011/12/27 07:40:00 patrick Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="c7c663f"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.15"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-       nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-       nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-       nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-       nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-       nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-       http_upload_progress
-       http_headers_more
-       http_passenger
-       http_push
-       http_cache_purge
-       http_upload
-       http_slowfs_cache"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-       IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-       IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-       IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-       IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       ssl? ( dev-libs/openssl )
-       http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-       nginx_modules_http_geo? ( dev-libs/geoip )
-       nginx_modules_http_gzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip_static? ( sys-libs/zlib )
-       nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-       nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-       nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-       nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-       nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-       if use nginx_modules_http_passenger; then
-               einfo
-               einfo "Passenger support has been removed from the nginx ebuild to"
-               einfo "get rid of file collisions, its broken build system and"
-               einfo "incompatibilities between passenger 2 and 3."
-               einfo
-               einfo "Please switch to passenger-3 standalone or use the"
-               einfo "unicorn gem which provides a sane nginx-like architecture"
-               einfo "out of the box."
-               einfo
-               einfo "For more information on sane ruby deployments with"
-               einfo "passenger-3/unicorn go to:"
-               einfo
-               einfo "https://rvm.beginrescueend.com"
-               einfo
-               die "nginx_modules_http_passenger still in IUSE"
-       fi
-
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 -1 ${PN}
-       eend $?
-
-       if use libatomic; then
-               ewarn "GCC 4.1+ features built-in atomic operations."
-               ewarn "Using libatomic_ops is only needed if using"
-               ewarn "a different compiler or a GCC prior to 4.1"
-       fi
-
-       if [[ -n $NGINX_ADD_MODULES ]]; then
-               ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-               ewarn "This nginx installation is not supported!"
-               ewarn "Make sure you can reproduce the bug without those modules"
-               ewarn "_before_ reporting bugs."
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have to disable"
-               ewarn "all nginx http modules."
-       fi
-}
-
-src_prepare() {
-       sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-}
-
-src_configure() {
-       local myconf= http_enabled= mail_enabled=
-
-       use aio       && myconf+=" --with-file-aio --with-aio_module"
-       use debug     && myconf+=" --with-debug"
-       use ipv6      && myconf+=" --with-ipv6"
-       use libatomic && myconf+=" --with-libatomic"
-       use pcre      && myconf+=" --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf+=" --without-http_${mod}_module"
-               fi
-       done
-
-       for mod in $NGINX_MODULES_OPT; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-                       myconf+=" --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf+=" --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_upload_progress; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_push; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_upload; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-       fi
-
-       if use http || use http-cache; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf+=" --without-http-cache"
-               use ssl && myconf+=" --with-http_ssl_module"
-       else
-               myconf+=" --without-http --without-http-cache"
-       fi
-
-       # MAIL modules
-       for mod in $NGINX_MODULES_MAIL; do
-               if use nginx_modules_mail_${mod}; then
-                       mail_enabled=1
-               else
-                       myconf+=" --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf+=" --with-mail"
-               use ssl && myconf+=" --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf+=" --add-module=${mod}"
-       done
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       tc-export CC
-
-       ./configure \
-               --prefix=/usr \
-               --sbin-path=/usr/sbin/nginx \
-               --conf-path=/etc/${PN}/${PN}.conf \
-               --error-log-path=/var/log/${PN}/error_log \
-               --pid-path=/var/run/${PN}.pid \
-               --lock-path=/var/lock/nginx.lock \
-               --user=${PN} --group=${PN} \
-               --with-cc-opt="-I${ROOT}usr/include" \
-               --with-ld-opt="-L${ROOT}usr/lib" \
-               --http-log-path=/var/log/${PN}/access_log \
-               --http-client-body-temp-path=/var/tmp/${PN}/client \
-               --http-proxy-temp-path=/var/tmp/${PN}/proxy \
-               --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-               --http-scgi-temp-path=/var/tmp/${PN}/scgi \
-               --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
-               ${myconf} || die "configure failed"
-}
-
-src_compile() {
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-       keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-       keepdir /var/www/localhost/htdocs
-
-       dosbin objs/nginx
-       newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
-       cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-       rm conf/win-utf conf/koi-win conf/koi-utf
-
-       dodir /etc/${PN}
-       insinto /etc/${PN}
-       doins conf/*
-
-       doman man/nginx.8
-       dodoc CHANGES* README
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/nginx.logrotate nginx
-
-       if use nginx_modules_http_perl; then
-               cd "${S}"/objs/src/http/modules/perl/
-               einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-               fixlocalpod
-       fi
-
-       if use nginx_modules_http_push; then
-               docinto ${HTTP_PUSH_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               docinto ${HTTP_CACHE_PURGE_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-       fi
-
-       if use nginx_modules_http_upload; then
-               docinto ${HTTP_UPLOAD_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
-       fi
-}
-
-pkg_postinst() {
-       if use ssl; then
-               if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-                       install_cert /etc/ssl/${PN}/${PN}
-                       chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-               fi
-       fi
-}