- cleanup

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

8 files changed, 10 insertions, 673 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index faa94ee259ea..b9a1813d1ead 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.227 2009/09/18 19:22:29 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.228 2009/09/21 17:50:39 voxus Exp $
+
+  21 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.5.37.ebuild, -nginx-0.6.38.ebuild, -nginx-0.7.61.ebuild,
+  -nginx-0.8.4.ebuild, -nginx-0.8.4-r1.ebuild, -nginx-0.8.13.ebuild:
+  Cleanup.
 
   18 Sep 2009; Tobias Heinlein <keytoaster@gentoo.org> nginx-0.5.38.ebuild,
   nginx-0.6.39.ebuild, nginx-0.7.62.ebuild:
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 4c93c6e96ef2..252ff0696575 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -9,31 +9,20 @@ AUX nginx.conf-r1 966 RMD160 b4b9e54860f14a106b186cfc02dbb00e15df694d SHA1 0bc41
 AUX nginx.conf-r2 1044 RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef SHA1 988e59f8aeabb8b4b1e412f4dfc8ddfa96ee5da4 SHA256 722b5588c975c523caea14bd90866be5d260f7d0fcdf1af90d2110b2db7ee448
 AUX nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c SHA1 5ddb38fd85e1a99f69b5efc62b22a4633c924f67 SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc
 AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6
-DIST nginx-0.5.37.tar.gz 490028 RMD160 7314477c63d8fecb0b81a97230afe0e47dde7978 SHA1 44d50e773254a196f8b0c895acba502d52b87550 SHA256 cc6d5b695fdaff1bbaed7019b7af82c0884df7d181f26cf8eeb01c915289e317
 DIST nginx-0.5.38.tar.gz 490220 RMD160 95d39df12e4756d03844c68374ec7dd52659b48b SHA1 5636e2880a0baf7244befdb055e77c59f21f95c4 SHA256 d601e3b08c3f1fe4a64eac1b9fec876cbc57b99696d5a322c1d9d3ddb01713c9
-DIST nginx-0.6.38.tar.gz 528956 RMD160 9ecb90e31b9576b597786bfdfb8906a1a662ea9b SHA1 9857211846200b2edc3461f6621c659e249c7a7c SHA256 4e391b79021a94c9866c30601d8d4d3a4d86a937b5db806c20a412e09177a737
 DIST nginx-0.6.39.tar.gz 529159 RMD160 b94c1fad3185a520ff7ebb40d17ac2bcbeb04ffb SHA1 ba31c5b64d5d394c788bc3255d93a796b5e0e87e SHA256 daf14292863966b75d0c606b7cd2fbb710d1a5a5e8808ab862205643cc83ff1d
-DIST nginx-0.7.61.tar.gz 594817 RMD160 dfc1a8e03789cd85314ceacb1cd99f277b7ec0af SHA1 4d9b3ac6c108ab00723272dc455647c8c2486526 SHA256 60cb23f38bda93e3bdaa554826b06bc0abf807d2e4352d856c49bd802a3f05d1
 DIST nginx-0.7.62.tar.gz 595995 RMD160 d830ae34f5bac3c494744a8033f32fb7b3107c11 SHA1 6eeb30d3daf7abcca351d9eba78b5adedd6331c5 SHA256 60ee0e9f7f43a7387fec7752a47ff0d06166d2a37a6ad4cfe7aff77162378d2d
-DIST nginx-0.8.13.tar.gz 604752 RMD160 39c0473e9cb1b4910321ec243c149c5f582b75d7 SHA1 de1b13511eac4c68d417d74806771f08d874f565 SHA256 916f8dd8d9bdae3b39f9c63f3469291d4afb05e4ddf7c39ef377ea69c484f2fb
 DIST nginx-0.8.15.tar.gz 605698 RMD160 db584ed63c4aa42e7041c78acd1000e5ae9533de SHA1 2ccedd64185f0d060caf60a32d77ad7bc2b7bcab SHA256 b391fa3249d32639b445720bbf4b6948931c9a90e505a72a107e24c664f294d7
-DIST nginx-0.8.4.tar.gz 595288 RMD160 0c2332c8d0680bd04b6af427e3cbccc42d1876d0 SHA1 828ebb4ef1e7f9b80cbe6a6a42adaf180cd777ec SHA256 ffabf25ac25f8d871c7d6034baad1e991a36223fd755436547e59239621732ed
-EBUILD nginx-0.5.37.ebuild 2948 RMD160 78f82e5df19b6f087b004d4d67f8c45e6c2c7d1c SHA1 d2e73605cb7fe74858ee5a82e7bc3f43a28a7ccb SHA256 fb1f1a0d10d1f2ae43f57ec1182c54c2b9c356c145666b19a28cbd1c28ee3a4e
 EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920 SHA1 4b6033ac8b4c63a5b207c9ce478a9bc820e4e18d SHA256 6fc8868965a6a1bca92fddf777f6bfdc6550ca0902cd47db895ab3dec5fa406a
