Throw in some symlinks to solve bug 177697.

Package-Manager: portage-2.1.2.7

4 files changed, 67 insertions, 8 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 5012f1fcbac8..22d409ba33a8 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.2 2007/05/07 20:27:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.3 2007/05/09 12:54:18 kloeri Exp $
+
+*apache-tools-2.2.4-r1 (09 May 2007)
+
+  09 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+  +apache-tools-2.2.4-r1.ebuild:
+  Throw in some symlinks to solve bug 177697.
 
   07 May 2007; Bryan Østergaard <kloeri@gentoo.org>
   apache-tools-2.2.4.ebuild:
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 2c658d8956a5..ebdeb2b3aaa5 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA1
 
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
+EBUILD apache-tools-2.2.4-r1.ebuild 1108 RMD160 4b36756f2d6a7768ae391eb203baaa994688acdb SHA1 e56fe7e506104e50808c99357b2fb26952670397 SHA256 d8eb29db14b15065d800c21e94d326480b6f4893cc94491e5c056a78a4223214
+MD5 d8a951a016ba2e6c64b409ba85177511 apache-tools-2.2.4-r1.ebuild 1108
+RMD160 4b36756f2d6a7768ae391eb203baaa994688acdb apache-tools-2.2.4-r1.ebuild 1108
+SHA256 d8eb29db14b15065d800c21e94d326480b6f4893cc94491e5c056a78a4223214 apache-tools-2.2.4-r1.ebuild 1108
 EBUILD apache-tools-2.2.4.ebuild 954 RMD160 b970607ca81341ba6b2cadb5bfcb00ae36ea8afe SHA1 40d29cbb8e9cf955522df21e8e25bff590300093 SHA256 88eb389c0ac4ae096c916d755e294559a0b3bcbaf35026fb174bd95cd63000a8
 MD5 e9d9ea96498ae17dd9a79a88cd88e8d7 apache-tools-2.2.4.ebuild 954
 RMD160 b970607ca81341ba6b2cadb5bfcb00ae36ea8afe apache-tools-2.2.4.ebuild 954
 SHA256 88eb389c0ac4ae096c916d755e294559a0b3bcbaf35026fb174bd95cd63000a8 apache-tools-2.2.4.ebuild 954
-MISC ChangeLog 541 RMD160 f584dd23b74dc13b7e027dbb4f32bac93538c722 SHA1 1bf6797753999e2a7838957e9b7b958f368d7286 SHA256 b65a82341dce7539c58f8213c925c8c2077a8b8f7b85f9b81f9cdee21b754a87
-MD5 ad029a67cba341c9aa470d972ac7800e ChangeLog 541
-RMD160 f584dd23b74dc13b7e027dbb4f32bac93538c722 ChangeLog 541
-SHA256 b65a82341dce7539c58f8213c925c8c2077a8b8f7b85f9b81f9cdee21b754a87 ChangeLog 541
+MISC ChangeLog 712 RMD160 fcc083c97c7981ecd4b1a090d166120b2a63131c SHA1 4fb6a948f8314cf7dedfd3d79a21d04e505c589e SHA256 3d68db6ef35636f6cc8baa0c7f6456b9486c85027e922135fab8b7b1cb6930a9
+MD5 b7bfc6951c261dbab93c3fee17846ca6 ChangeLog 712
+RMD160 fcc083c97c7981ecd4b1a090d166120b2a63131c ChangeLog 712
+SHA256 3d68db6ef35636f6cc8baa0c7f6456b9486c85027e922135fab8b7b1cb6930a9 ChangeLog 712
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
 MD5 f58e4db131bec13f30dc06e7f43d3da1 metadata.xml 444
 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 metadata.xml 444
@@ -17,10 +21,13 @@ SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c metadata
 MD5 aa71cde94322b137c83be34a071fa0b0 files/digest-apache-tools-2.2.4 241
 RMD160 e147c8301d25ae38730c7fadf7353a0cdcf9a599 files/digest-apache-tools-2.2.4 241
 SHA256 b4719ddba967e2c38193dc4fd4c74fd3c9a670528d947ff22095b6cf562edb41 files/digest-apache-tools-2.2.4 241
+MD5 aa71cde94322b137c83be34a071fa0b0 files/digest-apache-tools-2.2.4-r1 241
+RMD160 e147c8301d25ae38730c7fadf7353a0cdcf9a599 files/digest-apache-tools-2.2.4-r1 241
+SHA256 b4719ddba967e2c38193dc4fd4c74fd3c9a670528d947ff22095b6cf562edb41 files/digest-apache-tools-2.2.4-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGP4t7ugEuf3OQ0akRAvZJAJ90FsWQZ9cpP4UtAmrEJIa6+F3h4gCdFzsf
-NAmKETONv6hpSAbXdjOqr9w=
-=MyMh
+iD8DBQFGQcQougEuf3OQ0akRAt4vAJ4jfmJH+CKh5jKqMHU3gq5nH3yGbACgpJux
+hVDofCsLix3tvR+JeHpDS5o=
+=wOk4
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.4-r1.ebuild b/app-admin/apache-tools/apache-tools-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..d6f3b643367a
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 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.4-r1.ebuild,v 1.1 2007/05/09 12:54:18 kloeri Exp $
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/libpcre
+	!<net-www/apache-2.2.4"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_compile() {
+	cd "${S}"
+	econf \
+		--with-pcre=/usr || die "econf failed!"
+
+	cd support
+	emake htpasswd htdigest ab htdbm
+}
+
+src_install () {
+	cd "${S}"
+	dosbin support/{htdigest,htpasswd,ab,htdbm}
+	dodoc CHANGES INSTALL
+	doman docs/man/{htdigest.1,htpasswd.1,ab.8,htdbm.1}
+
+	# provide symlinks for all the stuff we no longer rename, bug 177697
+	for i in ab htdigest htpasswd; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+}
diff --git a/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1 b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1
new file mode 100644
index 000000000000..1e007f41e88e
--- /dev/null
+++ b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r1
@@ -0,0 +1,3 @@
+MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
+RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
+SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375