projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cec6142)
Cleanup.
authorLuca Longinotti <chtekk@gentoo.org>
Mon, 15 Jan 2007 16:45:26 +0000 (16:45 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Mon, 15 Jan 2007 16:45:26 +0000 (16:45 +0000)
Package-Manager: portage-2.1.2_rc4-r8

www-apache/mod_jk/ChangeLog patch | blob | history
www-apache/mod_jk/Manifest patch | blob | history
www-apache/mod_jk/metadata.xml patch | blob | history
www-apache/mod_jk/mod_jk-1.2.19.ebuild patch | blob | history
www-apache/mod_jk/mod_jk-1.2.20.ebuild patch | blob | history

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index d1eea9f26ab745913c66f287486689b38b9506fe..ae7e6a32e37cec63d724ec6c799a3cd28a10cfd0 100644 (file)
--- 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/Manifest b/www-apache/mod_jk/Manifest
index 0a9c2bccdae08cfef05e46a8d06b8114cce877e6..0ae1921a9eaaa365a5b00a83d616a7ccae6f4808 100644 (file)
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -8,22 +8,22 @@ RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
 DIST tomcat-connectors-1.2.19-src.tar.gz 1246419 RMD160 f48895b847b84a77f95ec87faa47115b023f686f SHA1 7e49c98000455ea226b16c45cf63fd565c2221eb SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0
 DIST tomcat-connectors-1.2.20-src.tar.gz 1316612 RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc SHA1 716b61ffa137067c1df9fb1b0a5d81f6969a181a SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610
-EBUILD mod_jk-1.2.19.ebuild 1881 RMD160 7ddafe100aff230d72368ef50a66438c2296a60b SHA1 7e0e49cceae649d173d89543e66c55be20ec667e SHA256 530848adf586eb270775f0bd9f8ef08bf1319da95b485e979102c14a548e6737
-MD5 150a31afdee16968181dc20563026d0a mod_jk-1.2.19.ebuild 1881
-RMD160 7ddafe100aff230d72368ef50a66438c2296a60b mod_jk-1.2.19.ebuild 1881
-SHA256 530848adf586eb270775f0bd9f8ef08bf1319da95b485e979102c14a548e6737 mod_jk-1.2.19.ebuild 1881
-EBUILD mod_jk-1.2.20.ebuild 1547 RMD160 a0a21b40b75c672a86e52e33108e5da43407d5f0 SHA1 b871d03c3cf6d9f924c41ae62103a80f3f8b87e7 SHA256 8c0ce344f4a373565b7e41792568af3eaf2e6b6db8700c26ccadcb4835ec4356
-MD5 904a7951aa4d3f6c944383aafd92f117 mod_jk-1.2.20.ebuild 1547
-RMD160 a0a21b40b75c672a86e52e33108e5da43407d5f0 mod_jk-1.2.20.ebuild 1547
-SHA256 8c0ce344f4a373565b7e41792568af3eaf2e6b6db8700c26ccadcb4835ec4356 mod_jk-1.2.20.ebuild 1547
-MISC ChangeLog 3092 RMD160 903d70287415c6812695bf02c67ba0860d5cf110 SHA1 7768d069167aec86ad01e42fab7dd19bab966ada SHA256 6ee4b53e5d436229f51fa6a34b2870ee2cfbfc585457e261565dd29ba3b01524
-MD5 12eba1a57b8882964a9f3ff5fbf78711 ChangeLog 3092
-RMD160 903d70287415c6812695bf02c67ba0860d5cf110 ChangeLog 3092
-SHA256 6ee4b53e5d436229f51fa6a34b2870ee2cfbfc585457e261565dd29ba3b01524 ChangeLog 3092
-MISC metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 SHA1 719bc65c876fdef4ef13af0f4e4a27259e342815 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101
-MD5 49773dac392214840f81ce9ed35bedf2 metadata.xml 473
-RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 metadata.xml 473
-SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101 metadata.xml 473
+EBUILD mod_jk-1.2.19.ebuild 1908 RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 SHA1 123831e02113608eaa0bb417528d63c44dffb4f5 SHA256 76b1294ddfc6760ca565e720ab0c95f573f427016453b8ea2a49a468602574e5
+MD5 981a100c54f2ae482a3db8c2c8d80e9b mod_jk-1.2.19.ebuild 1908
+RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 mod_jk-1.2.19.ebuild 1908
+SHA256 76b1294ddfc6760ca565e720ab0c95f573f427016453b8ea2a49a468602574e5 mod_jk-1.2.19.ebuild 1908
+EBUILD mod_jk-1.2.20.ebuild 1570 RMD160 9eb428f827cf896a1b8caf5850dea8ba9672707a SHA1 02ab08848bab101762a8b6476a379c682dfb6d60 SHA256 9ddc78b7a13baa67140a73e80ac7c59eadb138f38d1414c806860a15ca2c1353
+MD5 227d39c07e2b03ca166f2ba285295451 mod_jk-1.2.20.ebuild 1570
+RMD160 9eb428f827cf896a1b8caf5850dea8ba9672707a mod_jk-1.2.20.ebuild 1570
+SHA256 9ddc78b7a13baa67140a73e80ac7c59eadb138f38d1414c806860a15ca2c1353 mod_jk-1.2.20.ebuild 1570
+MISC ChangeLog 3216 RMD160 968d2b2fc9fd997473d641cdc9142d1e9de451bc SHA1 aed67c173b5d4e5b0baaef7b1b32f0ca299548e7 SHA256 03f839dabafc6c5b2e8236a177bef0cbfe2e6e2c059eaccaaa247ba81b33bda9
+MD5 8fe5d3d61666c1e60dae22b386e6b5a2 ChangeLog 3216
+RMD160 968d2b2fc9fd997473d641cdc9142d1e9de451bc ChangeLog 3216
+SHA256 03f839dabafc6c5b2e8236a177bef0cbfe2e6e2c059eaccaaa247ba81b33bda9 ChangeLog 3216
+MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
+MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
+RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
+SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f metadata.xml 490
 MD5 6a1a77b35ef40de8cea74b541da1086b files/digest-mod_jk-1.2.19 289
 RMD160 697b2e65cc081d5e40685b670d61f0992d46a628 files/digest-mod_jk-1.2.19 289
 SHA256 82a579b49926d41fc56a3e3866a8b00c430e49b455a50d31a3133a87ae07a221 files/digest-mod_jk-1.2.19 289
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 2d1988cc06dde09bc1428ff7c5ee24277f51947b..0fced3e64cee9d16a7b358da9ad7b1b4318043ae 100644 (file)
--- 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 c93d6d7658c8dd596c7cc7317bb2fdb34db6f565..7fe06672647290729158be37f2b0ffbb287eada4 100644 (file)
--- 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 f248ec1399534f31861b6ccbba0d4c5b7ffd475c..0e6fa120944e305b6c0e8d0a40693aec765d00fb 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.