Version bump (bug #555658)

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

3 files changed, 113 insertions, 15 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 70f406763898..16f1e5b4e5d5 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.206 2015/07/16 06:08:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.207 2015/07/23 14:17:49 polynomial-c Exp $
+
+*apache-tools-2.2.31 (23 Jul 2015)
+
+  23 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
+  +apache-tools-2.2.31.ebuild:
+  Version bump (bug #555658).
 
 *apache-tools-2.4.16 (16 Jul 2015)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 5139d9116930..0f9075490e94 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,27 +4,29 @@ Hash: SHA512
 AUX apache-tools-2.2.20-Makefile.patch 1621 SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d SHA512 10adb26f52aee6b30214af1ecb69c7a1657a766928aa92dc5b502e702d2c3248996cccfd4cca74d550d6f378f5859289c76225cf5e145081abe2a1f2cceb9a8d WHIRLPOOL 68da82a6300facc7921cc04f0aa0aef9c50f3507f549b548aadc50be65b6097c56bda22a5409883ea83c41a681baa7b4c02a6594de9f94e7969351090bbe001f
 AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
 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-tools-2.2.29.ebuild 2284 SHA256 946196ee43c382a5a792705d729b0cdcfc9d89c4b011a099c3c827590ad8670d SHA512 13f04b2805a60ca2c52e571db8c26db1d5a3981aaf0cc55b7232f573a144c19eb28b92f0111ff8c5f0ada3e75328babc49735292540d662341125b9bfeab6ebd WHIRLPOOL 1a18f3c6c4e838b7ab9fc53ef563c55045e470a64da48c3434222f5dad29dd403a1ef9bcd08cc807d1e11073212c52873b87e5cf0f05f4b03b0f89b1bd018e99
+EBUILD apache-tools-2.2.31.ebuild 2292 SHA256 b182f153a0677510ac1606d49b24241c7d181c90f3aa1ee9cba41d28c5bfc17c SHA512 e25be1d2c27a5f23888f5aa96622e9ab5828f1191d80347d7e9275b18069c4ea71f598b0ea4306e3c3bf7a1124807fdc77022907c936dfc5f99ca02d1cbf9f32 WHIRLPOOL 8217919ea37c4de2761562bb6bfb0d0a24c0ba38ad206db9c7078f1bc06f178d96cd3acca00700a513e2d88275c94d6f5d48ed322042bc6043eef84d514d6f6e
 EBUILD apache-tools-2.4.12.ebuild 2644 SHA256 b3ba9fd4f7fe2369eab9770ca1a994cfa7c331681649cf1e3714d0df2d42e531 SHA512 0bb6bf2bf946106b41055be0147eaab285d218e7dee5cc82a90a2a157dd16c84377d275a09ca2f1d047ce826751d49b62350b546b4f9e9453699a95be0b69cda WHIRLPOOL 04ffafa21dbdbdaea9f8a1c775d0fdb7ec18c456631dc1eeaf84af105fc636aa1a9880f2c86abc39c2efbfca5118a75c9160b9a520f8a70e0525613c3f5d5e14
 EBUILD apache-tools-2.4.16.ebuild 2644 SHA256 ba4287ce3adb666bde5f8ce9c099e5e5a423e8ed937137129dbd6fd3fd77b270 SHA512 3f46a1e0ed1982e69af198281620eed55714da812f9393ea86cca7a52ab6dbdfc0614f6d230d6aa0d75779bc2f6d207c4d75567cc4d106f3dd4ef72f0d0f13be WHIRLPOOL 07d33fe35227549d99ff4af971aa2400993c4d297f2b0562210fcce337725393be682a0a6811e07d38d3a8482e1976d4d090afe9a7ae6e5bd9d56aff007b738e
-MISC ChangeLog 27793 SHA256 cf2cbf12efa1ccecd7ab0673f5a43256a4e5961a9223830a860176de1d72a5d9 SHA512 dd33a585c113472c358e88271244ac79004c640dcd0768a72dfefea17a64c5ed3e5071c2695eb31a29856231a538d9ef96571f2556ed0053c727b70170b76225 WHIRLPOOL be15fe8fd22600ebeda41ca2da03e6eee1acf9429b6cda0fc9b1d5bc86018730f2e045055718d441cf538813720821dc8f4f577b3ecf141999baf2dfb677566e
+MISC ChangeLog 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c
 MISC metadata.xml 494 SHA256 0f4f12f8ac67c0049e4fd82fe8f5e15d9e7bedf2dc1d6c8a0950c596d897e67a SHA512 5e60a3af9bb8dfcae4d980d03f7a21f8454adea57c81110989da85aa31b0ca82e1293475b22c17a65220609f5b4a1f11bc14c4536fd4e650c2bbba7fde2b92f0 WHIRLPOOL 837e5f0e5548403c696c344cb53d24f5faebc2699a4351aa8d5ad053b92e8c0f0af64469aedd14dd6bafe16a0104ec59e9268e370fee2e9a5ebd8c90d805c161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVp0pUAAoJEPiazRVxLXTFzTcQAKJ5VS6caylN5BubpCtwmzm8
-hG2wcwCbHpkGOb+pvGwQcncbNplEjjpFyvGqTFrszaQLg/ytafS4EP2SZjq8Ud4u
-Bgg6PHj9JIb/tYpbmOHUYMDK9a06ju0k6B0sGWpTn8baraZ5uBNV/hfnPRlhm0uA
-kMVoXQ+LezQvlMhkueadbUhIRsCCyatIl3E7SKvA5Vma9DT3QjYaOlzcE91+Det+
-mgyn62YHpDgt8Sq6B9azeaqBHmWyfpvTSzDNqeOANzzxxj2HNylWkF8ai11F8Xcc
-L8o4rDyf1OX+7vzWsAbxCVNcrSrJ7F5yI7tuG/ycAKrICyENXcPWJk75wgYL1D4P
-ef/eJQTrEGlWHrGveQtVZixd9QhFotxOtMlmMSmnhsOCylAwAm8qVn9PohiUrbgm
-u9bPyl4qPgLIOtZcqbx5KSGHypNWPiDas0/bV0RhCGTVCLVXhRLMK7jgL4FnybYV
-tTXa/osDmyZyuQ4blV04M6YOVLNe+k0b8zk99EDPPREjcyB0EoyaFQeXVMknuCir
-Yt7U2nHAlB7cl1eAN60avT70zFjekVdGymCAK77D9MMMbFo27tXqinq7rvvncTBM
-jCTn15qMPwWoBs5UCIvsdf8C3Fm5Pgn+Oovi3dWSNuY75ChvIfbCFdSP/FlMD7Ej
-Z4w8vlnBlGc7xLj+Kb2q
-=0wfs
+iQIcBAEBCgAGBQJVsPeMAAoJEPiazRVxLXTFPkoQALR3ZHj9ciUQNFuvJtufQGgA
+l5xlr5XTlczGMekRB6AewX0SdxRPYJ9PQjw8M8zd2eGXqSpqQS9Q3DOy3xurhhEx
+1gX8hZimpGEcubmmP7bCqqay1REOY6MC/S/TyRRZz9W6Ac40w3BISKI8EbiGbqR7
+GOzDIINSYcKGT8reQYOluKTE2nJdW3UnN0DZNz9HmgByVOOH3ZBVpY+e10B6uVaQ
+Dmuj2DNtwTfPa3F/iYTgh2GzEI+HONojUXNbswg0a7rtJ2kNw5UqF6M2srswFK9k
+AOo8OXy9k7cFHkSkrssGCuYaPvW9pyytacvq6+S+BW4JdQnaGI19sa11DvZDQcoh
+sv9x3rvedigTD5XpQK4BQb6F9m3TYituo+0F5CzoeGeFQFOB7ZyfX+dVfXa2t5P2
++ZhJQ1veKTV4pJf1XhHHwOgsNH3UNGOQ+93oX/ka19yNLRfZPdkJe/cO4BeWmp7k
+nTVbux+AuFff201GAZl8fi4UgusgmMdnlfKFnu1mrnHogySrytx2oFOJhhwTjJ59
+qI9ZxQRmw6WW6zczgBZzA6tRJ+oNyff6Al9rPqahMvnR9wQbZxRcs8OLuK/uogR1
+0t2CGE1tYudE0WaNrDXe/BNcxJua/m359WgFpE7hoMPXd3uv9eG2G9ux3G/nDJf7
+R8xELoqeDc99vZHWFHzP
+=IWbm
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
new file mode 100644
index 000000000000..c14636900ada
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.31.ebuild,v 1.1 2015/07/23 14:17:49 polynomial-c Exp $
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl )
+	!<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+	# Apply these patches:
+	# (1)	apache-tools-2.2.20-Makefile.patch:
+	#		- fix up the `make install' for support/
+	#		- remove envvars from `make install'
+	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	econf \
+		--sbindir=/usr/sbin \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl=/usr' '')
+}
+
+src_compile() {
+	cd support || die
+	emake
+}
+
+src_install () {
+	cd support || die
+
+	make DESTDIR="${D}" install || die
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${D}"/usr/sbin/ >/dev/null || die
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym /usr/sbin/ab /usr/sbin/ab-ssl
+		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+	fi
+
+	# make htpasswd accessible for non-root users
+	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+	dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+	dodoc "${S}"/CHANGES
+}