[gentoo-commits] dev/ultrabug:master commit in: www-servers/jetty-bin/files/, www-servers/jetty-bin/files/conf.d/, ...

[Alexys Jacob]

commit:     b971801d32ac9597719c9aeaa54ab1b9d69df761
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 14:26:47 2012 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 14:26:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=b971801d

jetty and solr rework

---
 www-servers/jetty-bin/ChangeLog                    |   39 ------
 www-servers/jetty-bin/Manifest                     |   10 +-
 www-servers/jetty-bin/files/conf.d/jetty-7         |   24 ----
 www-servers/jetty-bin/files/init.d/jetty-6         |   51 -------
 www-servers/jetty-bin/files/init.d/jetty-7         |   51 -------
 .../files/{conf.d/jetty-6 => jetty.confd}          |    0
 www-servers/jetty-bin/files/jetty.initd            |   51 +++++++
 .../{jetty => jetty-bin}/jetty-6.1.26.ebuild       |   23 ++--
 www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild   |  145 --------------------
 www-servers/jetty/Manifest                         |    6 -
 www-servers/jetty/files/jetty.conf                 |    1 -
 www-servers/jetty/files/jetty.confd                |   30 ----
 www-servers/jetty/files/jetty.initd                |   36 -----
 www-servers/jetty/files/jetty.xml                  |  143 -------------------
 www-servers/solr/Manifest                          |    2 +-
 www-servers/solr/solr-3.5.0.ebuild                 |    6 +-
 16 files changed, 70 insertions(+), 548 deletions(-)

diff --git a/www-servers/jetty-bin/ChangeLog b/www-servers/jetty-bin/ChangeLog
deleted file mode 100644
index 9105226..0000000
--- a/www-servers/jetty-bin/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-# ChangeLog for www-servers/jetty-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  02 Feb 2012; Sven Eden <sven.eden@×××.de>
-  -jetty-bin-7.5.4.ebuild :
-  It is not possible to make Eclipse be happy with jetty-7, so
-  drop it.
-
-*jetty-bin-7.5.4.ebuild (02 Feb 2012)
-*jetty-bin-6.1.26-r3.ebuild (02 Feb 2012)
-
-  02 Feb 2012; Sven Eden <sven.eden@×××.de>
-  +jetty-bin-7.5.4.ebuild :
-  First Ebuild for Jetty-7
-  +jetty-bin-6.1.26-r3.ebuild :
-  Cleaned up some issues
-
-  - jetty-bin-6.1.26.ebuild
-  - jetty-bin-6.1.26-r1.ebuild
-  - jetty-bin-6.1.26-r2.ebuild
-  Removed old ebuilds
-
-*jetty-bin-6.1.26-r2.ebuild (22 Nov 2011)
-
-  15 Aug 2011; Sven Eden <sven.eden@×××.de> +jetty-bin-6.1.26-r2.ebuild :
-  Added USE_Flag "tomcat7" to depend on tomcat:3.0 instead of 2.5.
-
-*jetty-bin-6.1.26-r1.ebuild (16 Aug 2011)
-
-  15 Aug 2011; Sven Eden <sven.eden@×××.de> +jetty-bin-6.1.26-r1.ebuild :
-  Changed the ebuild to install as "jetty" and not "jetty-bin". Eclipse
-  3.7 now merges fine with it.
-
-*jetty-bin-6.1.26.ebuild (15 Aug 2011)
-
-  15 Aug 2011; Sven Eden <sven.eden@×××.de> +jetty-bin-6.1.26.ebuild :
-  Initial commit of the ebuild. Ebuild taken from Bug #328747, written
-  by John J. Aylward (johnjaylward@×××××.com)