-EBUILD nginx-0.6.38.ebuild 3060 RMD160 56a00c95e0b45093147d11e188fdc0c16b2f1ff2 SHA1 4b0dfd4f51969e48a6f93d8f9752e1a5e89aec52 SHA256 60d1d3188a3e2c508211bfe4fe34cc8f44e543e845fe1e6f481cc6051c9c54aa
 EBUILD nginx-0.6.39.ebuild 3065 RMD160 8d86dee4b70e98c62f1950d7fbc497335f6bd0c0 SHA1 ca5dc97e05ffe1f6d14cf973b3405a338c762d0c SHA256 c55e5dc81dd6f48513152a34f2c3feea6de495994ab8d8fb43ab9096b8ab563a
-EBUILD nginx-0.7.61.ebuild 3261 RMD160 b12e46480f3a1fe714db5270a2a95376cb0684c3 SHA1 da46085272c864c2c23b7fda160033ddd4208d77 SHA256 429de38daad8cfcc32662e4737a481975ada406d8e628194e9f975ad4174b98e
 EBUILD nginx-0.7.62.ebuild 3266 RMD160 c43344c6945dc7b0fe8b36054fda2e21b7a19b22 SHA1 26e76db9a98cbe052ceb4b9e3a4d63ab071f2df7 SHA256 dfb55c9fc3cddbf8f9166096795c9f190300aebb84a3314f13729ff07c4768e0
-EBUILD nginx-0.8.13.ebuild 3593 RMD160 445d32bcc0a3fcece9de6680acf1e35019ab8541 SHA1 0b30ceb310bd7c518a24417ca909acb0beb65d76 SHA256 1a9ece6fe67d5a4498f5efabe3fc67a319dd0cdced188bbec20eadf4dc100fb3
 EBUILD nginx-0.8.15.ebuild 3593 RMD160 dfad6e4f37008af8da5393cf266130d8382688fa SHA1 e9cf033aaab3c686141b2e5400e4abaf47af66bb SHA256 8f9db0d2967f7fe883be7a6465a1fa6deb6f3ec0aa7d1d41438109707101cbc6
-EBUILD nginx-0.8.4-r1.ebuild 3647 RMD160 c612f9fbbed9fd8402d95ba4a36d1b40f6eb31f4 SHA1 d7b6f7ede7cb6a9086d147f92e4ceaac75688a8c SHA256 7b3ae9527f2875b1e70ce7d7bcde2fa853aa3bdf90d541e67b39032a2dce2971
-EBUILD nginx-0.8.4.ebuild 3262 RMD160 28ea88d2decadf55ffb12bf0a6688788f666dec4 SHA1 e9f51f17b406e3ae41cdae698c16b0a479071c77 SHA256 1efb4f0aa40c6d7c5b26efe165d16ff39f4692e7b762125375c8011211d8cf33
-MISC ChangeLog 36940 RMD160 632ff718b2ef2d7b6c0352f250842489ee5e1f76 SHA1 f6ac1c27e7d7e13154d3d820afd6f1b06e83b07d SHA256 0575dc1eda35af5bc60d172e6c71db0168429436d87b907ddd3982853c82dd19
+MISC ChangeLog 37141 RMD160 f51bf2e4ad14d19a02d9a758c7d72e417a0a0a09 SHA1 1a4ed81c3222f4c6813834d30ba83c20f2f7f9d9 SHA256 77afb64402099d712822d5bd0b80ed57f61f8e978f170e637d78d6ea039427b9
 MISC metadata.xml 658 RMD160 7294560d00411e37fcc73d1d93f0582f7991b380 SHA1 85d04bdf906447f68042f21c12b18016059c0371 SHA256 e73d513e05935ab2dceb674477ff4ff70e39e48171782e0882a2a44993f01ce8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqz3f4ACgkQt3UOBHx+2m+47ACbBFqEDEBVAENZVz7j+gYcku+Z
