version bump wrt #375781. cleanup wrt #348501 and #349276.
authorBenedikt Boehm <hollow@gentoo.org>
Mon, 25 Jul 2011 09:26:54 +0000 (09:26 +0000)
committerBenedikt Boehm <hollow@gentoo.org>
Mon, 25 Jul 2011 09:26:54 +0000 (09:26 +0000)
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

www-servers/nginx/ChangeLog
www-servers/nginx/Manifest
www-servers/nginx/files/passenger-3.0.1-cflags.patch [deleted file]
www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch [deleted file]
www-servers/nginx/files/passenger-3.0.1-missing-include.patch [deleted file]
www-servers/nginx/files/passenger-CFLAGS.patch [deleted file]
www-servers/nginx/nginx-0.8.53-r1.ebuild [deleted file]
www-servers/nginx/nginx-0.8.53.ebuild [deleted file]
www-servers/nginx/nginx-1.0.0-r1.ebuild [deleted file]
www-servers/nginx/nginx-1.0.0.ebuild [deleted file]
www-servers/nginx/nginx-1.0.5.ebuild [moved from www-servers/nginx/nginx-1.0.2.ebuild with 99% similarity]

index 377967afc74fa77a7f79824c88deb5d9fa6164b9..8c7548e4c8621a72df13274c7511d2f85acdfe28 100644 (file)
@@ -1,6 +1,16 @@
 # 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.286 2011/07/15 21:16:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.287 2011/07/25 09:26:54 hollow Exp $
+
+*nginx-1.0.5 (25 Jul 2011)
+
+  25 Jul 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.8.53.ebuild,
+  -nginx-0.8.53-r1.ebuild, -nginx-1.0.0.ebuild, -nginx-1.0.0-r1.ebuild,
+  -nginx-1.0.2.ebuild, +nginx-1.0.5.ebuild,
+  -files/passenger-3.0.1-cflags.patch,
+  -files/passenger-3.0.1-missing-auto-feature.patch,
+  -files/passenger-3.0.1-missing-include.patch, -files/passenger-CFLAGS.patch:
+  version bump wrt #375781. cleanup wrt #348501 and #349276.
 
   15 Jul 2011; Markus Meier <maekke@gentoo.org> nginx-1.0.4.ebuild:
   x86 stable, bug #373633
