From 4561f6e61a75e08354c5f9356b77f31f0a811816 Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Mon, 4 Jan 2010 11:28:16 +0100 Subject: [PATCH] change ebuild to new upstream style. --- www-servers/nginx/Manifest | 2 +- www-servers/nginx/nginx-0.8.30.ebuild | 40 +++++++++++++++++---------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 95eec2b..cd9ab42 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -5,5 +5,5 @@ AUX nginx.conf-r4 878 RMD160 9515d77df5ce3f56e7bb06c7274b0b22b1f5a7c2 SHA1 83e00 AUX nginx.logrotate 195 RMD160 56a165a6a42355f36f2d125318105708dfb948e1 SHA1 19cfc313d815c57c64df55282ae627c11280a6a6 SHA256 16fcd09e7c62b5693a4eed0924494c9794cd2e86d0e0f4d2d77519b75bf69bb6 DIST nginx-0.8.30.tar.gz 617971 RMD160 5cb7d1c929458c3463954a8ec1af308d47d63740 SHA1 32c018b5c9cbc6d487125d7cbee3e131e08e0d0e SHA256 ed79a8201299ae90181d4623004ed5329054e3a78291e5e416a9341e036353d5 DIST ngx_http_auth_pam_module-1.1.tar.gz 5193 RMD160 38437a1f5d34f93b22abb9f0a7181be756356d33 SHA1 d04065a512169925dda8bce710e1dc5012cac47b SHA256 ea9da5f106b952729398248cddabbe25f7a5752993e91c9b8252dbc2b03b8ecd -EBUILD nginx-0.8.30.ebuild 3950 RMD160 b7b1c9cf7b99f1df6cfdb2fbea01a8e47d06c16f SHA1 481ef413e062148ab6fce9e319f593c33e457e07 SHA256 a6816f89cd7d734007241582f6a5647ddf3a88edc94d3832f19ef255bea89098 +EBUILD nginx-0.8.30.ebuild 4307 RMD160 4f494e92f9c0256b1046bc6285d5f4b29f631a28 SHA1 e8d46f605996f0a05311f440e8850ac5bd07bd3b SHA256 912587cc07e023ce95523604d56c4af120db11168b352072d0c19f479415187a MISC metadata.xml 711 RMD160 c2426ecf2ca328c1822edcd4fe4e1eb5ba9176c0 SHA1 0b9ea8e217537e7255a9bdd2f5668198c738cf09 SHA256 d3b05c228dd62148c8bc7e46abad586eb9a9f3061ef510e1ed0a4baa77595a99 diff --git a/www-servers/nginx/nginx-0.8.30.ebuild b/www-servers/nginx/nginx-0.8.30.ebuild index 41e9d55..3bce52d 100644 --- a/www-servers/nginx/nginx-0.8.30.ebuild +++ b/www-servers/nginx/nginx-0.8.30.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.13.ebuild,v 1.1 2009/09/06 19:45:39 voxus Exp $ +# $Header: $ -inherit eutils ssl-cert toolchain-funcs versionator +inherit eutils ssl-cert toolchain-funcs perl-module DESCRIPTION="Robust, small and high performance http and reverse proxy server" @@ -13,12 +13,12 @@ SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="addition debug fastcgi file-aio flv imap ipv6 pamauth passenger pcre perl random-index securelink ssl +IUSE="addition aio debug fastcgi flv imap ipv6 pamauth passenger pcre perl pop random-index securelink ssl status sub vim-syntax webdav zlib" DEPEND="dev-lang/perl + dev-libs/openssl pcre? ( >=dev-libs/libpcre-4.2 ) - ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) perl? ( >=dev-lang/perl-5.8 ) pamauth? ( sys-libs/pam ) @@ -33,7 +33,6 @@ pkg_setup() { src_unpack() { unpack ${A} - sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die } @@ -51,6 +50,8 @@ src_compile() { # fi use addition && myconf="${myconf} --with-http_addition_module" + # --- works only with kernel > 2.6.22 + use aio && myconf="${myconf} --with-file-aio" use ipv6 && myconf="${myconf} --with-ipv6" use fastcgi || myconf="${myconf} --without-http_fastcgi_module" use fastcgi && myconf="${myconf} --with-http_realip_module" @@ -61,22 +62,30 @@ src_compile() { } use debug && myconf="${myconf} --with-debug" use ssl && myconf="${myconf} --with-http_ssl_module" - use imap && myconf="${myconf} --with-imap" # pop3/imap4 proxy support use perl && myconf="${myconf} --with-http_perl_module" use pamauth && myconf="${myconf} --add-module=../ngx_http_auth_pam_module-1.1" use status && myconf="${myconf} --with-http_stub_status_module" use webdav && myconf="${myconf} --with-http_dav_module" use sub && myconf="${myconf} --with-http_sub_module" + use realip && myconf="${myconf} --with-http_realip_module" + use static-gzip && myconf="${myconf} --with-http_gzip_static_module" use random-index && myconf="${myconf} --with-http_random_index_module" - use securelink && myconf="${myconf} --with-http_secure_link_module" + use securelink && myconf="${myconf} --with-http_secure_link_module" use passenger && myconf="${myconf} --add-module=`passenger-config --root`/ext/nginx" - # --- works only with kernel > 2.6.22 - use file-aio && myconf="${myconf} --with-file-aio" + if use smtp || use pop || use imap; then + myconf="${myconf} --with-mail" + use ssl && myconf="${myconf} --with-mail_ssl_module" + fi + use imap || myconf="${myconf} --without-mail_imap_module" + use pop || myconf="${myconf} --without-mail_pop3_module" + use smtp || myconf="${myconf} --without-mail_smtp_module" tc-export CC ./configure \ --prefix=/usr \ + --with-cc-opt="-I${ROOT}/usr/include" \ + --with-ld-opt="-L${ROOT}/usr/lib" \ --conf-path=/etc/${PN}/${PN}.conf \ --http-log-path=/var/log/${PN}/access_log \ --error-log-path=/var/log/${PN}/error_log \ @@ -95,8 +104,7 @@ src_install() { keepdir /var/{log,cache}/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} dosbin objs/nginx - cp "${FILESDIR}"/nginx-r1 "${T}"/nginx - doinitd "${T}"/nginx + newinitd "${FILESDIR}"/nginx-r1 nginx || die cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf @@ -106,12 +114,14 @@ src_install() { dodoc CHANGES{,.ru} README - dodir /etc/logrotate.d - cp "${FILESDIR}"/nginx.logrotate ${D}/etc/logrotate.d/nginx + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate nginx || die use perl && { cd "${S}"/objs/src/http/modules/perl/ - einstall DESTDIR="${D}"|| die "failed to install perl stuff" + einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff" + fixlocalpod } }