Do not link to openssl when ssl USE flag is disabled

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

5 files changed, 122 insertions, 29 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 137fedb346a9..f7f1db2f7d9e 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.190 2014/05/21 06:26:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.191 2014/05/22 14:01:25 polynomial-c Exp $
+
+*apache-tools-2.4.9-r1 (22 May 2014)
+*apache-tools-2.2.27-r1 (22 May 2014)
+
+  22 May 2014; Lars Wendler <polynomial-c@gentoo.org>
+  apache-tools-2.2.27.ebuild, +apache-tools-2.2.27-r1.ebuild,
+  -apache-tools-2.4.9.ebuild, +apache-tools-2.4.9-r1.ebuild:
+  Do not link to openssl when ssl USE flag is disabled.
 
   21 May 2014; Lars Wendler <polynomial-c@gentoo.org>
   -apache-tools-2.2.24.ebuild, -apache-tools-2.2.25.ebuild,
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 35ee8d7618f5..bd262c43a4d3 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -5,24 +5,25 @@ AUX apache-tools-2.2.20-Makefile.patch 1621 SHA256 bfed1a3d5e07766531a04c4752500
 AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
 DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
 DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648
-EBUILD apache-tools-2.2.27.ebuild 2293 SHA256 c85f6582df71c96baab39d983346788b49eb4125ec559ccbc63e7c511c4dd387 SHA512 120131a559f27224cb0c9d229280e1deb7957aa59d5124add1ff09cb8b906498f748898e4dcbeb8e67a76f43f67801ba0888e78308a1d061ce4a89ff110e1931 WHIRLPOOL f53ee5fa1bb3835ce26c623553f61f6990e84d433822a1cca7026cdf19a20494850dae0b7ff2e728b784e8a6b39e66f978bfecca5dc7b5b65fd4cffd147125e7
-EBUILD apache-tools-2.4.9.ebuild 2654 SHA256 60370b7dbbe5b6bcd0ef7fbd9955c7736b858ce36ad7d4cec4ea15fa77a52f77 SHA512 6f100df08e950180d03e94e90d478d5fc95528270073cd17808112befdd5c315a6fa2859c8a561058eeaee4b3a5eb197c588d57e3c327f95d27ee9815a6a2c88 WHIRLPOOL 8de719407decf4b79fc09b5d2549f7f863ba00bb3c701d410edea225a9ac9dd38043f0021d6cd3c590aec620af02cd601ca102c77bf26b07b4f6e30521ce48d4
-MISC ChangeLog 25454 SHA256 ab218b8975393f46f77d6f42101c1612329aa0a1b2cae37a9e4d439f09df5be4 SHA512 940ee59ee0429a7581aa44d3d461739785455542c84ea1e20f5f92a2151497652012cf627fb595762f47bd9a73059d7e8815889e6ad5b0d8fbfea015a7bee4bf WHIRLPOOL 0915f0404392162c3c2997c5a0dd44a9adbb6a31273ed0102e401a01b43957dce5e992a2bcab11b922358d8ab72a926a61cf58cefe0b0810950d13665713084f
+EBUILD apache-tools-2.2.27-r1.ebuild 2240 SHA256 4f6a17d776eec10b1c3327139d7f1cffe9636f5b187d9eec58f8e7756d7f6a9a SHA512 cf0de6975d6ee0a3e31714c13eba0a81772ab11f0f257d57313a6c834105c5ec49d558b38a80795c2186d4dcc409e070a2bfe5ddac02bdfce58c3e4f14dc6338 WHIRLPOOL 71d7213d053dba6e12721a384142ba5d389a4cf69c6bc3b7b7b9edf2c9f310a70ae571e69b30e0d15ed35637f35bb059d3c7da00be934048f6464d772b85d8e3
+EBUILD apache-tools-2.2.27.ebuild 2285 SHA256 b0acb068dadd1411274400161b9b0ffe529284afba1371699136ad922174e10c SHA512 22ae0714dd44015c9dc6341c9d3625fd825023cfda35e8f81a96b7aa6a083caea72ce2ddc9f69dcdcff023347898520fa26eb43161f061e47936d463de2e7355 WHIRLPOOL 8056c45abf69700035d2a61d3dd091b4fd4f0d0718c89b4a2bc8549c0fa31a7a53daa5f9909f48e76bf1e497748e43ded62ad61be562c169dbd55c30de3b1691
+EBUILD apache-tools-2.4.9-r1.ebuild 2588 SHA256 2c649824a10d2d570b2e4432439263f91e03a6c7b4d89f934bf7647d55500a77 SHA512 ccde8f65621468e3654cb47d15c3c4c3c08d02b2cb0502a815e2274f7a15633d9775993129b359fa1d254d39fc144e0a13ff93731717fdc0a2e7263b835eceaf WHIRLPOOL 37823087ad38978742694339a14682fc5946e15668696aba7fcbd307ac65c0351e5b1802a73dc810c02a9bdebed190a48d84b1ce1674ebb84dc2d64d99916b83
+MISC ChangeLog 25764 SHA256 f94e2574a59a9224b5a652259409cfa0df4ae5b4ee8d6c7e079c8a36e5059083 SHA512 b9f11e228eb2de1c837a77230a7a04393b3d21747271711f6732fe8cdfaee5fa2897abd3f5f2a528962f3ee2ebc7d4d847104ab0e35c86afd7531af69aaefe09 WHIRLPOOL da28ab93633e9aaf1ba7c7e9df686ee1b32529c774d4fc8ecf830af2378127e85a6ef9ea5e57f2e0752cefb1d70647822a38c0cfbe5f6d683b0e957e6469c906
 MISC metadata.xml 494 SHA256 0f4f12f8ac67c0049e4fd82fe8f5e15d9e7bedf2dc1d6c8a0950c596d897e67a SHA512 5e60a3af9bb8dfcae4d980d03f7a21f8454adea57c81110989da85aa31b0ca82e1293475b22c17a65220609f5b4a1f11bc14c4536fd4e650c2bbba7fde2b92f0 WHIRLPOOL 837e5f0e5548403c696c344cb53d24f5faebc2699a4351aa8d5ad053b92e8c0f0af64469aedd14dd6bafe16a0104ec59e9268e370fee2e9a5ebd8c90d805c161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTfEcpAAoJEPiazRVxLXTFde0P/2fVAaeyffUHU9KZ4gqITRN/
