eclipse and jetty: remove jetty-7, it doesn't seem to be possible to

make eclipse accept anything but jetty-6.

3 files changed, 6 insertions, 151 deletions

diff --git a/www-servers/jetty-bin/ChangeLog b/www-servers/jetty-bin/ChangeLog
index c78a6d4..9105226 100644
--- a/www-servers/jetty-bin/ChangeLog
+++ b/www-servers/jetty-bin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2012; Sven Eden <sven.eden@gmx.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)
 
diff --git a/www-servers/jetty-bin/Manifest b/www-servers/jetty-bin/Manifest
index 0090d8f..d13f6f2 100644
--- a/www-servers/jetty-bin/Manifest
+++ b/www-servers/jetty-bin/Manifest
@@ -4,7 +4,5 @@ AUX init.d/jetty-6 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f
 AUX init.d/jetty-7 1542 RMD160 60df75201271ac2e62d1a164238a435b842c39b3 SHA1 90f278c31dc1397df1b6bd318f844a2266c8ebf4 SHA256 76872ed861876492cbf1915cb3bbb4fdc36996446744f816a78fbe0b321f8720
 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
-DIST jetty-distribution-7.5.4.v20111024.tar.gz 12304533 RMD160 0c26a161ea8caa4e0b47ee8614d469021eeccc88 SHA1 a5007de6f0c81c1b1551fd58f369ce7a2a554216 SHA256 afaa7b5370931122f4108b1c1eefcc3921960b9eb655f528559aa7ea303d308d
 EBUILD jetty-bin-6.1.26-r3.ebuild 5157 RMD160 1cbb9f5ce203e73596cc66756f222273e94e31f6 SHA1 3b22af51150e6911328c96ee7e3bb940df84bcbf SHA256 c9c0a43b1f65f5bf08c0ab8c6b39a023ab52b24b27afc0b307631165e726474b
