From 0d38c23307b7c1c654eb83f55e88a4a5d29d1597 Mon Sep 17 00:00:00 2001
From: Benedikt Boehm <hollow@gentoo.org>
Date: Sat, 25 Oct 2008 14:40:50 +0000
Subject: version bump wrt #242878 (Portage version: 2.1.4.5)

---
 app-admin/apache-tools/ChangeLog                   |  8 +-
 app-admin/apache-tools/apache-tools-2.2.10.ebuild  | 90 +++++++++++++++++++++
 .../apache-tools/apache-tools-2.2.8-r1.ebuild      | 93 ----------------------
 3 files changed, 97 insertions(+), 94 deletions(-)
 create mode 100644 app-admin/apache-tools/apache-tools-2.2.10.ebuild
 delete mode 100644 app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild

(limited to 'app-admin/apache-tools')

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 8ace7a47f60e..0628b97b4ce6 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.44 2008/10/25 13:58:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.45 2008/10/25 14:40:50 hollow Exp $
+
+*apache-tools-2.2.10 (25 Oct 2008)
+
+  25 Oct 2008; Benedikt Böhm <hollow@gentoo.org>
+  -apache-tools-2.2.8-r1.ebuild, +apache-tools-2.2.10.ebuild:
+  version bump wrt #242878
 
   25 Oct 2008; Benedikt Böhm <hollow@gentoo.org> apache-tools-2.2.9.ebuild:
   remove unrecognized options wrt #239735
diff --git a/app-admin/apache-tools/apache-tools-2.2.10.ebuild b/app-admin/apache-tools/apache-tools-2.2.10.ebuild
new file mode 100644
index 000000000000..8d59c505bd8e
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.10.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2008 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.10.ebuild,v 1.1 2008/10/25 14:40:50 hollow Exp $
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~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}"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply these patches:
+	# (1)	apache-tools-Makefile.patch:
+	#		- fix up the `make install' for support/
+	#		- remove envvars from `make install'
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
+}
+
+src_compile() {
+	local myconf=""
+	cd "${S}"
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	# Thanks to Harald van Dijk
+	append-ldflags -Wl,--no-as-needed
+
+	if use ssl ; then
+		myconf="${myconf} --with-ssl=/usr --enable-ssl"
+	fi
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+	econf \
+		--sbindir=/usr/sbin \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		${myconf} || die "econf failed!"
+
+	cd support
+	emake || die "emake support/ failed!"
+}
+
+src_install () {
+	cd "${S}"/support
+
+	make DESTDIR="${D}" install || die "make install failed!"
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+
+	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+
+	# 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
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild b/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild
deleted file mode 100644
index 22533d8e2e7c..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 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.8-r1.ebuild,v 1.3 2008/06/15 15:40:46 hollow Exp $
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~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}"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply these patches:
-	# (1)	apache-tools-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-}
-
-src_compile() {
-	local myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags -Wl,--no-as-needed
-
-	if use ssl ; then
-		myconf="${myconf} --with-ssl=/usr --enable-ssl"
-	fi
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
-
-	econf \
-		--sbindir=/usr/sbin \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		${myconf} || die "econf failed!"
-
-	cd support
-	emake || die "emake support/ failed!"
-}
-
-src_install () {
-	cd "${S}"/support
-
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-
-	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# 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
-
-	dodoc "${S}"/CHANGES
-}
-- 
cgit v1.2.3-65-gdbad