index 1516ea5cdeb0e25d2dd32810f7953e31e7459050..2dbb8b1e511d743518177ace75d5f1e14547c60e 100644 (file)
@@ -1,40 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nginx-0.8.32-ey-balancer.patch 1977 RMD160 fff19fd36b4f29c74b92bb55e6b1366163703b5f SHA1 844b771f567d4f0318977de904ed1559e88cc5c4 SHA256 2f254cdf0e95357226aed112d0798f2dac14b8a4f1392119aac95f75c00a3fac
 AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
 AUX nginx.init-r2 1657 RMD160 a42538ae12cccfad1108fe2fca387ec666f4fd85 SHA1 7a0706894bed322d8b5814de98bca56d48c458d0 SHA256 9fceee69794de55b6da24ff2d11c72f6bc86339e7088c644b165dc35a9d5afa1
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
-AUX passenger-3.0.1-cflags.patch 1005 RMD160 b48c9a96997277059566f1fd88187006fe8a161f SHA1 2e9eea3bc2c5c55475c59cd884507e3af3c65b42 SHA256 138280e03bfc3314bf50d43dfaa697aa09027d108fc39c8572f06d786dc7f202
-AUX passenger-3.0.1-missing-auto-feature.patch 751 RMD160 6fed12aa1aa83ee85cb6155dabec17c0c5a6d363 SHA1 1ebd27a408610a4fc9d7e5bee4ffad322b9ffcf6 SHA256 159ab55e451efe78567c4732631d6b54f7f3c833f9d4fd05ba7b78330c51aa34
-AUX passenger-3.0.1-missing-include.patch 340 RMD160 5e314c6ec809a37c898eed9166a1d0c7e71af41b SHA1 c43aff0bce51143c84f0b24857c4bdec2df161f0 SHA256 a41a53f893ac7737b520d1fec0f2490986aae09afe38d79ab540c141322da7eb
-AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 SHA1 1f9e2df74069a8d863e850a0e7e13bd0e8fc8fcb SHA256 42b5221b418df055cd51d03057d92fb93c4f1bbca56a1ea35cc6f5c5d9e1953d
-DIST nginx-0.8.53.tar.gz 649835 RMD160 2af0c8e108a68a3936aeca646d33ceaf0f1d56c8 SHA1 9bf78f55ef41aa54ab1c5caad94756d8e3e13aec SHA256 8ab8a87beb555d9ea09fe61d0de86a71ea4e90ef7970df0d38f7acfb9bed6dcf
-DIST nginx-1.0.0.tar.gz 654760 RMD160 66a4c62163143c8f12a8e71119efc27e4862862e SHA1 1fc6e4b9ac0c709b6c1269dc44080b512aecd3e7 SHA256 3de3d6caeed56751c24ebc5cfb03475620b9eb0fa999c766a01d44dca674c001
-DIST nginx-1.0.2.tar.gz 659097 RMD160 a0e8e65ddb7ab7c67145b7a8c60ceffb77fa1b48 SHA1 ba501c8dd2231ce316933d57f70382fd1cd8fe2d SHA256 c3aaa6aa79d39b92a09f1e1c41c65d1af1df39a0ef68b8c9da9008a6ffba388e
 DIST nginx-1.0.4.tar.gz 661444 RMD160 378b303ed91dc76cda12f2984b26c3aae9337599 SHA1 0496b7377e583116497f18453003cba3269417e9 SHA256 ff54f7deea3dc69da467f3b4c2c8167d5967a096451148ed362e20fb0203f043
+DIST nginx-1.0.5.tar.gz 662122 RMD160 0dffd97fc59b706e11312f25f7937b7a74acb56c SHA1 34418bb8caade9a1204c6ddafc389edece052617 SHA256 b8c6df4e55a41425b57ba0de5ed8a84722dceb0eb7fbb4123f7f8f314763c8df
 DIST nginx-ey-balancer-0.0.6.tar.gz 13192 RMD160 0e1dee4034023fd83639f1cc8333e05736b40a5c SHA1 2a4a97f7e6253b406775f29cff7b0b6b450563e2 SHA256 0b4728cfba04a452a5b9ebc3e304a6724ea914122d56edf0ff7c3b783205a905
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 DIST nginx_upload_module-2.2.0.tar.gz 25796 RMD160 5734af837be3fe8ec444a7e5e7f6707118594098 SHA1 93d6e83e613a0ce2ed057a434b344fa1b6609b47 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
 DIST ngx-http-headers-more-0.13.tar.gz 76271 RMD160 b11fbdf8e6fba5327fedd22e517da36340ec2473 SHA1 29def6aa44faf906d3c400b6379d6dd65d959590 SHA256 52e2cb3b81327e9225cfa87291b93dd96b798702f8e3b0f20f06d38850fc2629
-DIST ngx_cache_purge-1.2.tar.gz 5807 RMD160 c53fdfcde7b8297267704b3f147d14427ede959a SHA1 d9468cf42432e81ea3a110ec63aae2eb273f5516 SHA256 cb350bcd3649872ffd836048679f34e242f67f851fcec26bb4bf5127b97d89a8
 DIST ngx_cache_purge-1.3.tar.gz 6434 RMD160 d9f5d225b99f3164e80a85b7c7b4bee8bb16ea0e SHA1 ec52989ed545ef2be58414e747e592004794eba6 SHA256 256eec780f0f8f09ed10d5b0e4c3c32883a55d96e814fa0390b880d20745fcdb
-DIST ngx_slowfs_cache-1.5.tar.gz 9785 RMD160 3e226531c01c33f1d102fc046ca7917ad9592101 SHA1 db7929f401c733d9d2a5a25ef07da1c3c4090daa SHA256 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d142af2d3 SHA1 072d06b7547629b244bebeef7df7425567f264c9 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
-DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
-DIST passenger-3.0.1.tar.gz 2958200 RMD160 abf9d25c1d91ba44e6468f186d0e9d2569428842 SHA1 2801e35043ea43d6fae5677a7c36bc43b6fc017e SHA256 765b5528f23a5f65f2cc4b72f2e90d9b93ae777dc36a1f7b6d957b39f3cd55cd
-EBUILD nginx-0.8.53-r1.ebuild 10614 RMD160 31076e4fa4edacd006c95083f636f0b51ada60e2 SHA1 14b7bae0a2361e2d0b9eb3795020e570c216b339 SHA256 75fe08e1d368064cb0a0b5eefc08c5dbaf69caddaa30b3eb4b2ddce7e74691b2
-EBUILD nginx-0.8.53.ebuild 10005 RMD160 c64c36257748f4e8edbe55947d0dc6038cb84964 SHA1 4b4110cfc0f8ff0423fb002ae3a34d7c428c45c8 SHA256 fc95d25bc4daeb1bb1323d790895b0e47f73eafc4b554bc5a737e490a72f5c07
-EBUILD nginx-1.0.0-r1.ebuild 11224 RMD160 d4c1debd4d6170df729afffe5255d94e2f3cdee1 SHA1 8545607410afbcdcfc584385f68c9fff745409b9 SHA256 4d3f9c80de48da58a8c623e046bcd782f8df5533fcc118abf81d83064821b406
-EBUILD nginx-1.0.0.ebuild 9755 RMD160 81052de6debe92ef7ad3bb3bbe755091961f65f4 SHA1 d0d0f5672f7b1e7c1caccdfaed609ccfa201de87 SHA256 ef65f6406193adaf3dbbf68ebe013b5d5f012072d0882b4e7605eb53ef502d3a
-EBUILD nginx-1.0.2.ebuild 11223 RMD160 7b78fb62fb92d6385c55952513e44b235be042d9 SHA1 259da8f160e6a91437297b80c85c2f5ee371f12d SHA256 e13ec5d5e0759261514d11154eac6898a971bbc2dd45a1125a463b2743e6da52
 EBUILD nginx-1.0.4.ebuild 11221 RMD160 6fccf36d7f4462723f1e235c5db52e1aaa714908 SHA1 fc9b16d7805871a35e938ee8cb74f3f7f22e5d9a SHA256 96ead1975358ff9b4ab1c2c5ce0634bf85877098411061eac03d7728f340780e
-MISC ChangeLog 46632 RMD160 e5de7484e1b70bee804a95cc5ff04566d8d0c07e SHA1 50ed3f9c43ab818128bb2fe983a2fc3c0425c02b SHA256 6fa0aa57651053cc69217ecf64fd1328d45ff25ab753b14a41a7f9d403ad727a
+EBUILD nginx-1.0.5.ebuild 11223 RMD160 96a6ad32102cb6cddd2d8b0275685db5284c3db6 SHA1 46fab79c05dff3f6114b6ff747ba5edd17fc1932 SHA256 b2f2368a29f31ba07d5168b39b8c331cc9e64c200f3a538af2319e46a6fa0a55
+MISC ChangeLog 47081 RMD160 feaccba6cae6bd6d26e1a7520ba668126aa7dc75 SHA1 b96721b4bba822a0bd3ca46982c57434301a8101 SHA256 cfb89115f0924e8337953e4e9924d0e57d280cb96a9ddf365e15eba4d8ee6fac
 MISC metadata.xml 2292 RMD160 7f4fcccb4e9a6b603f0459d43a45ca3be0fa4f53 SHA1 0a59c780ca02dd1db34dbb2aecb6220d3b4567a7 SHA256 0f31896a536f46c66c248a89ce24fdf662989ec6bef15ad053b652dff4b4e369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4grl8ACgkQkKaRLQcq0GIo9gCfbXAh02eynQcU6Y7tiGtRtF3Y
