Simplify src_compile/src_install a bit -- no real functional changes.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 31 insertions, 33 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index e3889eefa205..7b7b8df09b54 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,9 @@
 # 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.173 2014/01/31 08:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.174 2014/01/31 08:17:39 vapier Exp $
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-tools-2.4.7.ebuild:
+  Simplify src_compile/src_install a bit -- no real functional changes.
 
   31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-tools-2.4.7.ebuild:
   Convert myconf to an array to make it easier to maintain.
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 6e60f91983ca..34e168600c3a 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -13,23 +13,23 @@ EBUILD apache-tools-2.2.25.ebuild 2287 SHA256 d04ab4663f2a0d5686b25a72cf506801b0
 EBUILD apache-tools-2.2.26.ebuild 2297 SHA256 58f6067a2fae21683e161be94e591fc9227651cf882a439dee4f810e16d10885 SHA512 b5b921ee827546fe5aaffa434e042eba6888f2453fb518cdadb112a176b9cbcfffe61fb478b05e12c40080c31dfbee91dd09c6204e26a9ddf1ff08b276b4e19c WHIRLPOOL b9805363c3cf6c63626f4fe4f4a679d39dfce36e1690c32cb103765a2a9278d250fac15e30b2b94e3750dcde0be67fd59e4e810792d49ccd8fbe5b8cf35eb886
 EBUILD apache-tools-2.4.4-r1.ebuild 2233 SHA256 6cf5490575584de05cd088d9466eb70af371710b6632dd5c9edaa6a573dd2b64 SHA512 46f5b6381d5ee5d4121f358a890da30d18f64baeda71d73746c9cf92c825cdb2734f6fc0bfbdbfe34342df974f1ef3a1ad69b495a7cfcc4f5758af10e24bee32 WHIRLPOOL f4e36eb9ed5276670859e26f09ca2ea0e4dbe02c86cd5e362dfb70a7ec8643983d3aa71bab44f50710984db13a8df3efd4388e1bfb6d34b0c8051d49d17f2d05
 EBUILD apache-tools-2.4.6.ebuild 2242 SHA256 382fae36be53339b4f4f0f6730a3b5b274e02f95a4decbe517e987c14960947a SHA512 3e8937b81794546778d9e27b56f8be85174c473f82f62ab2e2e21714566c599bf078ed59d7c02a79155db8009b33e4b9e3cb4fb0d7aaa0bde652fe82dc9d0e19 WHIRLPOOL af12e163a8a1f66e7542faadcca6c06a0708ee80e4f9006d8b537e165caf663b0e7070ff225314435de3b9ad5f898183d22a0882399f42f26435e1bb1c3683af
-EBUILD apache-tools-2.4.7.ebuild 2247 SHA256 461274b014e8aceb611c0c5d41503c0d5015a2d22d7ac366960a3379bfe454fc SHA512 f684bd475c741196743f85a9d439ac2d699f106720f1e132600121bc563433fea219b72654df9f3ec1af1a0731296ff107e98bceb3ab54953f095da439996606 WHIRLPOOL ee4e483a6486cf2e070b50cdb4126eb67980611ef596121a05b5da75383006b3d4200b36ce44f3d821076e533b3ce56bf4d7a93e7897668c5b47237d57d62a89
-MISC ChangeLog 22873 SHA256 099fc2d2ef8cd17733e98ae376ed147ddeab6d571b20009b2155ccb46497dbe7 SHA512 203f290161e9cd0e2f1dd9c0b2e4e2629833927480f92bb8c56fa51f3964955bbd1cc936a92d09f51d5623db1cc4e906fbe08114f91920c4912f5879a245627a WHIRLPOOL 5887181b867da22bbd06061432a3cc255b194bf70a38d391667046e04535294b6d2f2aa053fe4895bc9d814cf9e52a77e54492c36640de2089297a2eb1e81eba
+EBUILD apache-tools-2.4.7.ebuild 2149 SHA256 940937121dcdd2a6e2c78b0a07c08c8f4b097791766980d11824e3ae70a81511 SHA512 4ecfdf4f1729d03c954d5e529ec074685f1fd6e367dd4bde10e9e85ea1d7431b6c613c89574893e86dd0fa98a2473c6f5765f70f4afb8d18a3c3c839c5c2f547 WHIRLPOOL 33f015b69d14871d8501d809c347078d60d1c6b34b14b637eeaa4fbcdebd37aa351c2d60506d4959ab81f5120523d90900cbac7ceb0e74c278b37d06213fb2ff
+MISC ChangeLog 23023 SHA256 7bc58a15e8930bf7faac6a15f4a65a297739dcec6a35bd3bab6cf574e9087d28 SHA512 06e5c71cc70b4b657a00e21418f5bbc20c78a53d7bd22ccafddf81407f79652410711176cba6bf39d1e171cd6820ad9cf6429be5a06942930fc268216b0a89c0 WHIRLPOOL da77908da5c3d42120ab068ab18c0ea5784baa4c332a5b51a0b4ced4b552f7543f433c036268a3d92fe18414288504fb4416e7324741882e08390c9472e68e1d
 MISC metadata.xml 587 SHA256 7a663c163db27db13913e30a4936a622ffd9d0bb8718645e6267db0ff274c072 SHA512 9554e1963db41540801093b18efbfc1b85b2662ceef2b4e061065b4464a2de35212ae64257541261573d0c39c58a1e02d5da1b0fe139fede0aa9d9114a6fce7b WHIRLPOOL 14cf07a79457057ef8b2c97d663ce7d0ece8a7770c6fd60af1aaa9b4e187e0f823863629a991a0730c965407fae882f668756c7a68f3ad441ecb049a345d12eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJS61uQAAoJEPGu1DbS6WIAkFYP9iRg9EW7Faev7DVTnDnTbaZp