diff --git a/www-servers/jetty-bin/Manifest b/www-servers/jetty-bin/Manifest
index 80c4484..72fa9fc 100644
--- a/www-servers/jetty-bin/Manifest
+++ b/www-servers/jetty-bin/Manifest
@@ -1,8 +1,4 @@
-AUX conf.d/jetty-6 676 RMD160 47bd799223d448b21e83d4f2102597ba1012788d SHA1 4add53cc8f55b8d3154efab67b4e082270089356 SHA256 19ea54fbf09fab5b3ccaf819ae872935d6d3718ce6e753dc834302a6be4d199f
-AUX conf.d/jetty-7 638 RMD160 833e953d23750afd17e20a8b4274e84150a0bf03 SHA1 4b9e6c67ed1eba32d36e840a590d378a8975a0ce SHA256 5e15c5283ac1177d42e209f1838b34d50c8c687befb3978f31072c16b8cdc0f5
-AUX init.d/jetty-6 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f278c31dc1397df1b6bd318f844a2266c8ebf4 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720
-AUX init.d/jetty-7 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f278c31dc1397df1b6bd318f844a2266c8ebf4 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720
+AUX jetty.confd 676 RMD160 47bd799223d448b21e83d4f2102597ba1012788d SHA1 4add53cc8f55b8d3154efab67b4e082270089356 SHA256 19ea54fbf09fab5b3ccaf819ae872935d6d3718ce6e753dc834302a6be4d199f
+AUX jetty.initd 1386 RMD160 32d113aae6e88329259b1c5d41b2862c39f58bbc SHA1 fdc943dd47cefde4dc80e2ee83692be05970b8ad SHA256 3cda6f5a29b774699b5f3694990ebae1e85ffd0c9925b13368b2ae51c8200622
 DIST jetty-6.1.26.zip 25894195 RMD160 6e960763e720641e1bfd69ca8e5d54f0bc7d8def SHA1 9485913f1a1945a849a90f1a34853d22350bc524 SHA256 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187
-DIST jetty-ant-6.1.26.jar 22961 RMD160 910a0e8522a9bf9f6e33298d72a1aba46aa39954 SHA1 0e07d6fad03c440daa7b0523ffbf58bf41151266 SHA256 b82f643508d0fbcac5f92e3ecd7271684be098a97bd1304345c00c98a4d95f4c
-EBUILD jetty-bin-6.1.26-r3.ebuild 5139 RMD160 d7f4bd16c30eeb4170a4bccefbcaef22ba73f423 SHA1 a0631ac1df261e9b60dee3f94010159d76eb771e SHA256 2c9fe405e256f08deeb2a2dbd3bc9d90147c519635f4bd78313b483c0f03f3fe
-MISC ChangeLog 1254 RMD160 50e0707342b57c5625020bca3888186edccc4f8a SHA1 3447932b56e0b58d26e4a177205481da1d7bc67b SHA256 1706f719a8484e130b69d691f568b2b8547ee232750ce5c712b4d12d4c5b1086
+EBUILD jetty-6.1.26.ebuild 1192 RMD160 825b8439cedd74f78a1a9dd91d41d37cb70c92ac SHA1 52a5e0f4bab1365fa656572239bf78c1891f1013 SHA256 a428715e68f1983ee96a23a67f170eb94c587a24b0410fc1bdd477395210a0a4

diff --git a/www-servers/jetty-bin/files/conf.d/jetty-7 b/www-servers/jetty-bin/files/conf.d/jetty-7
deleted file mode 100644
index 43c75e0..0000000
--- a/www-servers/jetty-bin/files/conf.d/jetty-7
+++ /dev/null
@@ -1,24 +0,0 @@
-#Configuration options for jetty server
-
-#JETTY_HOST=localhost
-#JETTY_PORT=8080
-
-# port to listen on to stop the server
-#STOP_PORT=8079
-
-# "password" used on the stop port to verify that the server should be stopped
-STOP_KEY=secret
-
-# Set this value to 1 and configure the jetty-setuid.xml to have the server run as an unprivilaged user
-#USE_SETUID=1
-
-# Set this value to 1 to use ipv6
-#USE_IPV6=1
-
-# Use the SSL config jetty-ssl.xml
-#USE_SSL=1
-
-# Set this to a space delimited list of extra conf files you want loaded
-# The files are relative to ${JETTY_HOME} so
-# ex. JETTY_CONF="etc/jetty-ajp.xml etc/jetty-logging.xml"
-#JETTY_CONF=""

