proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

15 files changed, 830 insertions, 0 deletions

diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
new file mode 100644
index 000000000000..4280cd6174e8
--- /dev/null
+++ b/dev-java/java-service-wrapper/Manifest
@@ -0,0 +1,5 @@
+DIST wrapper_3.2.3_src.tar.gz 3409483 SHA256 7e57b0103959fe3566def64b1dd3fef6537032a7e4b2a7811594f1db7d9f5859 SHA512 5ff696069402496e7b871b60a00a5a87a6bcaf1c30ad5c69530725cf7c45d55d98e2500761b36ecd1ac97f67331d43b43775cff89d526fecbc67056a8899519a WHIRLPOOL 4bf2376166b8d0d3164f31f2d5ec0f60d1e53f31afea72f7ca0d113ec331205d4bb539254295b03c0d9320c4c65e92378a95eca8a45b87728ea6003d619b09ae
+DIST wrapper_3.3.1_src.zip 381967 SHA256 5d3090c235e93bf5f502edd191b5aeb5d611743e8a4d1908fe308917ef601594 SHA512 cd15097b04de7f95e3ab751643292b2e01465cf52ac4c510d9a94ee955f81a623aba9bad592f09cbfa09a12b5fce27ce1526a3e785e4705f575ec9ab481b8438 WHIRLPOOL 08b5830726faf46164e0a79c6b690f9664b2799cedeb344e07cb842b97f0f599576c2cb37ded71d3eb43c6bf5e31bc13b04405d1eef3692c8d3a355193d8b311
+DIST wrapper_3.3.3_src.tar.gz 300817 SHA256 63a39aa218c1a8146f75b98cf232396ed89c2ea09a395a5b83bc6ce306ce64fc SHA512 0deff9374c009c24f8092195d0c3029581a61d02159bd10a8e100dfa0908a7ddfaf3fa7896df820df3fb695c047a378b6e02d7722b766dd7771d1313ca6f7cde WHIRLPOOL 5d8f470ee0b899a7d68384186c2c585f1e89c53d16499be4394078bcc7ee96de766f59481d81d7dfaeb12b5ecd1602c9dba298a0681d2f583718deb865498bfa
+DIST wrapper_3.5.14_src.tar.gz 499693 SHA256 dac159a3e68a54926deaa545b92d1ed54671ccc44a375b38d0fb514e1a846481 SHA512 7787d3edd46f61cbf1d1a175b8994c074b5471a35c0ccb9e5b860e709e5e7d3cbd40282c2ee222e7e8e076f84e3ad5af1019fae069809333ef1ab04f6eea2b26 WHIRLPOOL 30715d5ec3e8fdb15c489bf17112437b151a1bd1cfd2f02c1369c47002aa6aff689ef1c7996170283e5671beeaf8ed36076fac9f752a7956226f85f7e10663c2
+DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
new file mode 100644
index 000000000000..80d24f7469ce
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
@@ -0,0 +1,53 @@
+--- build.xml	2008-02-24 20:10:00.000000000 +1300
++++ build.xml	2008-02-24 20:17:10.000000000 +1300
+@@ -397,16 +397,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"
+-               source="${javac.target.version}"
+-               target="${javac.target.version}">
+-            <classpath refid="test.class.path"/>
+-        </javac>
+-
+         <!-- copy resource files to build directory -->
+         <copy todir="${build.classes}" > 
+             <fileset dir="${src.dir}/java" > 
+@@ -430,6 +420,24 @@
+             <class name="org.tanukisoftware.wrapper.WrapperManager"/>
+         </javah>
+     </target>
++
++    <target name="compile-test" depends="compile-java-warn">
++        <!-- compile everything under src/test -->
++        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
++                deprecation="on"
++                debug="on"
++                optimize="on"
++                source="${javac.target.version}"
++                target="${javac.target.version}">
++	        <classpath refid="test.class.path"/>
++	        <classpath>
++                <fileset dir="lib">
++		            <include name="**/*.jar"/>
++			    </fileset>
++            </classpath>
++        </javac>
++    </target>
++
+     <target name="msvc-missing" depends="init:msg" if="msvc.missing">
+         <condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
+             <equals arg1="${bits}" arg2="64"/>
+@@ -636,7 +644,7 @@
+     <!-- =================================================================== -->
+     <!-- Test Task                                                           -->
+     <!-- =================================================================== -->
+-    <target name="test" depends="jar" description="Runs unit tests">
++    <target name="test" depends="compile-test,jar" description="Runs unit tests">
+         <mkdir dir="${build.tests}"/>
+         
+         <junit fork="true"
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
new file mode 100644
index 000000000000..c61679a602c1
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make	2008-11-16 17:31:47.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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 -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make	2008-11-16 17:31:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/files/java-service-wrapper-3.5.14-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
new file mode 100644
index 000000000000..ce5fd4aed26b
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make	2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make	2012-04-18 23:47:55.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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 -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make	2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make	2012-04-18 23:50:06.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
++COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so  $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..b69927384dd2
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
@@ -0,0 +1,22 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Added in 3.5.4, make false default for Gentoo
+
+* Add a new wrapper.java.command.resolve property to control whether or not the
+  Wrapper tries to resolve any symbolic links in the Java command, specified
+  with the wrapper.java.command property.  Historically, it has always done so,
+  but some jvm started applications like run-java-tool on Gentoo will fail if
+  it is run directly as they have a check to make sure it is launched via a
+  symbolic link.
+
+--- a/src/c/wrapper.c
++++ b/src/c/wrapper.c
+@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
+     if (!path) {
+         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
+     } else {
+-        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE, TRUE);
++        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
+         if (replacePath == TRUE) {
+             free(*para);
+             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
new file mode 100644
index 000000000000..d956ff0b0043
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@@ -0,0 +1,156 @@
+
+--- src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
+@@ -36,17 +36,17 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ testsuite: $(testsuite_SOURCE)
+-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/$$/ :/' \
+--- src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
++++ src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
+@@ -36,17 +36,17 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ testsuite: $(testsuite_SOURCE)
+-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ 
+ %.o: %.c 
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(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/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..34e94bb77ed6
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -0,0 +1,25 @@
+|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|Added in 3.5.4, make false default for Gentoo
+|
+|* Add a new wrapper.java.command.resolve property to control whether or not the
+|  Wrapper tries to resolve any symbolic links in the Java command, specified
+|  with the wrapper.java.command property.  Historically, it has always done so,
+|  but some jvm started applications like run-java-tool on Gentoo will fail if
+|  it is run directly as they have a check to make sure it is launched via a
+|  symbolic link.
+|
+
+--- src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
++++ src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
+@@ -4908,7 +4908,7 @@
+     if (!path) {
+         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
+     } else {
+-        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
++        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
+         if (replacePath == TRUE) {
+             free(*para);
+             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
+
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
new file mode 100644
index 000000000000..d279cdf0f4ea
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
@@ -0,0 +1,12 @@
+diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:05.730644375 +0200
++++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:51.130013387 +0200
+@@ -23,7 +23,7 @@
+ LIB = ../../lib
+ TEST = ../../test
+ 
+-all: init wrapper libwrapper.so testsuite
++all: init wrapper libwrapper.so
+ 
+ clean:
+ 	rm -f *.o
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
new file mode 100644
index 000000000000..723ce123c62c
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	BITS="32"
+	use amd64 && BITS="64"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# TODO file upstream
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC -lm|g' \
+		"src/c/Makefile-linux-x86-${BITS}"
+	use amd64 && sed -i -e 's|gcc -O3 -fPIC -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
+		"src/c/Makefile-linux-x86-${BITS}"
+	# remove to avoid usage of stuff here"
+	rm -R tools
+
+	if use test; then
+		mkdir lib
+		cd lib
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+src_compile() {
+	tc-getCC
+	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api jdoc)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" 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 && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
new file mode 100644
index 000000000000..9274a7694c0b
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.zip"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	BITS="32"
+	use amd64 && BITS="64"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+}
+
+src_compile() {
+	tc-export CC
+	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api)
+}
+
+src_test() {
+	mkdir -p lib
+	java-pkg_jar-from --build-only --into lib junit
+
+	local gentoocp="gentoo.classpath=$(java-pkg_getjars --build-only junit)"
+
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" "${gentoocp}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc doc/{readme.txt,revisions.txt}
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild
new file mode 100644
index 000000000000..709341372c56
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+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="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.1-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc doc/{readme.txt,revisions.txt} || die
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
new file mode 100644
index 000000000000..6ffb9ff60f44
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt || die
+	dodoc doc/revisions.txt || die
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
new file mode 100644
index 000000000000..e1b68ca92b82
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+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="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.14-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt || die
+	dodoc doc/revisions.txt || die
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
new file mode 100644
index 000000000000..c0e1cae08abd
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
+	epatch "${FILESDIR}"/${P}-testsuite.patch
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -d api -sourcepath src/java/ -subpackages org \
+			|| die "javadoc	failed"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt || die
+	dodoc doc/revisions.txt || die
+
+	use doc && java-pkg_dojavadoc 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
new file mode 100644
index 000000000000..1f05146b8ffe
--- /dev/null
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		The Java Service Wrapper is an application which has evolved out of a desire 
+		to solve a number of problems common to many Java applications:
+		
+		* Run as a Windows Service or Unix Daemon
+    	* Application Reliability
+    	* Standard, Out of the Box Scripting
+    	* On Demand Restarts
+    	* Flexible Configuration
+    	* Ease Application Installations
+    	* Logging
+	</longdescription>
+</pkgmetadata>
+