-VmSPgbz3TE0U9QvVM2viTVsI74mRXlT0KnvxQpkubI2SXQmnZ1rOt2LqVtqLYJ8Y
-TaKOF07twnIpCv/UzcYVFg8hU2Hj7pjdgVaV/U4dVEjf+vbYH3whnUITxuhMP+kD
-AVobitjy46+ZsSD/r0l92CYeG4JR1xgZoVYCXqu6HNxnUniE5Zoyen9/hUkopG17
-vuilqufqPirWe/UWCnh7/3ktV27DSoo7wUE/vNI4X0S4hTgTq4YkQMrPYJcz9B4x
-OQCdt5tJEZjbmNv4LgemAHM4qU968baQweXL9BZWHeqNoEgc3/AVDG2DkPCLy+5a
-obzuahwBV1IVAf4asmHFSpIaReKlOlf/FAR/Z1EyHeYMvBUdrdOZDt8AMWvwJ1C1
-TZJzhqYb1Wu7obLrl8w4fiuoiKnVlWdL9M1Pu1m4WqDdlaus3V/27ypgQ+/xmres
-aikieGCXrfx0/5iR9zFBNgjo5IoK0GvBJVilk4k2lE2SderBdtqtOReDN3GtnIgc
-D197OEMcQWFw9szberGsjW7cyau8O2CeSMpmJRh3uLg3XazIF3R4uVViKayByNMa
-GfyJRKnz9CSyQrfzjCJjaOcm+7ZjKa/NKVuNzsV9erqNX0OI9RGDgTdILHr04yL1
-cVF1eErBJqLyi/nuoJk=
-=5/ZG
+iQIcBAEBCAAGBQJS61wkAAoJEPGu1DbS6WIAMWUP/23OwFvJsIMQxNkjbzPaHtRr
+khezo3uQkGi5my4A9MqtI6+Z04bDIvZ5HJWjkvHaqFy2qbT6IbBzM9i6Nx4wHt5l
+CguFI/KFnmI9foHPnLyLEfn2sp7FqITv4M/8B5BH0MiCPZ99qfJkBmouOJJQGY/d
++Eg7tYbTIctrGbic/1V1dFoTOY5hfGJmRcnKOrO9ALoopL4Spd/4b4Zg0JeYPoCK
+Wx2XrGrEodre+l6/vITdB2zm78XRuL0sCLvbdSvaztNNcrvDV7i9uG2S0ZiCWRZe
+Cix5mo66KKe/7/BzIgJbZXVmyIijkP5nA9E111LAuVBaqrQnG1LeTwZ3oMc+nIFn
+bBkCxav04IG+mmXRTRTXnRRRo8IGs/8KAGUuJ/OPd17qLKrRu66In6jYNAehyECj
+2KGgZYwsSwLwXxkbxW+6P24GsFria13tsWU1tFeSlUiPVhO6gDtMYFmCYXFJq96J
+Ek3MxQqDxTS6AK8+dr5uVZi+07n9Wq4vrKd1qrzlnwI4u5XLiidcEtLjVBHd4Ueg
+aNlDF2O/d6qfXkiOWUNvbRF9FV4P/8zTw1a7pi4dcAv3X7DgteHQfZoxGfRxzNfw
+xmJn3duMQCiRWOS/S18NQTfuWg3EIPSfnQ6u7dS78X3SULox/bPc4Mny4HMfiTH2
+p4pndXXRJjNAa3mEUBmS
+=jZ0M
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.4.7.ebuild b/app-admin/apache-tools/apache-tools-2.4.7.ebuild
index 528f237d3c24..6527fa8dfac1 100644
--- a/app-admin/apache-tools/apache-tools-2.4.7.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.7.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.7.ebuild,v 1.5 2014/01/31 08:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v 1.6 2014/01/31 08:17:39 vapier Exp $
 
 EAPI=5
 inherit flag-o-matic eutils multilib
@@ -51,32 +51,27 @@ src_configure() {
 }
 
 src_compile() {
-	cd support || die
-	emake
+	emake -C support
 }
 
 src_install() {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs}.8
+	make -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
 
 	# 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
+	local i
 	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
+		dosym ${i} /usr/sbin/${i}2
 	done
-	popd "${ED}"/usr/sbin/ >/dev/null
+	popd >/dev/null
 
 	# Provide a symlink for ab-ssl
 	if use ssl; then
-		dosym /usr/bin/ab /usr/bin/ab-ssl
-		dosym /usr/bin/ab /usr/bin/ab2-ssl
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
 	fi
-
-	dodoc "${S}"/CHANGES
 }