Cleanup.

(Portage version: 2.1.2_rc4-r8)

4 files changed, 39 insertions, 33 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index d1eea9f26ab7..ae7e6a32e37c 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.16 2007/01/09 17:54:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.17 2007/01/15 16:45:26 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_jk-1.2.19.ebuild, mod_jk-1.2.20.ebuild:
+  Cleanup.
 
   09 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -mod_jk-1.2.15-r1.ebuild, mod_jk-1.2.19.ebuild, mod_jk-1.2.20.ebuild:
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 2d1988cc06dd..0fced3e64cee 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
+	<herd>apache</herd>
 	<herd>java</herd>
-
 	<maintainer>
 		<email>wltjr@gentoo.org</email>
 		<name>William L. Thomson Jr.</name>
 	</maintainer>
-
 	<longdescription>
 		mod_jk is a connector used to connect Tomcat JSP/Servlet 
 		container with web servers such as Apache, Netscape, 
 		Iplanet, SunOne and even IIS using the AJP protocol.
 	</longdescription>
-
 </pkgmetadata>
diff --git a/www-apache/mod_jk/mod_jk-1.2.19.ebuild b/www-apache/mod_jk/mod_jk-1.2.19.ebuild
index c93d6d7658c8..7fe066726472 100644
--- a/www-apache/mod_jk/mod_jk-1.2.19.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.19.ebuild
@@ -1,28 +1,30 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.19.ebuild,v 1.5 2007/01/09 17:54:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.19.ebuild,v 1.6 2007/01/15 16:45:26 chtekk Exp $
 
 inherit apache-module autotools java-pkg-opt-2
 
 MY_P="tomcat-connectors-${PV}-src"
 
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
-HOMEPAGE="http://tomcat.apache.org/connectors-doc"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+KEYWORDS="amd64 ~ppc x86"
 
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
+HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="apache2 java"
+IUSE="java"
 
 DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${MY_P}/native"
 
-APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
 APACHE1_MOD_CONF="88_${PN}"
 APACHE1_MOD_DEFINE="JK"
 
-APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so"
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
 
@@ -32,7 +34,7 @@ need_apache
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	eautoreconf
 }
@@ -50,18 +52,18 @@ src_compile() {
 		--with-apr-config=/usr/bin/apr-config \
 		${java_args} \
 		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
 }
 
 src_install() {
 	# install the workers.properties file
-	insinto ${APACHE_CONFDIR}
-	doins ${FILESDIR}/jk-workers.properties
+	insinto "${APACHE_CONFDIR}"
+	doins "${FILESDIR}/jk-workers.properties"
 
-	# if using java install the jni stuff
-	if use java; then
-		insinto ${APACHE_MODULESDIR}
-		doins ${S}/jni/jk_jnicb.so
+	# if using java, install the jni stuff
+	if use java ; then
+		insinto "${APACHE_MODULESDIR}"
+		doins "${S}/jni/jk_jnicb.so"
 	fi
 
 	# call the nifty default src_install :-)
diff --git a/www-apache/mod_jk/mod_jk-1.2.20.ebuild b/www-apache/mod_jk/mod_jk-1.2.20.ebuild
index f248ec139953..0e6fa120944e 100644
--- a/www-apache/mod_jk/mod_jk-1.2.20.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.20.ebuild
@@ -1,27 +1,30 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.20.ebuild,v 1.3 2007/01/09 17:54:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.20.ebuild,v 1.4 2007/01/15 16:45:26 chtekk Exp $
 
 inherit apache-module autotools
 
 MY_P="tomcat-connectors-${PV}-src"
 
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
-HOMEPAGE="http://tomcat.apache.org/connectors-doc"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~x86"
 
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
+HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apache2"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/native"
 
-APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
 APACHE1_MOD_CONF="88_${PN}"
 APACHE1_MOD_DEFINE="JK"
 
-APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so"
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
 
@@ -31,7 +34,7 @@ need_apache
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	eautoreconf
 }
@@ -45,13 +48,13 @@ src_compile() {
 		--with-apxs=${apxs} \
 		--with-apr-config=/usr/bin/apr-config \
 		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
 }
 
 src_install() {
 	# install the workers.properties file
-	insinto ${APACHE_CONFDIR}
-	doins ${FILESDIR}/jk-workers.properties
+	insinto "${APACHE_CONFDIR}"
+	doins "${FILESDIR}/jk-workers.properties"
 
 	# call the nifty default src_install :-)
 	apache-module_src_install