public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2015-08-28 13:37 Manuel Rüger
  0 siblings, 0 replies; 17+ messages in thread
From: Manuel Rüger @ 2015-08-28 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3c155d836748e207ad0abeb97767a4b4c1e8215f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:37:16 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:37:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c155d83

dev-java/java-service-wrapper: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/java-service-wrapper/Manifest             |  3 -
 .../java-service-wrapper-3.2.3.ebuild              | 78 ----------------------
 .../java-service-wrapper-3.3.1.ebuild              | 68 -------------------
 .../java-service-wrapper-3.3.3.ebuild              | 66 ------------------
 .../java-service-wrapper-3.5.14.ebuild             | 67 -------------------
 5 files changed, 282 deletions(-)

diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 4280cd6..f799fca 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,5 +1,2 @@
-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/java-service-wrapper-3.2.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
deleted file mode 100644
index 723ce12..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
deleted file mode 100644
index 9274a76..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
deleted file mode 100644
index 7093413..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
deleted file mode 100644
index e1b68ca..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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/*
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2015-10-16 15:08 Patrice Clement
  0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2015-10-16 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     2a1b7ba4d793e76e069642ffd1bffed0c10d14d9
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 15:04:00 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 15:06:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1b7ba4

dev-java/java-service-wrapper: Call ejavadoc wrapper instead of javadoc. Stick patches in PATCHES array.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../java-service-wrapper-3.5.25-r1.ebuild          | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
new file mode 100644
index 0000000..4c74fbd
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -0,0 +1,72 @@
+# 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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
+	"${FILESDIR}"/${P}-testsuite.patch
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	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
+		ejavadoc -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/*
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2015-10-16 15:08 Patrice Clement
  0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2015-10-16 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3c4ccb1a9161cacebfe7f55aa4be807d5c094d6a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 15:04:33 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 15:06:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4ccb1a

dev-java/java-service-wrapper: Stable for amd64. Stable for x86 using the ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index 4c74fbd..9017dc4 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2018-11-04 15:16 Pacho Ramos
  0 siblings, 0 replies; 17+ messages in thread
From: Pacho Ramos @ 2018-11-04 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     7a885481c1c4ea358ea4e7ba9c8b4eb378a4e1aa
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  4 14:53:08 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov  4 15:16:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a885481

dev-java/java-service-wrapper: Stop using ant-nodeps

Bug: https://bugs.gentoo.org/466558
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index bb42be142af..661ff489372 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-
-WANT_ANT_TASKS="ant-nodeps"
 JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -24,7 +22,7 @@ RDEPEND="
 DEPEND="
 	>=virtual/jdk-1.4
 	test? (
-		dev-java/ant-junit
+		dev-java/ant-junit:0
 	)"
 
 S="${WORKDIR}/${MY_P}"
@@ -55,7 +53,7 @@ src_compile() {
 }
 
 src_test() {
-	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
+	ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2021-05-26  8:43 Miroslav Šulc
  0 siblings, 0 replies; 17+ messages in thread
From: Miroslav Šulc @ 2021-05-26  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3c4f90abaa229269f57285ff3a010c7bfdcb88ae
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 08:43:19 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:43:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4f90ab

dev-java/java-service-wrapper: dropped obsolete 3.5.25-r1

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../java-service-wrapper-3.5.25-r1.ebuild          | 68 ----------------------
 1 file changed, 68 deletions(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
deleted file mode 100644
index 3357c265306..00000000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-inherit epatch java-pkg-2 java-ant-2 toolchain-funcs
-
-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"
-
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-
-	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
-		ejavadoc -d api -sourcepath src/java/ -subpackages org \
-			|| die "javadoc	failed"
-	fi
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test
-}
-
-src_install() {
-	java-pkg_dojar lib/wrapper.jar
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt
-	dodoc doc/revisions.txt
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/java/*
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-03-12 12:01 Arthur Zamarin
  0 siblings, 0 replies; 17+ messages in thread
From: Arthur Zamarin @ 2022-03-12 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b42d3ac7f7f3d8305f7dad6a288e740d721b80a3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:00:57 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:00:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42d3ac7

dev-java/java-service-wrapper: Keyword 3.5.25-r2 arm, #834926

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
index 5ad4333b0e62..e09f0c051ef4 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	virtual/jre:1.8"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-07-05 12:02 Florian Schmaus
  0 siblings, 0 replies; 17+ messages in thread
From: Florian Schmaus @ 2022-07-05 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e11afbfd0b521aa9e9849a99429b5c07e76fba49
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jun 29 21:48:52 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 12:02:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11afbfd

dev-java/java-service-wrapper: add 3.5.50

Replaces as-needed patch with a sed.
Also fixes bitness detection to reflect actual use in ant build.xml.

Bug: https://bugs.gentoo.org/834926
Closes: https://bugs.gentoo.org/786378
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26156
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/java-service-wrapper/Manifest             |  1 +
 .../java-service-wrapper-3.5.50.ebuild             | 88 ++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 4d19c3dcacee..684084d87d08 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1 +1,2 @@
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
+DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
new file mode 100644
index 000000000000..7b3ea7c6098b
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+MY_P="wrapper_${PV}_src"
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="https://wrapper.tanukisoftware.org/"
+SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/junit:4
+		dev-util/cunit
+	)"
+BDEPEND="virtual/jdk"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src/java/"
+JAVA_JAR_FILENAME="wrapper.jar"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+	default
+
+	# replaces as-needed.patch
+	sed -i \
+		-e 's/gcc/$(CC)/g' \
+		-e 's/$(COMPILE) -pthread/$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread/g' \
+		-e 's/${COMPILE} -shared/${COMPILE} $(LDFLAGS) -shared/g' \
+		-e 's/$(COMPILE) -c/$(COMPILE) $(CFLAGS) -c/g' \
+		-e 's/$(COMPILE) $(DEFS)/$(COMPILE) $(CFLAGS) $(DEFS)/g' \
+		-e 's/$(COMPILE) -DCUNIT/$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT/g' \
+		-e 's/$(TEST)\/testsuite/testsuite/g' \
+		src/c/Makefile-*.make || die
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+	java-pkg-2_src_prepare
+
+	# enable tests on all platforms
+	grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make || die
+	if use test; then
+		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
+		assert
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	pushd "${T}" || die
+	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
+		> GetArchDataModel.java || die
+	ejavac GetArchDataModel.java
+	local BITS
+	BITS="$(java GetArchDataModel)"
+	[[ "${?}" == "0" ]] || die "Failed to identify sun.arch.data.model property"
+	popd || die
+	eant -Dbits="${BITS}" compile-c
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	src/c/testsuite --basic || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt
+	dodoc doc/revisions.txt
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-07-05 12:02 Florian Schmaus
  0 siblings, 0 replies; 17+ messages in thread
From: Florian Schmaus @ 2022-07-05 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e0d95a3c71e25dc699f3d5aa7c5a0ad2f6bf8c13
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 12:01:09 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 12:02:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d95a3c

dev-java/java-service-wrapper: respect flags, style fixes, HOMEPAGE

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../java-service-wrapper-3.5.50.ebuild             | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 7b3ea7c6098b..f4dc6ef8ecd2 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -7,9 +7,8 @@ JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-MY_P="wrapper_${PV}_src"
 DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="https://wrapper.tanukisoftware.org/"
+HOMEPAGE="https://wrapper.tanukisoftware.com"
 SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
 
 LICENSE="tanuki-community"
@@ -17,17 +16,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	>=virtual/jre-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/junit:4
 		dev-util/cunit
-	)"
+	)
+"
 BDEPEND="virtual/jdk"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/wrapper_${PV}_src"
 
 JAVA_SRC_DIR="src/java/"
 JAVA_JAR_FILENAME="wrapper.jar"
@@ -39,12 +38,9 @@ src_prepare() {
 
 	# replaces as-needed.patch
 	sed -i \
-		-e 's/gcc/$(CC)/g' \
-		-e 's/$(COMPILE) -pthread/$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread/g' \
-		-e 's/${COMPILE} -shared/${COMPILE} $(LDFLAGS) -shared/g' \
-		-e 's/$(COMPILE) -c/$(COMPILE) $(CFLAGS) -c/g' \
-		-e 's/$(COMPILE) $(DEFS)/$(COMPILE) $(CFLAGS) $(DEFS)/g' \
-		-e 's/$(COMPILE) -DCUNIT/$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT/g' \
+		-e 's/gcc -O3/$(CC)/g' \
+		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
+		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
 		-e 's/$(TEST)\/testsuite/testsuite/g' \
 		src/c/Makefile-*.make || die
 
@@ -61,15 +57,16 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
+
 	pushd "${T}" || die
 	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
 		> GetArchDataModel.java || die
 	ejavac GetArchDataModel.java
 	local BITS
-	BITS="$(java GetArchDataModel)"
-	[[ "${?}" == "0" ]] || die "Failed to identify sun.arch.data.model property"
+	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
 	popd || die
 	eant -Dbits="${BITS}" compile-c
+
 	java-pkg-simple_src_compile
 }
 


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-07-22 14:00 Florian Schmaus
  0 siblings, 0 replies; 17+ messages in thread
From: Florian Schmaus @ 2022-07-22 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b2d5ea8fc49bf3291bfda50e5ff7214cffaa9c86
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Jul 22 13:41:26 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 14:00:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d5ea8f

dev-java/java-service-wrapper: made building tests USE-conditional

Only build ANYTHING test-related when USE=test is set.

Closes: https://bugs.gentoo.org/856586
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26519
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index f4dc6ef8ecd2..3473d38a6ae5 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -48,8 +48,9 @@ src_prepare() {
 	java-pkg-2_src_prepare
 
 	# enable tests on all platforms
-	grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make || die
 	if use test; then
+		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
+		assert
 		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
 		assert
 	fi


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-08-04 22:53 Sam James
  0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-08-04 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d7f91fa6e4734c07d245414be7fa6c87fbf52449
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 22:51:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 22:51:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f91fa6

dev-java/java-service-wrapper: Stabilize 3.5.50 amd64, #863608

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 3473d38a6ae5..4936471a1bb7 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-08-05  6:57 Arthur Zamarin
  0 siblings, 0 replies; 17+ messages in thread
From: Arthur Zamarin @ 2022-08-05  6:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1f8ffff9d93c54445e9c473ad199ac811a1cfd6c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 06:57:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 06:57:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8ffff9

dev-java/java-service-wrapper: Keyword 3.5.50 arm64, #834926

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 4936471a1bb7..149e25fdc514 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-08-10  8:27 Florian Schmaus
  0 siblings, 0 replies; 17+ messages in thread
From: Florian Schmaus @ 2022-08-10  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1a5069b33787fa5114814d70535bab4775c74fb7
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Aug  5 16:03:20 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 08:24:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5069b3

dev-java/java-service-wrapper: replace testsuite.patch with sed

java-service-wrapper-3.5.25-testsuite.patch should have been ported to
3.5.50 but wasn't.  Since it's a trivial patch, rather than rebasing it
 each time, just replace with a sed.

Closes: https://bugs.gentoo.org/863761
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26749
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 149e25fdc514..40ab4cf7bcbd 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -47,7 +47,11 @@ src_prepare() {
 	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
 	java-pkg-2_src_prepare
 
-	# enable tests on all platforms
+	# disable tests by default (they are only enabled by default on amd64)
+	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
+		-i src/c/Makefile-linux-x86-64.make || die
+
+	# re-enable tests on all platforms if requested
 	if use test; then
 		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
 		assert


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2022-08-12 11:55 Agostino Sarubbo
  0 siblings, 0 replies; 17+ messages in thread
From: Agostino Sarubbo @ 2022-08-12 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     ea8338836278d1e9c98a3757b59a8c448bc49259
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 11:54:27 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 11:54:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea833883

dev-java/java-service-wrapper: x86 stable wrt bug #863608

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
index 40ab4cf7bcbd..261d3bf92668 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2024-07-06  8:52 Miroslav Šulc
  0 siblings, 0 replies; 17+ messages in thread
From: Miroslav Šulc @ 2024-07-06  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e20c6206649325c6b27d1676a86d7f2f8d08199a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jun 23 09:54:48 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:49:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20c6206

dev-java/java-service-wrapper: build without BSFIX, drop java-ant-2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37338/commits/bec2925b38e54157ea8b180d43e37be70eb87f5c
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../java-service-wrapper-3.5.50-r2.ebuild          | 94 ++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
new file mode 100644
index 000000000000..7d8fc6989375
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="https://wrapper.tanukisoftware.com"
+SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
+S="${WORKDIR}/wrapper_${PV}_src"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/junit:4
+		dev-util/cunit
+	)
+"
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
+
+JAVA_SRC_DIR="src/java/"
+JAVA_JAR_FILENAME="wrapper.jar"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+PATCHES=(
+	"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+)
+
+src_prepare() {
+	default #780585
+
+	# replaces as-needed.patch
+	sed -i \
+		-e 's/gcc -O3/$(CC)/g' \
+		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
+		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
+		-e 's/$(TEST)\/testsuite/testsuite/g' \
+		src/c/Makefile-*.make || die
+
+	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+	java-pkg-2_src_prepare
+
+	# disable tests by default (they are only enabled by default on amd64)
+	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
+		-i src/c/Makefile-linux-x86-64.make || die
+
+	# re-enable tests on all platforms if requested
+	if use test; then
+		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
+		assert
+		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
+		assert
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	pushd "${T}" || die
+	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
+		> GetArchDataModel.java || die
+	ejavac GetArchDataModel.java
+	local BITS
+	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
+	popd || die
+	eant -Dbits="${BITS}" compile-c
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	src/c/testsuite --basic || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc README*.txt
+	dodoc doc/revisions.txt
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2024-08-04 21:27 Jakov Smolić
  0 siblings, 0 replies; 17+ messages in thread
From: Jakov Smolić @ 2024-08-04 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     16dadccb38e9fed69c7614190862946ce3b8382b
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 21:27:36 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 21:27:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16dadccb

dev-java/java-service-wrapper: Stabilize 3.5.50-r2 x86, #937313

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 7d8fc6989375..722534ecccf9 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2024-08-04 21:27 Jakov Smolić
  0 siblings, 0 replies; 17+ messages in thread
From: Jakov Smolić @ 2024-08-04 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a99552869a3d24f263e97e936b07f3773f431702
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 21:27:38 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 21:27:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9955286

dev-java/java-service-wrapper: Stabilize 3.5.50-r2 amd64, #937313

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 722534ecccf9..2576ab85e550 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
@ 2024-08-06  8:56 Miroslav Šulc
  0 siblings, 0 replies; 17+ messages in thread
From: Miroslav Šulc @ 2024-08-06  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7f2c27de086450446969df29d89b6e9e9f133801
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Aug  5 04:05:42 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 08:56:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2c27de

dev-java/java-service-wrapper: drop 3.5.50-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37963
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../java-service-wrapper-3.5.50-r1.ebuild          | 94 ----------------------
 1 file changed, 94 deletions(-)

diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
deleted file mode 100644
index 8fdfe9ac2063..000000000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="https://wrapper.tanukisoftware.com"
-SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/junit:4
-		dev-util/cunit
-	)
-"
-BDEPEND="virtual/jdk"
-
-S="${WORKDIR}/wrapper_${PV}_src"
-
-JAVA_SRC_DIR="src/java/"
-JAVA_JAR_FILENAME="wrapper.jar"
-JAVA_TEST_SRC_DIR="src/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-PATCHES=(
-	"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
-)
-
-src_prepare() {
-	default
-
-	# replaces as-needed.patch
-	sed -i \
-		-e 's/gcc -O3/$(CC)/g' \
-		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
-		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
-		-e 's/$(TEST)\/testsuite/testsuite/g' \
-		src/c/Makefile-*.make || die
-
-	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
-	java-pkg-2_src_prepare
-
-	# disable tests by default (they are only enabled by default on amd64)
-	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
-		-i src/c/Makefile-linux-x86-64.make || die
-
-	# re-enable tests on all platforms if requested
-	if use test; then
-		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
-		assert
-		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
-		assert
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	pushd "${T}" || die
-	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
-		> GetArchDataModel.java || die
-	ejavac GetArchDataModel.java
-	local BITS
-	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
-	popd || die
-	eant -Dbits="${BITS}" compile-c
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	src/c/testsuite --basic || die
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt
-	dodoc doc/revisions.txt
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-08-06  8:56 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-04 22:53 [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-06  8:56 Miroslav Šulc
2024-08-04 21:27 Jakov Smolić
2024-08-04 21:27 Jakov Smolić
2024-07-06  8:52 Miroslav Šulc
2022-08-12 11:55 Agostino Sarubbo
2022-08-10  8:27 Florian Schmaus
2022-08-05  6:57 Arthur Zamarin
2022-07-22 14:00 Florian Schmaus
2022-07-05 12:02 Florian Schmaus
2022-07-05 12:02 Florian Schmaus
2022-03-12 12:01 Arthur Zamarin
2021-05-26  8:43 Miroslav Šulc
2018-11-04 15:16 Pacho Ramos
2015-10-16 15:08 Patrice Clement
2015-10-16 15:08 Patrice Clement
2015-08-28 13:37 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox