Import changes from proxy maintainer Johan Bergstroem, https://github.com/gentoo/proxy-maintainers/pull/22

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 33 insertions, 29 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 2a2afcd8b87d..6a3055573849 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.402 2015/03/10 09:34:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.403 2015/03/10 12:45:41 jlec Exp $
+
+  10 Mar 2015; Justin Lecher <jlec@gentoo.org> nginx-1.7.10.ebuild:
+  Import changes from proxy maintainer Johan Bergstroem,
+  https://github.com/gentoo/proxy-maintainers/pull/22
 
 *nginx-1.7.10 (10 Mar 2015)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 58b0da7716d4..47911f5d1575 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -43,28 +43,28 @@ DIST ngx_http_upstream_check-0.3.0.tar.gz 136542 SHA256 c543bf427b38643c10dcd1a0
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e WHIRLPOOL 2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 WHIRLPOOL 64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
 DIST ngx_rtmp-1.1.6.tar.gz 519666 SHA256 4039d1e7febd93188f729b594772d04d8a1137b2e90b12fa53bb061f200add87 SHA512 6db0cc5a3cff600a836483f9cc4ff76860e9c893167561ad818cb41e2eb4fa31af8a4213e42c7c5766e389aed0ad713cffe776aa4bc4ebf279dd63eb65d4162c WHIRLPOOL f23860df6df0de87aa7d65f2411ea7104e635e5b13987853599a06c064b93229c8a900dca84b983e0dcabac96c8918889932cd303836a3cab4ac7c6d7c2a0b10
-EBUILD nginx-1.7.10.ebuild 25508 SHA256 6b185a20edb9ac184e8bfe0d24601bfb9263e1f4ec581caaf016e6302cd524c2 SHA512 04aea6a904fa84ed062b4b4711b6ddade16d20f9882951d48ce7e1e78d2da166c512680d0a62c4d6d464b87233b07bd6732af9fbb0ca36434428d948453c8f4d WHIRLPOOL 2bff39c2e8ed1c6b40edbe7cabaad08e6a8638b1de6385e91fa8dcfb9aa3dcc9e03f2ab70fff66cbee2787d35ff85cf48095245b7625420f71db208d6b23782b
+EBUILD nginx-1.7.10.ebuild 25500 SHA256 b77ce06571722339617eefdce652abbc4c465ed851b53e7794d4763d716352ac SHA512 56423cc13625a572c1b1089750f25bc124eec44160b35557fc5fc28ee22ed29078e3cfe74f8862726208aaee7fd8525dab90f35df004e18195f2f92850420171 WHIRLPOOL 987b73cbc78402af5315800673468cd5ce110787d2ee89aae8e037946721804ef9efaf472cc713af9c6a84eaf6369118695f0cbea2eb7270682b672620f7bce9
 EBUILD nginx-1.7.6.ebuild 25418 SHA256 d1a41371b2418bf252247c1fe48400d06919f3f546c454fb9883a2dd0723f01a SHA512 a856de131d390a25a4407805ba2c5f54dd2f636d35d7ce830c18dc82c4a1eaaba9d458f6f41840964129f33da57221f4c90fd5a2525971a08e65433f5c5782f4 WHIRLPOOL 275c77adefb2975ed6d5cced0633058e81bd183d8432faa979fccbf7a32327b99172b263a15d83f5aef5dc260b1c69a40cdebca118ab1b6bb17b0db4139e1d60
 EBUILD nginx-1.7.7.ebuild 25427 SHA256 72624b67ff9445fdb0f73f73d49ce5428d1937a2efd3947900454c55c0e6bdfb SHA512 14bb2f9cfee4a1ddf32ee5566df039c19d25859afc7cfc963a6c3e4f628a7b8238e95b55193dec6da4cefa0aaa6d39cb932558305b8fe896d325a72d24545b10 WHIRLPOOL 24f3d89537a143016d1966140cc556b8fd0e3acaeba03ac9eee288e21ebedd9313af4f01ad4044025d1d878ed8ed977dd7d59508bec6b5a4383db8510a9bc972
 EBUILD nginx-1.7.8.ebuild 25352 SHA256 a9facd2935f4dd11c53e3fab1608d3c7d9eac726c1103ea382d8dafed3a20f94 SHA512 9c91a27b6e0b4348736b8fb385aff33b1aa6c547bd8716740c93dfbc3ece0e695dd7d7400d4bb2e6cd9d5fcd4643a0a628b6eaea9c66252c41d3d0292432c285 WHIRLPOOL 889b35203114e6ecb18dc4bc2cf8aac92cc0602474ec1ab2d6c09ce34e858f0b83904056477a67ef3ff9b25343b5d84ab90c678a5d411b5d2467cd278dd6c16a