-UcjoBpfGloM/ZeRSgJoOhDTOdGmeEOvrEJ+SRbrXVH6S28X/bzS5IuIh+ordKbNH
-IXOVGtxzOsVuWKKKIgvyBZexe3ZqIK20tgWgfxbhCrLsmVP6TSxCNRANGfOSSJxW
-R30xYCaTJqK2A44DGlu4mfXDxk1FI6ip0UrIu0+FbgmnjFuY0XQwLmwgtHX4HaGs
-xm3wqTZ/EEiA+qN8JmWNvoY9OK68ae9y1shZNUsEb49LNmR+KVmOPZrdiWl0bvO0
-pqgCAkLW39NKd4czvYiZRyvtGaHhCdI6Xek3Hynt6P6bwCsRRlZ/YSqH2oEvgbye
-uLiKM7NpbKXVLWBQu2vmW3jrQirqS5nOYidfRSkhMfBhImw2xKUiLJbTJTYviOGs
-Tv7NaUMlR2ltcKa/17Bt9ODdh3Nr+Bm71H9TaupRswYahcAexi+9kk7URtCmc5CM
-Mqsa+pGAOmL260aH89IOcuq+azoRl/9uSdaMFKK+G0YKfrVUKn6uWQ4EKJSkZsde
-riU0lNyTvrm+3gXxBnU38+UzBKg3awN/qotQuS+SkQ39Lex93BOS2Gbgc60/beSU
-pWSkjIagwI58jo1I2gDZlettZoVy/P27DWfainBMKS99/4EqGqRpRslbophtdBgW
-P9Qom4fGnDGePPirZyWq
-=EDuv
+iQIcBAEBCAAGBQJTfgM2AAoJEPiazRVxLXTFJ/UP/R+7sVDr65ZcFfot+BSUh/6Y
+zoByWrn8SLcVr9bytrtEdi5p3T2fKHVvHjbVGJDhLjR9r8P86J9SWgR68cd0U4ob
+k1b0B2y6ct1ETZw1gU9agd9zCTDGBZqZx6X+JsCIutKOCea71+PLNZvcHnvr4GpL
++jWsYBicG9YYshyZ9vvvfn5cXc+8Z45BB0613fX4ICDhBpUrzZeSh15+UebeZUY3
+aDuZh2qo0tyxXTIASUiGdQVamyBssFnTHqxKzw1Zm5O7LOWVwGhRRavW2cYhswe8
+AUDff14fvJfrbSWMJXA12lSZVZHu5Js0wJ7oWTgNA/n5zkhK9dT0Z3kqxZ8PoF6f
+ZE0ifr9kBixrnIHJ8EFSIj4q9OBcNA8JdVJ9T2Qboyn0LAAut3ciVDe+2EkGQJZz
+paXkuCzdGV52pUv1j23Gv8EubnFE+o7QGYxXPRMRwvap1emmtiXgQFAQVVQhBleV
+w7B48IPDSSixhUj9xk5NwcDHORlDP1PcJ5rWJlVeyXoXteftIauVuSBijOtrhTlR
+0hdCgvZ0oIo4ahrUfpdShKXeHZ6JLOy1gMtsK0xJSmriS7zpvQGF4ipwXIJmaZK5
+ZAbmeje3euZ32rSITygV9I4CrtSt0rTvNLHXc+1EkuhPy6CMgcK6GBLQ3AE2iSfM
+EN67xS7L0gmV81u3ObLA
+=B5U5
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild b/app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild
new file mode 100644
index 000000000000..67b5ee55ce23
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 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.27-r1.ebuild,v 1.1 2014/05/22 14:01:25 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/libpcre
+	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
+}
diff --git a/app-admin/apache-tools/apache-tools-2.2.27.ebuild b/app-admin/apache-tools/apache-tools-2.2.27.ebuild
index 28b43f87ca31..8d7817e09422 100644
--- a/app-admin/apache-tools/apache-tools-2.2.27.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.27.ebuild,v 1.10 2014/05/17 13:50:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild,v 1.11 2014/05/22 14:01:25 polynomial-c Exp $
 
 EAPI="4"
 inherit flag-o-matic eutils
