Bug 517730 – dev-java/java-service-wrapper-3.5.25 version bump

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description M. B. 2014-07-21 22:33:39 UTC]

dev-java/java-service-wrapper hasn't been updated in about 2 years. Time for a new ebuild, which among other things, provides support for the arm architecture.

Reproducible: Always

[Comment 1 M. B. 2014-07-21 22:36:28 UTC]

Created attachment 381288 [details]
java-service-wrapper-3.5.25.ebuild

--- dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild	2014-07-21 11:02:53.815795661 +0200
+++ /usr/portage/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild	2012-07-10 22:31:07.000000000 +0200
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild,v 1.4 2012/07/10 20:04:02 ago Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
@@ -37,15 +37,12 @@
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 
 	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
-
-	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"
-	has ${ARCH} amd64 ia64 ppc64 && BITS="64"
+	use amd64 && BITS="64"
 	eant -Dbits=${BITS} jar compile-c
 	if use doc; then
 		javadoc -d api -sourcepath src/java/ -subpackages org \

[Comment 2 M. B. 2014-07-21 22:42:59 UTC]

Okay, the other patch was the wrong way around.



--- /usr/portage/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild	2012-07-10 22:31:07.000000000 +0200
+++ dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild	2014-07-21 11:02:53.815795661 +0200
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild,v 1.4 2012/07/10 20:04:02 ago Exp $
+# $Header: $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -37,12 +37,15 @@
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 
 	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
+
+	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"
+#	use amd64 && BITS="64"
+	has ${ARCH} amd64 ia64 ppc64 && BITS="64"
 	eant -Dbits=${BITS} jar compile-c
 	if use doc; then
 		javadoc -d api -sourcepath src/java/ -subpackages org \

[Comment 3 M. B. 2014-07-21 22:43:48 UTC]

Created attachment 381290 [details, diff]
java-service-wrapper-3.5.25-as-needed.patch

required patch 1/2

[Comment 4 M. B. 2014-07-21 22:44:26 UTC]

Created attachment 381292 [details, diff]
java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch

required patch 2/2

[Comment 5 M. B. 2014-07-21 23:11:17 UTC]

Created attachment 381296 [details, diff]
java-service-wrapper-3.5.25-as-needed.patch

[Comment 6 Michael Rowell 2014-07-21 23:31:12 UTC]

Created attachment 381298 [details]
build.log

Using the ebuild from your overlay (tbc), at the time of writing, compile fails with "eant failed". Reviewing the build log (attached) reveals several fatal errors involving CUnit includes not being found.

This suggests that either a dependency on dev-util/cunit is necessary, or there is a build flag turning on CUnit tests when we don't want any.

[Comment 7 Jauhien Piatlicki (RETIRED) 2014-09-05 21:32:36 UTC]

@M.B.: would you like to be a proxy maintainer of this package?

[Comment 8 Jauhien Piatlicki (RETIRED) 2014-09-05 22:24:38 UTC]

(In reply to Michael Rowell from comment #6)
> Created attachment 381298 [details]
> build.log
> 
> Using the ebuild from your overlay (tbc), at the time of writing, compile
> fails with "eant failed". Reviewing the build log (attached) reveals several
> fatal errors involving CUnit includes not being found.
> 
> This suggests that either a dependency on dev-util/cunit is necessary, or
> there is a build flag turning on CUnit tests when we don't want any.

The problem appears only on amd64 because of bad makefile for this arch.

[Comment 9 Jauhien Piatlicki (RETIRED) 2014-09-05 22:36:38 UTC]

>*java-service-wrapper-3.5.25 (05 Sep 2014)
>
>  05 Sep 2014; Jauhien Piatlicki <[e-mail]>
>  +files/java-service-wrapper-3.5.25-as-needed.patch,
>  +files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch,
>  +files/java-service-wrapper-3.5.25-testsuite.patch,
>  +java-service-wrapper-3.5.25.ebuild:
>  version bump, closing bug #517730

Commited. I was able to test only on amd64 and x86, so, M. B., if you need other arches, ask appropriate arch teams and also consider becoming a proxy-maintainer.

@Michael Rowell: please, test. It should work now.