diff --git a/www-servers/jetty-bin/files/init.d/jetty-6 b/www-servers/jetty-bin/files/init.d/jetty-6
deleted file mode 100644
index 1e54649..0000000
--- a/www-servers/jetty-bin/files/init.d/jetty-6
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-  need net
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-
-    JETTY_HOME="/var/lib/${SVCNAME}"
-    CONF_FILES="${JETTY_HOME}/etc/jetty.xml"
-    JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config"
-
-    if [[ -n ${JETTY_HOST} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}"
-    fi
-    if [[ -n ${JETTY_PORT} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}"
-    fi
-    if [[ -n ${STOP_PORT} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}"
-    fi
-    if [[ -n ${STOP_KEY} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}"
-    fi
-    if [[ ${USE_SETUID} -eq 1 ]]; then
-       # Setuid configuration file needs to be the first one in the list
-       CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}"
-       JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/"
-    fi
-    if [[ ${USE_IPV6} -ne 1 ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true"
-    fi
-    if [[ ${USE_SSL} -eq 1 ]]; then
-       # Setuid configuration file needs to be the first one in the list
-       CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml"
-    fi
-
-    cd "${JETTY_HOME}"
-
-    start-stop-daemon --start --background --make-pidfile \
-	  --pidfile /var/run/${SVCNAME}.pid \
-	  --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF}
-    eend $?
-}
-
-stop() {
-   ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
-   eend $?
-}

diff --git a/www-servers/jetty-bin/files/init.d/jetty-7 b/www-servers/jetty-bin/files/init.d/jetty-7
deleted file mode 100644
index 1e54649..0000000
--- a/www-servers/jetty-bin/files/init.d/jetty-7
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-  need net
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-
-    JETTY_HOME="/var/lib/${SVCNAME}"
-    CONF_FILES="${JETTY_HOME}/etc/jetty.xml"
-    JETTY_OPTS="-DSTART=${JETTY_HOME}/start.config"
-
-    if [[ -n ${JETTY_HOST} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}"
-    fi
-    if [[ -n ${JETTY_PORT} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}"
-    fi
-    if [[ -n ${STOP_PORT} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}"
-    fi
-    if [[ -n ${STOP_KEY} ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}"
-    fi
-    if [[ ${USE_SETUID} -eq 1 ]]; then
-       # Setuid configuration file needs to be the first one in the list
-       CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}"
-       JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/"
-    fi
-    if [[ ${USE_IPV6} -ne 1 ]]; then
-       JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true"
-    fi
-    if [[ ${USE_SSL} -eq 1 ]]; then
-       # Setuid configuration file needs to be the first one in the list
-       CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml"
-    fi
-
-    cd "${JETTY_HOME}"
-
-    start-stop-daemon --start --background --make-pidfile \
-	  --pidfile /var/run/${SVCNAME}.pid \
-	  --startas java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF}
-    eend $?
-}
-
-stop() {
-   ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
-   eend $?
-}

diff --git a/www-servers/jetty-bin/files/conf.d/jetty-6 b/www-servers/jetty-bin/files/jetty.confd
similarity index 100%
rename from www-servers/jetty-bin/files/conf.d/jetty-6
rename to www-servers/jetty-bin/files/jetty.confd

diff --git a/www-servers/jetty-bin/files/jetty.initd b/www-servers/jetty-bin/files/jetty.initd
new file mode 100644
index 0000000..5820fc2
--- /dev/null
+++ b/www-servers/jetty-bin/files/jetty.initd
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	JETTY_HOME="/opt/${SVCNAME}"
+	CONF_FILES="${JETTY_HOME}/etc/jetty.xml"
+	JETTY_OPTS=""
+
+	if [[ -n ${JETTY_HOST} ]]; then
+		JETTY_OPTS="${JETTY_OPTS} -Djetty.host=${JETTY_HOST}"
+	fi
+	if [[ -n ${JETTY_PORT} ]]; then
+		JETTY_OPTS="${JETTY_OPTS} -Djetty.port=${JETTY_PORT}"
+	fi
+	if [[ -n ${STOP_PORT} ]]; then
+		JETTY_OPTS="${JETTY_OPTS} -DSTOP.PORT=${STOP_PORT}"
+	fi
+	if [[ -n ${STOP_KEY} ]]; then
+		JETTY_OPTS="${JETTY_OPTS} -DSTOP.KEY=${STOP_KEY}"
+	fi
+	if [[ ${USE_SETUID} -eq 1 ]]; then
+		# Setuid configuration file needs to be the first one in the list
+		CONF_FILES="${JETTY_HOME}/etc/jetty-setuid.xml ${CONF_FILES}"
+		#JETTY_OPTS="${JETTY_OPTS} -Djava.library.path=/usr/lib64/${SVCNAME}/"
+	fi
+	if [[ ${USE_IPV6} -ne 1 ]]; then
+		JETTY_OPTS="${JETTY_OPTS} -Djava.net.preferIPv4Stack=true"
+	fi
+	if [[ ${USE_SSL} -eq 1 ]]; then
+		# Setuid configuration file needs to be the first one in the list
+		CONF_FILES="${CONF_FILES} ${JETTY_HOME}/etc/jetty-ssl.xml"
+	fi
+
+	cd "${JETTY_HOME}"
+
+    start-stop-daemon --start --background --make-pidfile \
+		--pidfile /var/run/${SVCNAME}.pid \
+		--exec java -- ${JETTY_OPTS} -jar ${JETTY_HOME}/start.jar ${CONF_FILES} ${JETTY_CONF}
+    eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}

diff --git a/www-servers/jetty/jetty-6.1.26.ebuild b/www-servers/jetty-bin/jetty-6.1.26.ebuild
similarity index 72%
rename from www-servers/jetty/jetty-6.1.26.ebuild
rename to www-servers/jetty-bin/jetty-6.1.26.ebuild
index cf4f998..bfd010b 100755
--- a/www-servers/jetty/jetty-6.1.26.ebuild
+++ b/www-servers/jetty-bin/jetty-6.1.26.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 inherit eutils
 
 DESCRIPTION="Jetty is an full-featured web and applicaction server implemented entirely in Java."
@@ -13,12 +15,14 @@ LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+MY_PN=${PN/-bin}
+
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	dev-java/java-config"
 RDEPEND=">=virtual/jdk-1.5"
 
-JETTY_HOME="/opt/${PN}"
+JETTY_HOME="/opt/${MY_PN}"
 
 pkg_setup() {
 	enewgroup jetty
@@ -28,8 +32,8 @@ pkg_setup() {
 src_install() {
 	sed -i -e 's@default="./logs"@default="/var/log/jetty"@g' etc/jetty.xml || die
 
-# 	newinitd "${FILESDIR}"/jetty.initd jetty
-# 	newconfd "${FILESDIR}"/jetty.confd jetty
+	newinitd "${FILESDIR}"/"${MY_PN}".initd "${MY_PN}"
+	newconfd "${FILESDIR}"/"${MY_PN}".confd "${MY_PN}"
 
 	dodir "${JETTY_HOME}"
 	insinto "${JETTY_HOME}"
@@ -40,16 +44,13 @@ src_install() {
 
 	dodir "${JETTY_HOME}"/webapps
 	dodir "${JETTY_HOME}"/etc/contexts
-	dosym "${JETTY_HOME}"/etc /etc/jetty
-
-# 	exeinto "${JETTY_HOME}"/bin
-# 	doexe bin/jetty.sh
+	dosym "${JETTY_HOME}"/etc /etc/"${MY_PN}"
 
 	fowners -R jetty:jetty "${JETTY_HOME}"
 
-	keepdir /var/log/jetty
-	fowners jetty:jetty /var/log/jetty
+	keepdir /var/log/"${MY_PN}"
+	fowners jetty:jetty /var/log/"${MY_PN}"
 
-	keepdir /var/run/jetty
-	fowners jetty:jetty /var/run/jetty
+	keepdir /var/run/"${MY_PN}"
+	fowners jetty:jetty /var/run/"${MY_PN}"
 }

diff --git a/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild b/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild
deleted file mode 100644
index 6a4204a..0000000
--- a/www-servers/jetty-bin/jetty-bin-6.1.26-r3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Jetty Web Server; Java Servlet container"
-
-SLOT="6"
-HOMEPAGE="http://jetty.codehaus.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-MY_PN=${PN/-bin}
-MY_JETTY=${MY_PN}-${SLOT}
-MY_P=${MY_PN}-${PV}
-
-IUSE="anttasks client ldap ssl stats tomcat7"
-
-SRC_URI="http://dist.codehaus.org/jetty/jetty-${PV}/jetty-${PV}.zip
-	anttasks? ( http://dist.codehaus.org/jetty/jetty-${PV}/jetty-ant-${PV}.jar )"
-RESTRICT="mirror"
-
-DEPEND="
-  tomcat7? ( dev-java/tomcat-servlet-api:3.0 )
-  !tomcat7? ( dev-java/tomcat-servlet-api:2.5 )
-	!www-servers/jetty:${SLOT}
-	!www-servers/jetty-eclipse:${SLOT}
-	!www-servers/jetty-eclipse-bin:${SLOT}
-	>=virtual/jre-1.5"
-
-RDEPEND="${DEPEND}
-	anttasks? ( dev-java/ant )
-	>=dev-java/slf4j-api-1.3.1
-	>=dev-java/sun-javamail-1.4
-	>=dev-java/jta-1.0.1
-	>=java-virtuals/jaf-1.1"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-    cd "${S}"
-    rm -f etc/jetty-sslengine.xml
-
-    java-pkg_jarinto "/usr/share/${MY_JETTY}/lib/"
-    java-pkg_sointo "/usr/$(get_libdir)/${MY_JETTY}"
-
-    java-pkg_dojar start.jar
-    java-pkg_newjar lib/${MY_P}.jar ${MY_PN}.jar
-    java-pkg_newjar lib/${MY_PN}-util-${PV}.jar ${MY_PN}-util.jar
-    java-pkg_newjar lib/jre1.5/${MY_PN}-util5-${PV}.jar ${MY_PN}-util5.jar
-    java-pkg_newjar lib/annotations/${MY_PN}-annotations-${PV}.jar ${MY_PN}-annotations.jar
-    java-pkg_newjar lib/ext/${MY_PN}-rewrite-handler-${PV}.jar ${MY_PN}-rewrite-handler.jar
-    java-pkg_newjar lib/ext/${MY_PN}-html-${PV}.jar ${MY_PN}-html.jar
-    java-pkg_newjar lib/ext/${MY_PN}-java5-threadpool-${PV}.jar ${MY_PN}-java5-threadpool.jar
-    java-pkg_newjar lib/ext/${MY_PN}-ajp-${PV}.jar ${MY_PN}-ajp.jar
-    java-pkg_newjar lib/ext/${MY_PN}-servlet-tester-${PV}.jar ${MY_PN}-servlet-tester.jar
-    java-pkg_newjar lib/ext/${MY_PN}-setuid-${PV}.jar ${MY_PN}-setuid.jar
-    java-pkg_doso   lib/ext/libsetuid.so
-    java-pkg_newjar lib/jsp-2.1/jsp-2.1-${MY_P}.jar jsp-2.1-${MY_PN}.jar
-    java-pkg_newjar lib/management/${MY_PN}-management-${PV}.jar ${MY_PN}-management.jar
-    java-pkg_newjar lib/naming/${MY_PN}-naming-${PV}.jar ${MY_PN}-naming.jar
-    java-pkg_newjar lib/plus/${MY_PN}-plus-${PV}.jar ${MY_PN}-plus.jar
-    java-pkg_newjar lib/terracotta/${MY_PN}-terracotta-sessions-${PV}.jar ${MY_PN}-terracotta-sessions.jar
-    java-pkg_newjar lib/xbean/${MY_PN}-xbean-${PV}.jar ${MY_PN}-xbean.jar
-
-    use client && java-pkg_newjar lib/ext/${MY_PN}-client-${PV}.jar ${MY_PN}-client.jar
-    if use ldap ; then
-       java-pkg_newjar lib/ext/${MY_PN}-ldap-jaas-${PV}.jar ${MY_PN}-ldap-jaas.jar
-    else
-       rm -f etc/jetty-jaas.xml
-    fi
-    if use ssl ; then
-       java-pkg_newjar lib/ext/${MY_PN}-sslengine-${PV}.jar ${MY_PN}-sslengine.jar
-    else
-       rm -f etc/jetty-ssl.xml
-    fi
-    if use stats ; then
-       java-pkg_newjar lib/ext/${MY_PN}-java5-stats-${PV}.jar ${MY_PN}-java5-stats.jar
-    else
-       rm -f etc/jetty-stats.xml
-    fi
-
-    if use anttasks ; then
-       java-pkg_dojar bin/jetty-tasks.xml
-       cd ${DISTDIR}
-       java-pkg_newjar ${MY_PN}-ant-${PV}.jar ${MY_PN}-ant.jar
-       cd ${S}
-    fi
-
-
-    dodir /etc/${MY_JETTY}
-    insinto /etc/${MY_JETTY}
-    doins etc/*
-
-    dodir /etc/conf.d
-    insinto /etc/conf.d
-    newins ${FILESDIR}/conf.d/${MY_JETTY} ${MY_JETTY}
-    
-    dodir /etc/init.d
-    exeinto /etc/init.d
-    newexe ${FILESDIR}/init.d/${MY_JETTY} ${MY_JETTY}
-
-    dodir /var/log/${MY_JETTY}
-
-    JETTY_HOME=/var/lib/${MY_JETTY}
-    dodir ${JETTY_HOME}/webapps
-    dodir ${JETTY_HOME}/contexts
-    dodir ${JETTY_HOME}/resources
-    dosym ${JAVA_PKG_JARDEST} ${JETTY_HOME}/lib
-    dosym ${JAVA_PKG_JARDEST}/start.jar ${JETTY_HOME}/start.jar
-    dosym /etc/${MY_JETTY} ${JETTY_HOME}/etc
-    dosym /var/log/${MY_JETTY} ${JETTY_HOME}/logs
-
-    START_CONFIG=${D}/${JETTY_HOME}/start.config
-    echo "\$(jetty.class.path).path                         always" > ${START_CONFIG}
-    echo "\$(jetty.lib)/**                                  exists \$(jetty.lib)" >> ${START_CONFIG}
-    echo "jetty.home=${JETTY_HOME}" >> ${START_CONFIG}
-    echo "org.mortbay.xml.XmlConfiguration.class" >> ${START_CONFIG}
-    echo "\$(start.class).class" >> ${START_CONFIG}
-    echo "\$(jetty.home)/etc/jetty.xml" >> ${START_CONFIG}
-    echo "\$(jetty.home)/lib/*" >> ${START_CONFIG}
-    echo "/usr/share/sun-javamail/lib/*" >> ${START_CONFIG}
-    echo "/usr/share/ant/lib/*" >> ${START_CONFIG}
-    echo "/usr/share/slf4j-api/lib/*" >> ${START_CONFIG}
-    echo "/usr/share/jta/lib/*" >> ${START_CONFIG}
-    if use tomcat7 ; then
-      echo "/usr/share/tomcat-servlet-api-3.0/lib/*" >> ${START_CONFIG}
-    else
-      echo "/usr/share/tomcat-servlet-api-2.5/lib/*" >> ${START_CONFIG}
-    fi
-    echo "" >> ${START_CONFIG}
-    echo "\$(jetty.home)/resources/" >> ${START_CONFIG}
-}
-
-pkg_preinst () {
-    enewuser jetty
-    fowners jetty:jetty /var/log/${MY_JETTY}
-    fperms g+w /var/log/${MY_JETTY}
-    mv ${D}/usr/share/${PN}-${SLOT}/package.env ${D}/usr/share/${MY_JETTY}/package.env
-    rm -rf ${D}/usr/share/${PN}-${SLOT}
-}
-

diff --git a/www-servers/jetty/Manifest b/www-servers/jetty/Manifest
deleted file mode 100644
index 7f1b4bc..0000000
--- a/www-servers/jetty/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX jetty.conf 21 RMD160 a8c154d733ca49824e576de3ad7584a2fb9f154e SHA1 9c044b7e0b6cd4560bdb1b137570bd74071e79f2 SHA256 03fbba4876f4f3733ea8a00ac4f40fd5be5eccee728c4e501d9f6d7e9ebfad13
-AUX jetty.confd 933 RMD160 9f666b8184a89f0e8d671c0fc87afefa0a3f7df1 SHA1 f9f7b052672e7182f794c0ca8b1af0c0a04834ac SHA256 9edd437baa0eb556daf61ce93c53b8b36a1e9010f06280ed2f547c01c97fbfc1
-AUX jetty.initd 1002 RMD160 efbeabe8317a1a62a94cab7e560be540271626f6 SHA1 e1b1c02f6a25fef6e6280cd0d5845ec3e0c0a475 SHA256 1e244c66f155d198d6a9abaac80b23107c9e8c13bf4b9885f3d235c524bec5e4
-AUX jetty.xml 6165 RMD160 f620f74b257c620c0fd69d9438e295e8d1b27ce4 SHA1 3387f4606a1168e3a22bde1516987dd3a2449dc2 SHA256 e23234537cfd42b48d91e550b2a30b46b4e84b9c6d17cb73f0e9948a6a3a7a71
-DIST jetty-6.1.26.zip 25894195 RMD160 6e960763e720641e1bfd69ca8e5d54f0bc7d8def SHA1 9485913f1a1945a849a90f1a34853d22350bc524 SHA256 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187
-EBUILD jetty-6.1.26.ebuild 1224 RMD160 b68d9c6959e37a3360c03a863db4f0accf62e264 SHA1 0064d34f915202ae066ce73d01190a22e096330f SHA256 31c884534a45efb5ff2aa5ed13220839c0d0e497a671471a814ea15f3d80df9f

diff --git a/www-servers/jetty/files/jetty.conf b/www-servers/jetty/files/jetty.conf
deleted file mode 100755
index b5da826..0000000
--- a/www-servers/jetty/files/jetty.conf
+++ /dev/null
@@ -1 +0,0 @@
-/etc/jetty/jetty.xml

diff --git a/www-servers/jetty/files/jetty.confd b/www-servers/jetty/files/jetty.confd
deleted file mode 100755
index ca72909..0000000
--- a/www-servers/jetty/files/jetty.confd
+++ /dev/null
@@ -1,30 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-#
-# You can override this value with whatever path you wish.  
-# Example: JAVA_HOME="/opt/sun-jdk-1.4.1.01"
-
-# Set's JAVA_HOME to current selected JRE
-JAVA_HOME="$(java-config -O)"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTIONS=""
-
-# Where your web applications are located
-JETTY_HOME="/opt/jetty"
-
-# Jetty's User
-JETTY_USER="jetty"
-
-JETTY_PORT="8080"
-
-# Jetty is quite skilled where to look for configuration
-# setup files. If JETTY_CONF is not set it defaults to
-# /etc/jetty.conf $JETTY_HOME/etc/jetty.conf (see jetty.sh)
-JETTY_CONF="/etc/jetty/jetty.conf"
-
-# Additional CLASSPATH for Jetty to use, plus any others you need.
-#CLASSPATH="${CLASSPATH}:/YOUR_SPECIFIC_LIBDIR"

diff --git a/www-servers/jetty/files/jetty.initd b/www-servers/jetty/files/jetty.initd
deleted file mode 100755
index bbdf39b..0000000
--- a/www-servers/jetty/files/jetty.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: $
-
-JETTY_ENV="JAVA_HOME=${JAVA_HOME} JAVA_OPTIONS=\"${JAVA_OPTIONS}\""
-JETTY_ENV="${JETTY_ENV} JETTY_HOME=${JETTY_HOME} JETTY_CONSOLE=/var/log/jetty/jetty.log"
-JETTY_ENV="${JETTY_ENV} JETTY_PORT=${JETTY_PORT} JETTY_CONF=${JETTY_CONF} JETTY_RUN=/var/run/jetty"
-JETTY_ENV="${JETTY_ENV} CLASSPATH=${CLASSPATH}:${JETTY_ADD_CLASSPATH}"
-
-depend() {
-	need net
-	use dns logger postgresql mysql
-}
-
-start()	{
-	ebegin "Starting Jetty"
-	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
-	eend $?
-}
-
-stop ()	{
-	ebegin "Stopping Jetty"
-	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
-	sleep 2
-	eend $?
-}
-
-svc_restart () {
-	ebegin "Restarting Jetty"
-	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
-	sleep 5
-	cd ${JETTY_HOME}
-	su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
-	eend $?
-}

diff --git a/www-servers/jetty/files/jetty.xml b/www-servers/jetty/files/jetty.xml
deleted file mode 100755
index 3ef3d67..0000000
--- a/www-servers/jetty/files/jetty.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
-    <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
-    <!-- =========================================================== -->
-    <Set name="ThreadPool">
-
-      <New class="org.mortbay.thread.QueuedThreadPool">
-        <Set name="minThreads">10</Set>
-        <Set name="maxThreads">200</Set>
-        <Set name="lowThreads">20</Set>
-        <Set name="SpawnOrShrinkAt">2</Set>
-      </New>
-
-    </Set>
-
-
-
-    <!-- =========================================================== -->
-    <!-- Set connectors                                              -->
-    <!-- =========================================================== -->
-    <!-- One of each type!                                           -->
-    <!-- =========================================================== -->
-
-    <!-- Use this connector for many frequently idle connections
-         and for threadless continuations.
-    -->
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-            <Set name="host">127.0.0.1</Set>
-            <Set name="port">8080</Set>
-            <Set name="maxIdleTime">10000</Set>
-            <Set name="Acceptors">2</Set>
-            <Set name="statsOn">false</Set>
-            <Set name="confidentialPort">8443</Set>
-            <Set name="lowResourcesConnections">5000</Set>
-            <Set name="lowResourcesMaxIdleTime">5000</Set>
-          </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Set up global session ID manager                            -->
-    <!-- =========================================================== -->
-    <!--
-    <Set name="sessionIdManager">
-      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
-        <Set name="workerName">node1</Set>
-      </New>
-    </Set>
-    -->
-
-    <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.mortbay.jetty.Handler">
-           <Item>
-             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
-           </Item>
-           <Item>
-             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- Configure the context deployer                              -->
-    <!-- A context deployer will deploy contexts described in        -->
-    <!-- configuration files discovered in a directory.              -->
-    <!-- The configuration directory can be scanned for hot          -->
-    <!-- deployments at the configured scanInterval.                 -->
-    <!--                                                             -->
-    <!-- This deployer is configured to deploy contexts configured   -->
-    <!-- in the $JETTY_HOME/contexts directory                       -->
-    <!--                                                             -->
-    <!-- =========================================================== -->
-
-    <Call name="addLifeCycle">
-      <Arg>
-        <New class="org.mortbay.jetty.deployer.ContextDeployer">
-          <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="configurationDir">/etc/jetty/contexts</Set>
-          <Set name="scanInterval">1</Set>
-        </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Configure Request Log                                       -->
-    <!-- Request logs  may be configured for the entire server here, -->
-    <!-- or they can be configured for a specific web app in a       -->
-    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
-                    <!-- for an example).                                            -->
-    <!-- =========================================================== -->
-    <Ref id="RequestLog">
-      <Set name="requestLog">
-        <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
-          <Set name="filename">/var/log/jetty/access.yyyy_mm_dd.log</Set>
-          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-          <Set name="retainDays">90</Set>
-          <Set name="append">true</Set>
-          <Set name="extended">true</Set>
-          <Set name="logCookies">false</Set>
-          <Set name="LogTimeZone">GMT</Set>
-        </New>
-      </Set>
-    </Ref>
-
-    <New id="ServerLog" class="java.io.PrintStream">
-      <Arg>
-        <New class="org.mortbay.util.RolloverFileOutputStream">
-          <Arg>/var/log/jetty/error.yyyy_mm_dd.log</Arg>
-          <Arg type="boolean">false</Arg>
-          <Arg type="int">90</Arg>
-          <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
-          <Get id="ServerLogName" name="datedFilename"/>
-        </New>
-      </Arg>
-    </New>
-    <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
-    <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
-
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <Set name="sendServerVersion">false</Set>
-    <Set name="sendDateHeader">true</Set>
-    <Set name="gracefulShutdown">1000</Set>
-
-</Configure>

diff --git a/www-servers/solr/Manifest b/www-servers/solr/Manifest
index 8d8643b..b3b657f 100644
--- a/www-servers/solr/Manifest
+++ b/www-servers/solr/Manifest
@@ -1,4 +1,4 @@
 AUX jetty-solr.xml 431 RMD160 52b20e7cbb74c70ebd8650007313a15c423eff3b SHA1 c17d71e161cbebb466c42b1d6266967128d29f81 SHA256 e3f5a4499db74586d56df7fabfaeeaef14e83caa7c1e003a004087604468660a
 AUX solr.xml 1320 RMD160 206cf52b217afec7ab83b16599d72f33e128753d SHA1 c5b1512c5c153c760063a38db085bdb73187b4d8 SHA256 45f7ea56648a651389e95ad9f653591331dcf47a3dae11aadbd8e806ec736dca
 DIST apache-solr-3.5.0.tgz 78673382 RMD160 365d4b27753375ea3a39b9d42c06b80dce474731 SHA1 020fc86dfd2405212c0f706111d8576dbb8e54b4 SHA256 804f3ba9d1296f81388605a79538b7362355693fbdd03b7b2dbf9a706bf1d1d0
-EBUILD solr-3.5.0.ebuild 1165 RMD160 349aa7d7984e44f12ae69153db29bc07584122c8 SHA1 dac4b6c2244d3b14842e2fc213ec774ae2081dd4 SHA256 fe0f001ac5459743bf5cb37c4ba89380dcb6559f1b1b6730f977b138ad5e3146
+EBUILD solr-3.5.0.ebuild 1156 RMD160 fa4f70afbde272215d6edcda9a3e4d6ce09d4637 SHA1 8c8ca8b815157c246b7f5552c6d3c05a7cbd71b4 SHA256 c49fb0866d2c3f17ea6c19a8e97ad972e11f0e7e841179972cd488bc6d8942c3

diff --git a/www-servers/solr/solr-3.5.0.ebuild b/www-servers/solr/solr-3.5.0.ebuild
index 61cb485..5cd73c2 100644
--- a/www-servers/solr/solr-3.5.0.ebuild
+++ b/www-servers/solr/solr-3.5.0.ebuild
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND="app-arch/unzip"
-DEPEND="www-servers/jetty"
-RDEPEND="${DEPEND}"
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	www-servers/jetty"
 
 S="${WORKDIR}/apache-${P}"