@@ -76,7 +76,7 @@ src_install () {
 	for i in *; do
 		dosym /usr/sbin/${i} /usr/sbin/${i}2
 	done
-	popd "${D}"/usr/sbin/ >/dev/null
+	popd >/dev/null
 
 	# Provide a symlink for ab-ssl
 	if use ssl; then
diff --git a/app-admin/apache-tools/apache-tools-2.4.9.ebuild b/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild
index dc17e18c10c0..e177e199823a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.9.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.9.ebuild,v 1.1 2014/03/18 18:48:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild,v 1.1 2014/05/22 14:01:25 polynomial-c Exp $
 
 EAPI=5
 inherit flag-o-matic eutils multilib toolchain-funcs
@@ -38,8 +38,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=()
-
 	# Brain dead check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
 
@@ -48,10 +46,7 @@ src_configure() {
 	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
 	append-ldflags $(no-as-needed)
 
-	use ssl && myconf+=( --with-ssl="${EPREFIX}"/usr --enable-ssl )
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
+	# econf overwrites the stuff from config.layout.
 	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
 	econf \
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
@@ -62,7 +57,8 @@ src_configure() {
 		--with-apr="${SYSROOT}${EPREFIX}"/usr \
 		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
 		--with-pcre="${T}"/pcre-config \
-		"${myconf[@]}"
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die
@@ -80,12 +76,12 @@ src_install() {
 
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null
+	pushd "${ED}"/usr/sbin >/dev/null || die
 	local i
 	for i in *; do
 		dosym ${i} /usr/sbin/${i}2
 	done
-	popd >/dev/null
+	popd >/dev/null || die
 
 	# Provide a symlink for ab-ssl
 	if use ssl; then