-MISC ChangeLog 68114 SHA256 3ce91808b464a1ffa0ba52c43a000cf65aafc927de203f8b94dec20ba72e29fc SHA512 46a810e36bd3db736fa82fc1e1bc40580de7bc2c04d545a59ff4eb28c40d897f7b4e9d67aa26116497c2304208145e924a8d44e2d2b0677c1b7826e8cfc4f6f8 WHIRLPOOL 45294ce3be7add6d59bcaeb802934384f7acc63fb4277be7364332be15cb943fdafffbcdd0a2b4582bb3a9b141a704cc0754129331692b77aceeb6daef1fbf03
+MISC ChangeLog 68294 SHA256 39953c26300477cbe00a53df81205f080b4c59b644bbb6719abbfbcee30c336e SHA512 1194b7b03dfcf59c3b43c97c620923fa086e14a7431ac12c73ac14436fd8f621985d4695dca2db3a583399fe4d26eebf2e8c24c7cc219e5054e66183b8091a16 WHIRLPOOL cdf124334f439928a3a77165470bce41603f4ff82a400c99727ffdf4dc886cd7b143190088df4dbf5a3b85ff74b8c4fa2175bfb4b3ad1a10d0aa9558b0b8efc4
 MISC metadata.xml 1163 SHA256 fc62172e93d4857665e5e450d6304b613e4f41fb8a31bc3989219c6118064408 SHA512 e38044c19c5edd0580d5c93f1312b780dd2a253e1d811a8c04e24de1f29d1155c706d564fd5c0a7467ae2410edc2178cd7036e030906afa1d5974071ec46598e WHIRLPOOL 7244c3ec582db576a50a3ebee170e359c6b9f159294bc6ac276500cc5908ee044e326793a409e8e22ffa56a220341d144dc3852cdabd38fca1e30f60856c01fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ7BAEBCgBmBQJU/rqkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU/ud2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgcAP+N9447F2zZFNKJFvR4mOFDQL