-DTEAn3S702Ks9Oxlr7sFG9qWR5A9/YlM
-=D2af
------END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/passenger-3.0.1-cflags.patch b/www-servers/nginx/files/passenger-3.0.1-cflags.patch
deleted file mode 100644 (file)
index ff798fe..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/build/config.rb b/build/config.rb
-index 8905bd8..64199fb 100644
---- a/build/config.rb
-+++ b/build/config.rb
-@@ -24,11 +24,7 @@
- OPTIMIZE = boolean_option("OPTIMIZE")
- CC       = string_option("CC", "gcc")
- CXX      = string_option("CXX", "g++")
--if OPTIMIZE
--      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
--else
--      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
--end
-+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG -DBOOST_DISABLE_ASSERTS".strip
- 
- # Extra compiler flags that should always be passed to the C/C++ compiler.
- # Should be included last in the command string, even after PlatformInfo.portability_cflags.
-@@ -39,4 +35,4 @@ EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip
- EXTRA_LDFLAGS  = ""
- 
- # Whether to use the vendored libev or the system one.
--USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
-\ No newline at end of file
-+USE_VENDORED_LIBEV = false
diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch b/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch
deleted file mode 100644 (file)
index c4c6cae..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-from http://code.google.com/p/phusion-passenger/issues/detail?id=595
-
---- ../passenger-3.0.1/ext/nginx/config.orig   2010-12-08 13:48:23.964424406 +0000
-+++ ../passenger-3.0.1/ext/nginx/config        2010-12-08 13:49:12.078865225 +0000
-@@ -2,10 +2,7 @@
-    ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then
-     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-     echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***"
--    if ! cd $ngx_addon_dir; then
--        exit 1
--    fi
--    if ! rake nginx RELEASE=yes; then
-+    if ! (cd $ngx_addon_dir && rake nginx RELEASE=yes) then
-         exit 1
-     fi
-     echo "*** Phusion Passenger support files have been successfully compiled. ***"
diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-include.patch b/www-servers/nginx/files/passenger-3.0.1-missing-include.patch
deleted file mode 100644 (file)
index 3f0223b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ext/common/RandomGenerator.h b/ext/common/RandomGenerator.h
-index 4a72a5e..836bf66 100644
---- a/ext/common/RandomGenerator.h
-+++ b/ext/common/RandomGenerator.h
-@@ -26,6 +26,7 @@
- #define _PASSENGER_RANDOM_GENERATOR_H_
- 
- #include <string>
-+#include <cerrno>
- 
- #include <boost/noncopyable.hpp>
- #include <boost/shared_ptr.hpp>
diff --git a/www-servers/nginx/files/passenger-CFLAGS.patch b/www-servers/nginx/files/passenger-CFLAGS.patch
deleted file mode 100644 (file)
index bdc848a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- Rakefile.org       2009-10-15 18:45:30.000000000 +0100
-+++ Rakefile   2009-10-16 12:17:25.000000000 +0100
-@@ -39,11 +39,7 @@
- CC  = "gcc"
- CXX = "g++"
- LIBEXT = PlatformInfo.library_extension
--if OPTIMIZE
--      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
--else
--      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
--end
-+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG -DBOOST_DISABLE_ASSERTS"
- 
- # Extra compiler flags that should always be passed to the C/C++ compiler.
- # Should be included last in the command string, even after PlatformInfo.portability_cflags.
diff --git a/www-servers/nginx/nginx-0.8.53-r1.ebuild b/www-servers/nginx/nginx-0.8.53-r1.ebuild
deleted file mode 100644 (file)
index bbc60f4..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-0.8.53-r1.ebuild,v 1.2 2011/05/24 07:08:12 hollow Exp $
-
-EAPI="2"
-
-# 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 3 requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# http_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="3.0.1"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.2"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
-       http://www.modrails.com/
-       http://pushmodule.slact.net/
-       http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-       nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
-       nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-       nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )"
-
-LICENSE="BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~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
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push"
-
-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 )
-       nginx_modules_http_passenger? (
-               $(ruby_implementation_depend ruby18)
-               >=dev-ruby/rubygems-0.9.0
-               >=dev-ruby/rake-0.8.1
-               >=dev-ruby/fastthread-1.0.1
-               >=dev-ruby/rack-1.0.0
-               dev-libs/libev
-       )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 -1 ${PN}
-       eend ${?}
-
-       if use ipv6; then
-               ewarn "Note that ipv6 support in nginx is still experimental."
-               ewarn "Be sure to read comments on gentoo bug #274614"
-               ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-       fi
-
-       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 nginx_modules_http_passenger; then
-               ruby-ng_pkg_setup
-               use debug && append-flags -DPASSENGER_DEBUG
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have to disable"
-               ewarn "all nginx http modules."
-       fi
-}
-
-src_unpack() {
-       # prevent ruby-ng.eclass from messing with src_unpack
-       default
-}
-
-src_prepare() {
-       sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-       if use nginx_modules_http_passenger; then
-               cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-               epatch \
-                       "${FILESDIR}/passenger-3.0.1-cflags.patch" \
-                       "${FILESDIR}/passenger-3.0.1-missing-include.patch" \
-                       "${FILESDIR}/passenger-3.0.1-missing-auto-feature.patch"
-
-               sed -i \
-                       -e 's|/usr/lib/phusion-passenger/agents|/usr/libexec/passenger/agents|' \
-                       -e 's|/usr/share/phusion-passenger/helper-scripts|/usr/libexec/passenger/bin|' \
-                       -e "s|/usr/share/doc/phusion-passenger|/usr/share/doc/${PF}|" \
-                       lib/phusion_passenger.rb ext/common/ResourceLocator.h || die "sed failed"
-       fi
-}
-
-src_configure() {
-       local myconf= http_enabled= mail_enabled=
-
-       use aio && myconf="${myconf} --with-file-aio --with-aio_module"
-       use debug && myconf="${myconf} --with-debug"
-       use ipv6 && myconf="${myconf} --with-ipv6"
-       use libatomic && myconf="${myconf} --with-libatomic"
-       use pcre && myconf="${myconf} --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf="${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="${myconf} --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf="${myconf} --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_passenger; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
-       fi
-
-       if use nginx_modules_http_push; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use http || use http-cache; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf="${myconf} --without-http-cache"
-               use ssl && myconf="${myconf} --with-http_ssl_module"
-       else
-               myconf="${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="${myconf} --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf="${myconf} --with-mail"
-               use ssl && myconf="${myconf} --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf="${myconf} --add-module=${mod}"
-       done
-
-       # http://bugs.gentoo.org/show_bug.cgi?id=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() {
-       # http://bugs.gentoo.org/show_bug.cgi?id=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}
-
-       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/*
-
-       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}
-       fi
-
-       if use nginx_modules_http_passenger; then
-               # passengers Rakefile is so horribly broken that we have to do it
-               # manually
-               cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
-               export RUBY="ruby18"
-
-               insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')
-               insopts -m 0755
-               doins ext/ruby/*/passenger_native_support.so
-               doruby -r lib/phusion_passenger lib/phusion_passenger.rb
-
-               exeinto /usr/bin
-               doexe bin/passenger-memory-stats bin/passenger-status
-
-               exeinto /usr/libexec/passenger/bin
-               doexe helper-scripts/passenger-spawn-server
-
-               exeinto /usr/libexec/passenger/agents
-               doexe agents/Passenger{LoggingAgent,Watchdog}
-
-               exeinto /usr/libexec/passenger/agents/nginx
-               doexe agents/nginx/PassengerHelperAgent
-       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-0.8.53.ebuild b/www-servers/nginx/nginx-0.8.53.ebuild
deleted file mode 100644 (file)
index 3b5b7e7..0000000
+++ /dev/null
@@ -1,328 +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-0.8.53.ebuild,v 1.5 2011/05/24 07:08:12 hollow Exp $
-
-EAPI="2"
-
-# 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 3 requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# http_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.2"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
-       http://www.modrails.com/
-       http://pushmodule.slact.net/
-       http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-       nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
-       nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-       nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )"
-
-LICENSE="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
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push"
-
-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 )
-       nginx_modules_http_passenger? (
-               $(ruby_implementation_depend ruby18)
-               >=dev-ruby/rubygems-0.9.0
-               >=dev-ruby/rake-0.8.1
-               >=dev-ruby/fastthread-1.0.1
-               >=dev-ruby/rack-1.0.0
-       )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 -1 ${PN}
-       eend ${?}
-
-       if use ipv6; then
-               ewarn "Note that ipv6 support in nginx is still experimental."
-               ewarn "Be sure to read comments on gentoo bug #274614"
-               ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-       fi
-
-       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 nginx_modules_http_passenger; then
-               ruby-ng_pkg_setup
-               use debug && append-flags -DPASSENGER_DEBUG
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have to disable"
-               ewarn "all nginx http modules."
-       fi
-}
-
-src_unpack() {
-       # prevent ruby-ng.eclass from messing with src_unpack
-       default
-}
-
-src_prepare() {
-       sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-       if use nginx_modules_http_passenger; then
-               cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-               epatch "${FILESDIR}"/passenger-CFLAGS.patch
-       fi
-}
-
-src_configure() {
-       local myconf= http_enabled= mail_enabled=
-
-       use aio && myconf="${myconf} --with-file-aio --with-aio_module"
-       use debug && myconf="${myconf} --with-debug"
-       use ipv6 && myconf="${myconf} --with-ipv6"
-       use libatomic && myconf="${myconf} --with-libatomic"
-       use pcre && myconf="${myconf} --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf="${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="${myconf} --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf="${myconf} --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_passenger; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
-       fi
-
-       if use nginx_modules_http_push; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use http || use http-cache; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf="${myconf} --without-http-cache"
-               use ssl && myconf="${myconf} --with-http_ssl_module"
-       else
-               myconf="${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="${myconf} --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf="${myconf} --with-mail"
-               use ssl && myconf="${myconf} --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf="${myconf} --add-module=${mod}"
-       done
-
-       # http://bugs.gentoo.org/show_bug.cgi?id=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() {
-       # http://bugs.gentoo.org/show_bug.cgi?id=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}
-
-       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/*
-
-       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}
-       fi
-
-       if use nginx_modules_http_passenger; then
-               # passengers Rakefile is so horribly broken that we have to do it
-               # manually
-               cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
-               export RUBY="ruby18"
-
-               insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
-               insopts -m 0755
-               doins ext/phusion_passenger/*.so
-               doruby -r lib/phusion_passenger
-
-               exeinto /usr/bin
-               doexe bin/passenger-memory-stats bin/passenger-status
-
-               exeinto /usr/libexec/passenger/bin
-               doexe bin/passenger-spawn-server
-
-               exeinto /usr/libexec/passenger/ext/nginx
-               doexe ext/nginx/HelperServer
-       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.0.0-r1.ebuild b/www-servers/nginx/nginx-1.0.0-r1.ebuild
deleted file mode 100644 (file)
index aa9e4a2..0000000
+++ /dev/null
@@ -1,344 +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.0.0-r1.ebuild,v 1.5 2011/05/24 21:12:51 maekke Exp $
-
-EAPI="2"
-
-# 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 3 requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# 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_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.2"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# 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}"
-
-# ey-balancer/maxconn module (https://github.com/ry/nginx-ey-balancer, as-is)
-HTTP_EY_BALANCER_MODULE_PV="0.0.6"
-HTTP_EY_BALANCER_MODULE_P="nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_PV}"
-HTTP_EY_BALANCER_MODULE_SHA1="d373670"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.5"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-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.net/
-       http://pushmodule.slact.net/
-       http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-       nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-       nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz )
-       nginx_modules_http_ey_balancer? ( https://github.com/ry/nginx-ey-balancer/tarball/v${HTTP_EY_BALANCER_MODULE_PV} -> ${HTTP_EY_BALANCER_MODULE_P}.tar.gz )
-       nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )"
-
-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
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push
-http_upload http_ey_balancer 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 ipv6; then
-               ewarn "Note that ipv6 support in nginx is still experimental."
-               ewarn "Be sure to read comments on gentoo bug #274614"
-               ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-       fi
-
-       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
-
-       if use nginx_modules_http_ey_balancer; then
-               epatch "${FILESDIR}"/nginx-0.8.32-ey-balancer.patch
-       fi
-}
-
-src_configure() {
-       local myconf= http_enabled= mail_enabled=
-
-       use aio && myconf="${myconf} --with-file-aio --with-aio_module"
-       use debug && myconf="${myconf} --with-debug"
-       use ipv6 && myconf="${myconf} --with-ipv6"
-       use libatomic && myconf="${myconf} --with-libatomic"
-       use pcre && myconf="${myconf} --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf="${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="${myconf} --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf="${myconf} --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf="${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="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_upload; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_ey_balancer; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}"
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf="${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="${myconf} --without-http-cache"
-               use ssl && myconf="${myconf} --with-http_ssl_module"
-       else
-               myconf="${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="${myconf} --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf="${myconf} --with-mail"
-               use ssl && myconf="${myconf} --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf="${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}
-
-       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}
-       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_ey_balancer; then
-               docinto ${HTTP_EY_BALANCER_MODULE_P}
-               dodoc "${WORKDIR}"/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}/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.0.0.ebuild b/www-servers/nginx/nginx-1.0.0.ebuild
deleted file mode 100644 (file)
index df8320b..0000000
+++ /dev/null
@@ -1,309 +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.0.0.ebuild,v 1.2 2011/05/24 07:08:12 hollow Exp $
-
-EAPI="2"
-
-# 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 3 requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
-
-# 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_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.2"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# 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}"
-
-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.net/
-       http://pushmodule.slact.net/
-       http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-       nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-       nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz )"
-
-LICENSE="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
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push
-http_upload"
-
-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 ipv6; then
-               ewarn "Note that ipv6 support in nginx is still experimental."
-               ewarn "Be sure to read comments on gentoo bug #274614"
-               ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-       fi
-
-       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="${myconf} --with-file-aio --with-aio_module"
-       use debug && myconf="${myconf} --with-debug"
-       use ipv6 && myconf="${myconf} --with-ipv6"
-       use libatomic && myconf="${myconf} --with-libatomic"
-       use pcre && myconf="${myconf} --with-pcre"
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       myconf="${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="${myconf} --with-http_${mod}_module"
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf="${myconf} --with-http_realip_module"
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf="${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="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_upload; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-       fi
-
-       if use http || use http-cache; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf="${myconf} --without-http-cache"
-               use ssl && myconf="${myconf} --with-http_ssl_module"
-       else
-               myconf="${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="${myconf} --without-mail_${mod}_module"
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf="${myconf} --with-mail"
-               use ssl && myconf="${myconf} --with-mail_ssl_module"
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf="${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}
-
-       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}
-       fi
-
-       if use nginx_modules_http_upload; then
-               docinto ${HTTP_UPLOAD_MODULE_P}
-               dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,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
-}
similarity index 99%
rename from www-servers/nginx/nginx-1.0.2.ebuild
rename to www-servers/nginx/nginx-1.0.5.ebuild
index e72e8a8dac42c9286281eb4ade1fba21b3045bc1..18e776e05af314047758685438010af7ba2fb39e 100644 (file)
@@ -1,6 +1,6 @@
 # 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.0.2.ebuild,v 1.4 2011/06/02 06:07:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.5.ebuild,v 1.1 2011/07/25 09:26:54 hollow Exp $
 
 EAPI="2"