commit: ea570855a5ae77d34228c33c3b3576fb0317ce93
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Aug 6 18:53:31 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 21:34:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=ea570855
[dev-java/java-service-wrapper] Drop old, invalid license
dev-java/java-service-wrapper/ChangeLog | 14 -----
dev-java/java-service-wrapper/Manifest | 1 -
.../java-service-wrapper-3.1.2-buildxml.patch | 64 -------------------
.../files/java-service-wrapper-3.1.2-gentoo.patch | 27 --------
.../java-service-wrapper-3.1.2-r2.ebuild | 71 ----------------------
dev-java/java-service-wrapper/metadata.xml | 6 --
6 files changed, 183 deletions(-)
diff --git a/dev-java/java-service-wrapper/ChangeLog
b/dev-java/java-service-wrapper/ChangeLog
deleted file mode 100644
index 4aef559..0000000
--- a/dev-java/java-service-wrapper/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for dev-java/java-service-wrapper
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 07 May 2007; Vlastimil Babka <cas...@gentoo.org>
- java-service-wrapper-3.1.2-r2.ebuild:
- Migrate to split-ant.
-
- 02 Sep 2006; Vlastimil Babka <cas...@matfyz.cz>
- -java-service-wrapper-3.1.2-r1.ebuild,
- +java-service-wrapper-3.1.2-r2.ebuild,
- +files/java-service-wrapper-3.1.2-buildxml.patch:
- Sorted out junit dependency and java-strict.
-
diff --git a/dev-java/java-service-wrapper/Manifest
b/dev-java/java-service-wrapper/Manifest
deleted file mode 100644
index 94495a8..0000000
--- a/dev-java/java-service-wrapper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wrapper_3.1.2_src.tar.gz 3327596 SHA256
8ba78e6e218a0574ab68590c1bc24785e6ac7956d2b91ea8fd060f4325d24300
diff --git
a/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-buildxml.patch
b/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-buildxml.patch
deleted file mode 100644
index 3cda3ca..0000000
---
a/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-buildxml.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- build.xml.orig 2006-09-02 22:49:33.000000000 +0200
-+++ build.xml 2006-09-02 23:00:36.000000000 +0200
-@@ -38,6 +38,7 @@
- <path id="test.class.path">
- <pathelement location="${build.testclasses}"/>
- <path refid="project.class.path"/>
-+ <fileset dir="${basedir}/lib" includes="**/*.jar"/>
- </path>
-
- <!-- ===================================================================
-->
-@@ -207,14 +208,6 @@
- <classpath refid="project.class.path"/>
- </javac>
-
-- <!-- compile everything under src/test -->
-- <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-- deprecation="on"
-- debug="on"
-- optimize="on"
-- target="1.2"> <!-- The 1.2 target is done so we work with
older JVMs -->
-- <classpath refid="test.class.path"/>
-- </javac>
-
- <!-- copy resource files to build directory -->
- <copy todir="${build.classes}" >
-@@ -231,6 +224,19 @@
- </fileset>
- </copy>
- </target>
-+
-+ <target name="compile-tests" depends="compile-java">
-+ <!-- compile everything under src/test -->
-+ <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-+ deprecation="on"
-+ debug="on"
-+ optimize="on"
-+ target="1.2"> <!-- The 1.2 target is done so we work with
older JVMs -->
-+ <classpath refid="test.class.path"/>
-+ </javac>
-+ </target>
-+
-+
- <target name="msvc-test" depends="convert,update-info" if="is.Windows">
- <condition property="msvc.present">
- <available file="${msvc.home}/VC98/BIN/VCVARS32.BAT"/>
-@@ -346,6 +352,9 @@
- includes="**/*.class,**/*.properties"
- excludes="**/test/*"
- />
-+ </target>
-+
-+ <target name="jar-tests" depends="compile-tests">
- <jar jarfile="${lib.dir}/wrappertest.jar"
- basedir="${build.classes}"
- includes="**/test/*"
-@@ -355,7 +364,7 @@
- <!-- ===================================================================
-->
- <!-- Test Task
-->
- <!-- ===================================================================
-->
-- <target name="test" depends="jar" description="Runs unit tests">
-+ <target name="test" depends="jar,jar-tests" description="Runs unit tests">
- <mkdir dir="${build.tests}"/>
-
- <junit fork="true"
diff --git
a/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-gentoo.patch
b/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-gentoo.patch
deleted file mode 100644
index f505149..0000000
---
a/dev-java/java-service-wrapper/files/java-service-wrapper-3.1.2-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru wrapper_3.1.2_src/src/c/Makefile.linux
wrapper_3.1.2_src-patched/src/c/Makefile.linux
---- wrapper_3.1.2_src/src/c/Makefile.linux 2004-09-30 23:28:00.000000000
-0400
-+++ wrapper_3.1.2_src-patched/src/c/Makefile.linux 2005-11-03
19:33:33.000000000 -0500
-@@ -1,4 +1,4 @@
--COMPILE = gcc -O3 -Wall --pedantic -pthread -DUSE_NANOSLEEP
-+COMPILE_FLAGS=-pthread -DUSE_NANOSLEEP -lm
-
- INCLUDE=$(JAVA_HOME)/include
-
-@@ -24,14 +24,14 @@
- if test ! -d .deps; then mkdir .deps; fi
-
- wrapper: $(wrapper_SOURCE)
-- $(COMPILE) $(wrapper_SOURCE) -o $(BIN)/wrapper
-+ $(CC) $(CFLAGS) $(COMPILE_FLAGS) $(wrapper_SOURCE) -o $(BIN)/wrapper
-
- libwrapper.so: $(libwrapper_so_OBJECTS)
-- ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o
$(LIB)/libwrapper.so
-+ ${CC} $(CFLAGS) $(COMPILE_FLAGS) -shared -fPIC $(libwrapper_so_OBJECTS)
-o $(LIB)/libwrapper.so
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
-- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+ $(CC) $(CFLAGS) -fPIC $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.1.2-r2.ebuild
b/dev-java/java-service-wrapper/java-service-wrapper-3.1.2-r2.ebuild
deleted file mode 100644
index 2455347..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-inherit base java-pkg-2 java-ant-2 eutils
-
-MY_PN=wrapper
-MY_P="${MY_PN}_${PV}_src"
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as
daemon."
-HOMEPAGE="http://wrapper.tanukisoftware.org/";
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="java-service-wrapper"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-# TODO test with 1.3
-DEPEND="${RDEPEND}
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit
- =dev-java/junit-3*
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Contains text relocations, should be fixed at some point
-RESTRICT="stricter"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # TODO file upstream
- epatch ${FILESDIR}/${P}-gentoo.patch
- epatch ${FILESDIR}/${P}-buildxml.patch
-
- # renamed to avoid usage of stuff here"
- mv tools tools-renamed-by-gentoo
-
- if use test; then
- mkdir lib
- cd lib
- java-pkg_jar-from --build-only junit
- fi
-}
-
-src_compile() {
- eant jar $(use_doc -Djdoc.dir=api jdoc)
-}
-
-src_test() {
- ANT_TASKS="ant-junit ant-nodeps" eant test
-}
-
-src_install() {
- java-pkg_dojar lib/wrapper.jar
- java-pkg_doso lib/libwrapper.so
- dobin bin/wrapper
-
- dodoc doc/{AUTHORS,readme.txt,revisions.txt}
-
- use doc && java-pkg_dohtml -r doc/english/ api
-
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/java-service-wrapper/metadata.xml
b/dev-java/java-service-wrapper/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/dev-java/java-service-wrapper/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>java</herd>
-</pkgmetadata>
-
