| 1 |
commit: e0d95a3c71e25dc699f3d5aa7c5a0ad2f6bf8c13 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 12:01:09 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 12:02:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d95a3c |
| 7 |
|
| 8 |
dev-java/java-service-wrapper: respect flags, style fixes, HOMEPAGE |
| 9 |
|
| 10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 11 |
|
| 12 |
.../java-service-wrapper-3.5.50.ebuild | 25 ++++++++++------------ |
| 13 |
1 file changed, 11 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 7b3ea7c6098b..f4dc6ef8ecd2 100644 |
| 17 |
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild |
| 18 |
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild |
| 19 |
@@ -7,9 +7,8 @@ JAVA_PKG_IUSE="doc source test" |
| 20 |
inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2 |
| 21 |
JAVA_TESTING_FRAMEWORKS="junit-4" |
| 22 |
|
| 23 |
-MY_P="wrapper_${PV}_src" |
| 24 |
DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" |
| 25 |
-HOMEPAGE="https://wrapper.tanukisoftware.org/" |
| 26 |
+HOMEPAGE="https://wrapper.tanukisoftware.com" |
| 27 |
SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz" |
| 28 |
|
| 29 |
LICENSE="tanuki-community" |
| 30 |
@@ -17,17 +16,17 @@ SLOT="0" |
| 31 |
KEYWORDS="~amd64 ~arm ~x86" |
| 32 |
RESTRICT="!test? ( test )" |
| 33 |
|
| 34 |
-RDEPEND=" |
| 35 |
- >=virtual/jre-1.8:*" |
| 36 |
+RDEPEND=">=virtual/jre-1.8:*" |
| 37 |
DEPEND=" |
| 38 |
>=virtual/jdk-1.8:* |
| 39 |
test? ( |
| 40 |
dev-java/junit:4 |
| 41 |
dev-util/cunit |
| 42 |
- )" |
| 43 |
+ ) |
| 44 |
+" |
| 45 |
BDEPEND="virtual/jdk" |
| 46 |
|
| 47 |
-S="${WORKDIR}/${MY_P}" |
| 48 |
+S="${WORKDIR}/wrapper_${PV}_src" |
| 49 |
|
| 50 |
JAVA_SRC_DIR="src/java/" |
| 51 |
JAVA_JAR_FILENAME="wrapper.jar" |
| 52 |
@@ -39,12 +38,9 @@ src_prepare() { |
| 53 |
|
| 54 |
# replaces as-needed.patch |
| 55 |
sed -i \ |
| 56 |
- -e 's/gcc/$(CC)/g' \ |
| 57 |
- -e 's/$(COMPILE) -pthread/$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread/g' \ |
| 58 |
- -e 's/${COMPILE} -shared/${COMPILE} $(LDFLAGS) -shared/g' \ |
| 59 |
- -e 's/$(COMPILE) -c/$(COMPILE) $(CFLAGS) -c/g' \ |
| 60 |
- -e 's/$(COMPILE) $(DEFS)/$(COMPILE) $(CFLAGS) $(DEFS)/g' \ |
| 61 |
- -e 's/$(COMPILE) -DCUNIT/$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT/g' \ |
| 62 |
+ -e 's/gcc -O3/$(CC)/g' \ |
| 63 |
+ -e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \ |
| 64 |
+ -e 's/ -shared/ $(LDFLAGS) -shared/g' \ |
| 65 |
-e 's/$(TEST)\/testsuite/testsuite/g' \ |
| 66 |
src/c/Makefile-*.make || die |
| 67 |
|
| 68 |
@@ -61,15 +57,16 @@ src_prepare() { |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
tc-export CC |
| 72 |
+ |
| 73 |
pushd "${T}" || die |
| 74 |
echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \ |
| 75 |
> GetArchDataModel.java || die |
| 76 |
ejavac GetArchDataModel.java |
| 77 |
local BITS |
| 78 |
- BITS="$(java GetArchDataModel)" |
| 79 |
- [[ "${?}" == "0" ]] || die "Failed to identify sun.arch.data.model property" |
| 80 |
+ BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property" |
| 81 |
popd || die |
| 82 |
eant -Dbits="${BITS}" compile-c |
| 83 |
+ |
| 84 |
java-pkg-simple_src_compile |
| 85 |
} |
Archives