Version bump (bug #555658)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 137 insertions, 15 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 6490ff833528..684567f1675c 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.306 2015/07/16 12:52:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.307 2015/07/23 14:19:04 polynomial-c Exp $
+
+*apache-2.2.31 (23 Jul 2015)
+
+  23 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> +apache-2.2.31.ebuild:
+  Version bump (bug #555658).
 
   16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> apache-2.4.12-r1.ebuild,
   apache-2.4.16.ebuild:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index fa0149480e87..b8bc74fff52b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -7,28 +7,30 @@ AUX apache2.2.service 716 SHA256 e850ad73585fbba52ade58a39ca91adbfd52f56a0bbd426
 DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
 DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839
 DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
+DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
 DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
 EBUILD apache-2.2.29.ebuild 3105 SHA256 db3e7e9fd9663ca383e414acf04c964ab3971faf891a740285e4269332c74a45 SHA512 3a6b89e825f46c4a545c7a77840f7ebb6e1276d520789cd997cc5f43500ff1bdb8cce8aeb0ab2e4cd773c598ea3a30a21293d04757796ab495dbc088705cd76b WHIRLPOOL 16a2423411d9966bf40c259af251ddc639e9d11ab718193397ebd1b93ea00d27bb3178193531cadb0fc77f00842f6c9c9a7f3d5e41d2118006dc4bd34115f2f3
+EBUILD apache-2.2.31.ebuild 3122 SHA256 aac563408e1323eb3602c60becbaa1f183bccda1766d237154c756af98480312 SHA512 bb3b01c3c2bb423c7ed6073f0237b0073357f4ca79ff490c4730302b4a5fdac6607be63c41e3ef098c3be8987e6c250e5594c5dacf9924f221b487eb93fb0035 WHIRLPOOL 7ee54e7f128603a728f82caa5f04b5362b90bd7d30e8a437768828c9adcb28f05e8ed94e70c79b0a7dc24a152fa160006811b46937a33a0d53e436659353c1ee
 EBUILD apache-2.4.12-r1.ebuild 7753 SHA256 6968f5d0a12da8e6c319ac7c4565b7eeeb4e3dbf4bc2d53880959ef4c641127c SHA512 8c5cd3e0a99f699363e04b73af2828ff474fa460f1e0803e8ed49dd27ea6af5d7cbdd635d89c0fc3fc399db534800cab89fb0d33b975ab18213ee34da8cf84f0 WHIRLPOOL d2568cc2d45177433b87a8f009ef8340c96013dcf56188402f683838b9b06139f6d851b2f24d1c33076adaab4b3c8faf34204a88245aa7a1379b1825bc961d98
 EBUILD apache-2.4.16.ebuild 7750 SHA256 930b275e15d7b4492ff3afebb722695ac9fc0dc10457b6639e122546aaac2f7f SHA512 627246697ff946cb419bab961cee0566ec442460c58498ddb19ee270b5b7838c3617c6e45cb23b366b9af66f7e4276f8e660f856a566a8c6f5edd79ab8c48658 WHIRLPOOL f0955a71847de4c1d659f25095cb848ed862d90fe905009c8b5e607d4c2148377ec4cc680a3ed7cdc9c5db0566de8eaa8865e363ed406a34d6d806652f5e6f7d
-MISC ChangeLog 30434 SHA256 7788dd3cbc0c50724e4333c5316ab49c27d9b8ffa1b1ed674246e3bce9daa882 SHA512 dc7e124c68ca42e7401a1499a67c5fac4ed665e0022016a4d660732e248a554349737b7cbb01b280b902e0cfa2eeaf4d3aba922a9dd3b686a14afc4ec8048367 WHIRLPOOL f373c0df420b9dab316184be149b7035274f3ed3c16fe3598b337bf418627396e7ebeab0713030a5a7b9caab99ca50e40b6b33fcd1c13531d900231c12b77e6b
+MISC ChangeLog 30572 SHA256 2608174e0cdfe351d5c8d25d21cbe9c6b7b98c6de9ee6d04da23c3de9fb95d6b SHA512 b76aaa5b8bc20f2fb45346e5d6f1f094e9f6b6f740054755bdc0399f581c78fd0c087f183ca756a63a08e8d96eedb292ffc4d2f6ddc00c8374435866e15fac9b WHIRLPOOL 8dd5292ae8fa15422c6d663420e7655cb13247380831d2f147dfdd0deaa51d6899e1c7f3b8ae9ae111074c8464e0bd94a38d491981ce84fc6268ab83c0af9396
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 3082 SHA256 529415f44340c023ec4eb9208999b080b6ea10f9ed6e1f5ebeddaf4099a36ee3 SHA512 c50d30f4b6a9f2373683825cd598d0daed11a68815da8aa6ba2c42817db4b4bb63b3c6c1b31acb4d17671ba23a3c8dba7d3aa7a4bca38be7694feefc1826d8e1 WHIRLPOOL 8f227ab785226746116173b3c1d4b842c1f4ece6691957ce693bdb708f36372de2f9fdce766dd37957132d5061b74d449e6cafc23a4134e1cb258432e5177241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVp6kPAAoJEPiazRVxLXTFIBkP/j6oNqljsYIOSkD/0aT1EOaL
-AjL3qtqubholwC6R6C1IRuvgpRKdNzmGRnr8w4Jj8umAZWJIoRJHQzTPNs49DxgI
-CyUWQEBzbN0kRi/tNVtxVNHZ7lsqIver51CbdJQCVjfVgfX0BGcHTJRURXXwMVl/
-qLhTI2v3TSX4yE/G1d+cJbWJeD6nS8gQhtof0IXX5nO9I/CBd8wvSWkq7y6VIiUs
-zfVAarj3qJTjQVpR96hN1CssBpTBcOR8wY1ftC5mlBvf/RJ91Ny4jEJYXg00jhqw
-0tF8nW61kzT4bKUprBFyGxpDSOvvOdHslYfjKHEUJ2gOhP6txL6plgqF/DQOJrDi
-U2/RUbpCoPJRQ5CJBfko3nGO22ceiqgdrJbDrFhMN8rDTbBOx62fX5VBdIuORaz2
-iAOsFdckU1cSWQSsfQl9hjOdIYSvAxgm8O0D9B/e1ZlFJHw++jKuSSW283KoromL
-SeTMI9D3haKKBSyjpcbv2BlqMtML2JPedRnMZzWrS8QeTAXL53MG9AwyxHdAZou3
-TlNTUcHcMaHhumF8aWl4Fnt0+yHQ/45GQhOsYqTeBpj6jP/Lifx25Ff7KY3PU2Bn
-NF7jBBJWNevfSYxJycFHKejS5aFyxmSjCAFZG47JELWc68g1Z2B/jUkEITDUAXVg
-sS0NYhoXluYf8fsx89qV
-=I2iw
+iQIcBAEBCgAGBQJVsPfTAAoJEPiazRVxLXTF1acQANC29JYg0CmDrqdNYJsSxJns
+Lpoy0fhJow3o1GfhvCI8cgqQufC41k66xG7E7ofcQnP8l6iuH1UbP7WlILyy2c6d
+kj++R++ytJtBmJhKQ5ygzOYPElWIXa2HOM9Jygc7BsFt/d1jDsRrYyKte9anSkSO
+IrZn/huAU7N6jrmSEmOKIN1vyAySaJx3bbiGu9dBLAE1n+uunjNAlRMFmfFzLVC5
+t3jcGNrHnqQV1BC+9Sf4wJXRhBd6OvpQ7d064LMK2rNvxok4hmTgdhwA5UlcEm8D
+ciWhxbBmJA8kKrz9MwhM8+dwwLFxfuzwlUFTfZS5jr73vK3HtpCyo7n3ApxjBFZf
+7BKyTbrKhqmE9q4xnvvY8q5sVaGn5FFkVnxpyKGXraKplvmLXFWGWsZbSAKlevK0
+VmpZ3z9W3GahFw280NAB8ZEmQzLCUGZvbVdxjAGYIupqOMTj4uuYQufNTD9XTuKH
+pe0NXoNRGIXEljd2npcps6sd8wkqWK9YfezJwcExnMEC1WBO/nFXW4uqUzNUPBcZ
+eFDplQArgozJIkw1jEbUzNursSXdqIeJXKJTMRJi6QtNcsPFLGQC2WJz4Y6ijrKj
+PhylgFuUhJO9wji6JTn+2xqFY4pkccqeOuWOXQ+k9KNgy2GdGzFCCMZrh9XQqNG4
+qrcCzmvAQseFDQ82B3JP
+=u9+5
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.31.ebuild b/www-servers/apache/apache-2.2.31.ebuild
new file mode 100644
index 000000000000..7aacc622de49
--- /dev/null
+++ b/www-servers/apache/apache-2.2.31.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.31.ebuild,v 1.1 2015/07/23 14:19:04 polynomial-c Exp $
+
+EAPI=5
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20140922"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.2.29"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
+env expires ext_filter file_cache filter headers ident imagemap include info
+log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
+version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit apache-2 systemd toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_install() {
+	apache-2_src_install
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs_dir="/usr/bin"
+	dodir ${apxs_dir}
+	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+
+	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+}