-mtoAn0ovxH6JoJNhwHFqUOeFgT1FCvGI
-=eT4O
+iEYEARECAAYFAkq3vPkACgkQbwxeDFj+ScoObQCgwx2Q5m0eXPh6U4eNTZhgTSyI
+ZjgAoKVOqFHYXRkZ/3zr4a9tCt0EU74d
+=6Pci
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.5.37.ebuild b/www-servers/nginx/nginx-0.5.37.ebuild
deleted file mode 100644
index b8e946f0fc9b..000000000000
--- a/www-servers/nginx/nginx-0.5.37.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.37.ebuild,v 1.2 2008/10/25 17:36:52 voxus Exp $
-
-inherit eutils ssl-cert
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://sysoev.ru/nginx/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup nginx
-	enewuser nginx -1 -1 /dev/null nginx
-	eend ${?}
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 status	&& myconf="${myconf} --with-http_stub_status_module"
-	use webdav	&& myconf="${myconf} --with-http_dav_module"
-	use sub		&& myconf="${myconf} --with-http_sub_module"
-
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir "${ROOT}"/etc/${PN}
-	insinto "${ROOT}"/etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} LICENSE README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			dodir "${ROOT}"/etc/ssl/${PN}
-			insinto "${ROOT}"etc/ssl/${PN}/
-			insopts -m0644 -o nginx -g nginx
-			install_cert /etc/ssl/nginx/nginx
-		fi
-	}
-}
diff --git a/www-servers/nginx/nginx-0.6.38.ebuild b/www-servers/nginx/nginx-0.6.38.ebuild
deleted file mode 100644
index e35c319d5bf4..000000000000
--- a/www-servers/nginx/nginx-0.6.38.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.38.ebuild,v 1.2 2009/07/09 13:44:57 voxus Exp $
-
-inherit eutils ssl-cert
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="addition debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup nginx
-	enewuser nginx -1 -1 /dev/null nginx
-	eend ${?}
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 status	&& myconf="${myconf} --with-http_stub_status_module"
-	use webdav	&& myconf="${myconf} --with-http_dav_module"
-	use sub		&& myconf="${myconf} --with-http_sub_module"
-
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir "${ROOT}"/etc/${PN}
-	insinto "${ROOT}"/etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} LICENSE README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			dodir "${ROOT}"/etc/ssl/${PN}
-			insinto "${ROOT}"etc/ssl/${PN}/
-			insopts -m0644 -o nginx -g nginx
-			install_cert /etc/ssl/nginx/nginx
-		fi
-	}
-}
diff --git a/www-servers/nginx/nginx-0.7.61.ebuild b/www-servers/nginx/nginx-0.7.61.ebuild
deleted file mode 100644
index 7ba7f77c7725..000000000000
--- a/www-servers/nginx/nginx-0.7.61.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.61.ebuild,v 1.2 2009/07/09 13:44:57 voxus Exp $
-
-inherit eutils ssl-cert toolchain-funcs
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap pcre perl random-index ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 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 random-index	&& myconf="${myconf} --with-http_random_index_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		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
-	}
-}
diff --git a/www-servers/nginx/nginx-0.8.13.ebuild b/www-servers/nginx/nginx-0.8.13.ebuild
deleted file mode 100644
index 68fa84cf0a8f..000000000000
--- a/www-servers/nginx/nginx-0.8.13.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2009 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 $
-
-inherit eutils ssl-cert toolchain-funcs
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use ipv6	&& myconf="${myconf} --with-ipv6"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 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 random-index	&& myconf="${myconf} --with-http_random_index_module"
-	use securelink && myconf="${myconf} --with-http_secure_link_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		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
-	}
-}
diff --git a/www-servers/nginx/nginx-0.8.4-r1.ebuild b/www-servers/nginx/nginx-0.8.4-r1.ebuild
deleted file mode 100644
index 1d89f2b9c268..000000000000
--- a/www-servers/nginx/nginx-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.4-r1.ebuild,v 1.1 2009/07/19 14:56:33 cla Exp $
-
-inherit eutils ssl-cert toolchain-funcs
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-	epatch "${FILESDIR}"/${PN}-secure-link-timeout.patch
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use ipv6	&& myconf="${myconf} --with-ipv6"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 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 random-index	&& myconf="${myconf} --with-http_random_index_module"
-	use securelink && myconf="${myconf} --with-http_secure_link_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		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
-	}
-}
diff --git a/www-servers/nginx/nginx-0.8.4.ebuild b/www-servers/nginx/nginx-0.8.4.ebuild
deleted file mode 100644
index 4f17af152b01..000000000000
--- a/www-servers/nginx/nginx-0.8.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.4.ebuild,v 1.1 2009/06/22 10:06:39 voxus Exp $
-
-inherit eutils ssl-cert toolchain-funcs
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap pcre perl random-index ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	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 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 random-index	&& myconf="${myconf} --with-http_random_index_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--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 \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		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
-	}
-}