Add Apache herd, cleanup.

(Portage version: 2.1.2_rc4-r8)

4 files changed, 44 insertions, 39 deletions

diff --git a/www-apache/anyterm/ChangeLog b/www-apache/anyterm/ChangeLog
index dfb6a46d299f..20d658389ff9 100644
--- a/www-apache/anyterm/ChangeLog
+++ b/www-apache/anyterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/anyterm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.3 2006/01/25 19:37:10 twp Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.4 2007/01/15 15:13:34 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  anyterm-1.1.8-r2.ebuild:
+  Add Apache herd, cleanup.
 
 *anyterm-1.1.8-r2 (25 Jan 2006)
 
diff --git a/www-apache/anyterm/anyterm-1.1.8-r2.ebuild b/www-apache/anyterm/anyterm-1.1.8-r2.ebuild
index 121d9f7bdbd2..650f3dcef1d5 100644
--- a/www-apache/anyterm/anyterm-1.1.8-r2.ebuild
+++ b/www-apache/anyterm/anyterm-1.1.8-r2.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.8-r2.ebuild,v 1.1 2006/01/25 19:37:10 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.8-r2.ebuild,v 1.2 2007/01/15 15:13:34 chtekk Exp $
 
 inherit apache-module eutils toolchain-funcs webapp
 
-DESCRIPTION="A terminal anywhere"
+KEYWORDS="~x86"
+
+DESCRIPTION="A terminal anywhere."
 HOMEPAGE="http://anyterm.org/"
 SRC_URI="http://anyterm.org/download/${P}.tbz2"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="pam ssl opera"
-DEPEND="
-	dev-libs/boost
-	>=dev-libs/rote-0.2.8
-	>=sys-devel/gcc-3
-	virtual/ssh
-	pam? ( net-www/mod_auth_pam )
-	"
+IUSE="opera pam ssl"
+
+DEPEND="dev-libs/boost
+		>=dev-libs/rote-0.2.8
+		>=sys-devel/gcc-3
+		virtual/ssh
+		pam? ( net-www/mod_auth_pam )"
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="50_${PN}"
 APACHE2_MOD_DEFINE="ANYTERM"
-useq ssl && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D SSL"
-useq pam && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D AUTH_PAM"
-APACHE2_MOD_FILE="${S}/apachemod/.libs/anyterm.so"
+use pam && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D AUTH_PAM"
+use ssl && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} -D SSL"
+APACHE2_MOD_FILE="${S}/apachemod/.libs/${PN}.so"
 DOCFILES="CHANGELOG README"
 
 WEBAPP_MANUAL_SLOT="yes"
@@ -46,25 +45,25 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-apachemod-Makefile.patch
-	epatch ${FILESDIR}/${P}-common-extern.patch
-	epatch ${FILESDIR}/${P}-browser-gentoo.patch
+	epatch "${FILESDIR}/${P}-apachemod-Makefile.patch"
+	epatch "${FILESDIR}/${P}-common-extern.patch"
+	epatch "${FILESDIR}/${P}-browser-gentoo.patch"
 
 	# The bundled libpbe causes lots of problems because it links to various
 	# assorted packages, without any checks. These packages may or not be
 	# installed. Here we disable all packages which are not required.
-	epatch ${FILESDIR}/${P}-libpbe-no-pg_config.patch
-	for f in Database Recoder jpegsize; do
-		rm ${S}/libpbe/src/${f}.{cc,hh}
+	epatch "${FILESDIR}/${P}-libpbe-no-pg_config.patch"
+	for f in Database Recoder jpegsize ; do
+		rm -f "${S}"/libpbe/src/${f}.{cc,hh}
 	done
 }
 
 src_compile() {
-	( cd apachemod && emake CC=$(tc-getCC) CXX=$(tc-getCXX) ) || die
+	( cd apachemod && emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ) || die "Apachemod make failed"
 
 	# Modify browser files to reflect USE flags.
-	for flag in ssl pam opera; do
-		if use ${flag}; then
+	for flag in opera pam ssl ; do
+		if use ${flag} ; then
 			sed -i -e "s/^#USE=${flag}#//" browser/{*,.htaccess}
 			sed -i -e "/^#USE=-${flag}#/D" browser/{*,.htaccess}
 		else
@@ -78,8 +77,8 @@ src_install() {
 	apache-module_src_install
 
 	webapp_src_preinst
-	cp browser/{*,.htaccess} ${D}/${MY_HTDOCSDIR}
-	webapp_postinst_txt en ${FILESDIR}/${P}-postinst-en.txt
+	cp -f browser/{*,.htaccess} "${D}/${MY_HTDOCSDIR}"
+	webapp_postinst_txt en "${FILESDIR}/${P}-postinst-en.txt"
 	webapp_src_install
 }
 
@@ -88,18 +87,18 @@ pkg_postinst() {
 
 	apache-module_pkg_postinst
 
-	if ! use ssl; then
+	if ! use ssl ; then
 		ewarn "USE=-ssl:   Anyterm without SSL is very insecure!"
 	fi
-	if ! use pam; then
+	if ! use pam ; then
 		ewarn "USE=-pam:   You will have to add your own authentication"
 		ewarn "            mechanism."
 	fi
-	if use opera; then
-	    ewarn "USE=opera:  Be sure to disable some logging in your apache"
+	if use opera ; then
+		ewarn "USE=opera:  Be sure to disable some logging in your Apache"
 		ewarn "            configuration files!"
 	fi
-	if ! use ssl || ! use pam || use opera; then
+	if ! use ssl || ! use pam || use opera ; then
 		ewarn "For more information see http://anyterm.org/security.html"
 	fi
 }
diff --git a/www-apache/anyterm/files/digest-anyterm-1.1.8-r2 b/www-apache/anyterm/files/digest-anyterm-1.1.8-r2
index 5aa11d832d47..d95bbe335179 100644
--- a/www-apache/anyterm/files/digest-anyterm-1.1.8-r2
+++ b/www-apache/anyterm/files/digest-anyterm-1.1.8-r2
@@ -1 +1,3 @@
 MD5 5ad8d6127680122e8f5c45f39093bd58 anyterm-1.1.8.tbz2 75137
+RMD160 8e2ba675b0697214579524a19d10bc7791a4834e anyterm-1.1.8.tbz2 75137
+SHA256 06c3896597cc9353c3d1fdcd33aab071f31b5fe7305561ba03372feeb92913ff anyterm-1.1.8.tbz2 75137
diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml
index d9bb4626fb2b..f5e00e0d0d9b 100644
--- a/www-apache/anyterm/metadata.xml
+++ b/www-apache/anyterm/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>twp@gentoo.org</email>
-  <name>Tom Payne</name>
-</maintainer>
+	<herd>apache</herd>
+	<maintainer>
+		<email>twp@gentoo.org</email>
+		<name>Tom Payne</name>
+	</maintainer>
 </pkgmetadata>