-pWymrps+4HHGYYYtRENluvWL29F9Z72wn/hZQ5fYFWxC24vbpQfAmVG0pJ6/oJAA
-420u9tzlmrT4NZDQYKYoRnqV3zhcXjcnsU/VBwqvlitojsvzO6+QDtFlxpaD1nco
-/P00gRCGFfrwkEvc0/UxC0HccQWL724OnH4xKDidtIYzPvgJPcZAGPFTBg3Rs7Nk
-6mpUOp0WSC3jHnHHawNv79PkLF0LYQcLG3VMlp3LV6QQfjqNmwl6Ebwe0nxMznn7
-cmKeKnLRjx3RsQpqoO4+CT9CLSTO+hdvwosnP2RuzYLmlJO8nabGOZ9HWbgf34cF
-pcgHouuEyEHvzpUbDC6SJkMSqHHQyNJAbQ2H6tKY7jh3JzHh9ZyGA6WXmgihTfNw
-2hkN8x+Qilhm/0M6cd+pFb8adtGffw3BlpGv/uTzarJ1Ku1UMDDpAybeJraTq9NW
-ooq1ijmjoEmfAsJtYmXTxBGqTYu5C8urwG5bVC1PFZaVQ2ISEjl61AzLvnAKYt1i
-t3TWtqOXpjCAG4Td92YtOd++9ljYgNauCesUlRaNRcV3DHdg0lhxUJIZvnkyspSi
-YYObqbjJC3uExsiCcoCyy7+046awig+qX8zrkwzg1R5nBIiAAmLGEo+4MeY8iLMl
-VGt57Ibai1P828x6PxQ=
-=lcdY
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirt2kP/Ro86jv6KSJvYODzXH3yVJ7k
+ki1S5/U7sC43N7+iaBBwEaxfh26fOnB1TZt57wk7CGCJNrHO6bRYkoji1SIq8hh6
+EL9a92qszrv5vixOhlSEqRRVRAZZ5chDqTsugJIqnn0Ms69+Npo7Mo3bDskOeCWf
+N1D6ncYJA3Qzx5amapHeq2GBL5DJg//K1m3TW5gfdtQQsL/gbb6CfnyCZNqivkgA
+BKMH0joqeu3PbSEaaQ4znE6WopL6agtXky4AZ4f0XIM2DiPLHBixoRRqRNcF0xRT
+nqFLa6E15nPaktyGQSQnR2/53D3HQukZETnC5TZH7U32rmrxwpCEQ1sFYv1kSHDC
+o2QtlMQHBPuAuWFN2S0H5XtMO9QSCST2zvDj+/kjfExf5vlQNWQY7XsSjZoUdJRX
+PWaw3P/rgjejl96sjgB1IkA6tFHEWPyISpAJt5mf7ox87l61yrzQ/nId3GiIY2ET
+coYGtP9iTWn9LCHz2/lEFs7l156sfjmB4oIcWtwB2EBjvqsy0EPjCvZR48IaLw/s
+6WGPky8aW7ToOcQNs4LVIcsr6KT69ngNF+vAVRHepnYXakrBjFqHtQ2rPIW895WO
+NHqrqCG9nR+KdGyuQ38NB5zediNcQHp75AS6spuXr5TamerDl6xLwJmpU2pjMc7e
+0C5GXHKh5koaFUw3EanQ
+=lJEL
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-1.7.10.ebuild b/www-servers/nginx/nginx-1.7.10.ebuild
index 1e82a99facb4..4b4ff73d6b1e 100644
--- a/www-servers/nginx/nginx-1.7.10.ebuild
+++ b/www-servers/nginx/nginx-1.7.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild,v 1.1 2015/03/10 09:34:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild,v 1.2 2015/03/10 12:45:41 jlec Exp $
 
 EAPI="5"
 
@@ -498,11 +498,11 @@ src_configure() {
 		--with-cc-opt="-I${EROOT}usr/include" \
 		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
 		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
 		${myconf} || die "configure failed"
 
 	# A purely cosmetic change that makes nginx -V more readable. This can be
@@ -520,9 +520,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D%/}" install
 
-	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
+	cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
 
 	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
 
@@ -533,7 +533,7 @@ src_install() {
 
 	# just keepdir. do not copy the default htdocs files (bug #449136)
 	keepdir /var/www/localhost
-	rm -rf "${D}"/usr/html || die
+	rm -rf "${D}"usr/html || die
 
 	# set up a list of directories to keep
 	local keepdir_list="${NGINX_HOME_TMP}"/client
@@ -641,9 +641,9 @@ src_install() {
 
 pkg_postinst() {
 	if use ssl; then
-		if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+		if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
 			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
 		fi
 	fi
 
@@ -669,7 +669,7 @@ pkg_postinst() {
 		ewarn "Check if this is correct for your setup before restarting nginx!"
 		ewarn "This is a one-time change and will not happen on subsequent updates."
 		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
-		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+		chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
 	fi
 
 	# If the nginx user can't change into or read the dir, display a warning.