-EBUILD jetty-bin-7.5.4.ebuild 6221 RMD160 ed7c142ab00940cb8a9061d5a042d0691b3c0611 SHA1 9fb9e7c920b1be5cb6fef54f3a0ff21b23d79c43 SHA256 3044cc72fb0be783ac78532cc067597e82c685117f73200452544f855acf7de6
-MISC ChangeLog 1107 RMD160 6a3279940c12fa15dad4c1f3bd11f96261283c61 SHA1 db2729429d79a95ae8e1b8ef3e27c1aa4ba59674 SHA256 adc4a2f648a030a53f0960b578b748eda6cccdd4bdee9d319ba8734fd99da8f6
+MISC ChangeLog 1254 RMD160 50e0707342b57c5625020bca3888186edccc4f8a SHA1 3447932b56e0b58d26e4a177205481da1d7bc67b SHA256 1706f719a8484e130b69d691f568b2b8547ee232750ce5c712b4d12d4c5b1086
diff --git a/www-servers/jetty-bin/jetty-bin-7.5.4.ebuild b/www-servers/jetty-bin/jetty-bin-7.5.4.ebuild
deleted file mode 100644
index d86a08a..0000000
--- a/www-servers/jetty-bin/jetty-bin-7.5.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 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="7"
-HOMEPAGE="http://jetty.codehaus.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0 Eclipse-1.0"
-
-MY_PV="${PV}.v20111024"
-MY_PN="jetty"
-MY_JETTY="${MY_PN}-${SLOT}"
-
-IUSE="client ssl stats tomcat7"
-
-SRC_URI="http://download.eclipse.org/${MY_PN}/stable-${SLOT}/dist/${MY_PN}-distribution-${MY_PV}.tar.gz"
-
-#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}
-	>=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_PN}-distribution-${MY_PV}"
-
-src_install() {
-    cd "${S}"
-
-    java-pkg_jarinto "/usr/share/${MY_JETTY}/lib/"
-    java-pkg_sointo "/usr/lib/${MY_JETTY}"
-
-    java-pkg_dojar start.jar
-
-    java-pkg_newjar lib/${MY_PN}-ajp-${MY_PV}.jar ${MY_PN}-ajp.jar
-    java-pkg_newjar lib/${MY_PN}-all-${MY_PV}-javadoc.jar ${MY_PN}-all-javadoc.jar
-    java-pkg_newjar lib/${MY_PN}-annotations-${MY_PV}.jar ${MY_PN}-annotations.jar
-    java-pkg_newjar lib/${MY_PN}-continuation-${MY_PV}.jar ${MY_PN}-continuation.jar
-    java-pkg_newjar lib/${MY_PN}-deploy-${MY_PV}.jar ${MY_PN}-deploy.jar
-    java-pkg_newjar lib/${MY_PN}-http-${MY_PV}.jar ${MY_PN}-http.jar
-    java-pkg_newjar lib/${MY_PN}-io-${MY_PV}.jar ${MY_PN}-io.jar
-    java-pkg_newjar lib/${MY_PN}-jmx-${MY_PV}.jar ${MY_PN}-jmx.jar
-    java-pkg_newjar lib/${MY_PN}-jndi-${MY_PV}.jar ${MY_PN}-jndi.jar
-    java-pkg_newjar lib/${MY_PN}-overlay-deployer-${MY_PV}.jar ${MY_PN}-overlay-deployer.jar
-    java-pkg_newjar lib/${MY_PN}-plus-${MY_PV}.jar ${MY_PN}-plus.jar
-    java-pkg_newjar lib/${MY_PN}-policy-${MY_PV}.jar ${MY_PN}-policy.jar
-    java-pkg_newjar lib/${MY_PN}-rewrite-${MY_PV}.jar ${MY_PN}-rewrite.jar
-    java-pkg_newjar lib/${MY_PN}-security-${MY_PV}.jar ${MY_PN}-security.jar
-    java-pkg_newjar lib/${MY_PN}-server-${MY_PV}.jar ${MY_PN}-server.jar
-    java-pkg_newjar lib/${MY_PN}-servlet-${MY_PV}.jar ${MY_PN}-servlet.jar
-    java-pkg_newjar lib/${MY_PN}-servlets-${MY_PV}.jar ${MY_PN}-servlets.jar
-    java-pkg_newjar lib/${MY_PN}-util-${MY_PV}.jar ${MY_PN}-util.jar
-    java-pkg_newjar lib/${MY_PN}-webapp-${MY_PV}.jar ${MY_PN}-webapp.jar
-    java-pkg_newjar lib/${MY_PN}-websocket-${MY_PV}.jar ${MY_PN}-websocket.jar
-    java-pkg_newjar lib/${MY_PN}-xml-${MY_PV}.jar ${MY_PN}-xml.jar
-    java-pkg_newjar lib/annotations/javax.annotation_1.0.0.v20100513-0750.jar javax.annotation.jar
-    java-pkg_newjar lib/annotations/org.objectweb.asm_3.1.0.v200803061910.jar org.objectweb.asm.jar
-    java-pkg_newjar lib/jndi/javax.activation_1.1.0.v201005080500.jar javax.activation.jar
-    java-pkg_newjar lib/jndi/javax.mail.glassfish_1.4.1.v201005082020.jar javax.mail.glassfish.jar
-    java-pkg_newjar lib/jsp/${MY_PN}-jsp-2.1-${MY_PV}.jar ${MY_PN}-jsp.jar
-    java-pkg_newjar lib/jsp/com.sun.el_1.0.0.v201004190952.jar com.sun.el.jar
-    java-pkg_newjar lib/jsp/ecj-3.6.jar ecj.jar
-    java-pkg_newjar lib/jsp/javax.el_2.1.0.v201004190952.jar javax.el.jar
-    java-pkg_newjar lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar javax.servlet.jsp.jstl.jar
-    java-pkg_newjar lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar javax.servlet.jsp.jar
-    java-pkg_newjar lib/jsp/jsp-impl-2.1.3-b10.jar jsp-impl.jar
-    java-pkg_newjar lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar org.apache.taglibs.standard.glassfish.jar
-    java-pkg_newjar lib/jta/javax.transaction_1.1.1.v201004190952.jar javax.transaction.jar
-    java-pkg_newjar lib/monitor/${MY_PN}-monitor-${MY_PV}.jar ${MY_PN}-monitor.jar
-    java-pkg_newjar lib/servlet-api-2.5.jar servlet-api.jar
-
-    use client && java-pkg_newjar lib/${MY_PN}-client-${MY_PV}.jar ${MY_PN}-client.jar
-    if ! use ssl ; then
-       rm -f etc/jetty-ssl.xml
-    fi
-    if ! use stats ; then
-       rm -f etc/jetty-stats.xml
-    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}
-}
-