diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-java/tijmp | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'dev-java/tijmp')
| -rw-r--r-- | dev-java/tijmp/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/tijmp/files/tijmp-jni.h.patch | 4 | ||||
| -rw-r--r-- | dev-java/tijmp/tijmp-0.8-r1.ebuild (renamed from dev-java/tijmp/tijmp-0.8.ebuild) | 37 |
3 files changed, 23 insertions, 22 deletions
diff --git a/dev-java/tijmp/Manifest b/dev-java/tijmp/Manifest index 90ef26b15e2b..7aba69ea965b 100644 --- a/dev-java/tijmp/Manifest +++ b/dev-java/tijmp/Manifest @@ -1,5 +1,5 @@ AUX tijmp-0.8-respect-javacflags.patch 433 BLAKE2B 22999d08accccc8a00bb27e4db93b47faad83481083ecfef8b33c43e670093d15c6f483f5f15f1e02069e14d7dfa9df2d67846e2455ff73a01a5a209a8ac702e SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972 -AUX tijmp-jni.h.patch 1121 BLAKE2B 0eec0e65ceafe1f9a60b8f5482947f61a4434d9d6c4b2ec449741dc04e3ccbb5122f15dfdab5a30e8e1d3a4bb0c328781cf52f69f7d55655d060cee89670cbdb SHA512 3733c220c23a5c252ca088f9cc8c37780193bbbc1efe12c0f21ce5c5c9a875a43c3a4947c8bd52cb4c3ede4549ba9fdc4107d1a3207a0563813fc5b351c6e2a3 +AUX tijmp-jni.h.patch 1120 BLAKE2B e444841f9454f7fc8f8423986a5b82cceda43513a07c5ed3d4a143e813645a2f2323aa42e4fdc391e7ab38f3603acaf6efc18c8de0fc3c363273916b6db47477 SHA512 03c5b6425b4b92d929117366bbf1e3d3c5376f0882e7363e83f70324e5ba6533f212226cc811eb61b24772a45853f3b3243c24a444d181eedd1aa67017a15dc6 DIST tijmp-0.8.tar.gz 347809 BLAKE2B d18fd0ba9145fb9277404a24fa26a65e4cbba34e62dfa0b080bc380d61a3dd11aab23e2c7fb982a97cb40fa216b1b3347c949cee52f7462f0113c3adef993c8d SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25 -EBUILD tijmp-0.8.ebuild 1129 BLAKE2B 0b58ddba5d1ad18f8b5da4094fe4ad03131c2d44dd2997425d75e73761fc683118c5d54c57542de65c34dc8c34b44c9e1679b71e15b71e74312ed34a56d106ea SHA512 ecfc77ee4f96f66b6dd32c7f613646d51e037cfc534d34a9de117a10fad57399d9a352618fcef66033f2e76c1898b6a58e088ef3a96b469786c1c648c2722727 +EBUILD tijmp-0.8-r1.ebuild 1075 BLAKE2B 9b0f320ac0454d8e6f3533ff1a33e75376086396e45074cbc9089cfcb7464d3b8f2cd022f0cb8a398f42b560ee50db3354062a657d5dab1790561091ab99171e SHA512 2bcfd356f43c9a4994045d0571f52f6bf767466a0ffce853f62a295a852506215d5ab8f830027c2cc38e409d42a5639b641328d2739ca9a205ebe2cf298f43ac MISC metadata.xml 481 BLAKE2B 6b151d4c0ca3047811c3902cbe5dafd42cdbc05cb6d44a35e116be42276fabc8dd9ef90a8e4b05c58f3ed228dfa0df37ac1c8b5eeb4859373abf9e7624a093dc SHA512 52940eb0d565ae1419ea5b10d90997551cf1a9accf3ae2369b37a7afbd7e5cf0a11e0fa0afa84baeeac34d516a734b779a40ffd74f06767549ae0ad82010661e diff --git a/dev-java/tijmp/files/tijmp-jni.h.patch b/dev-java/tijmp/files/tijmp-jni.h.patch index e9f18cc4ee68..02a9b43670b0 100644 --- a/dev-java/tijmp/files/tijmp-jni.h.patch +++ b/dev-java/tijmp/files/tijmp-jni.h.patch @@ -1,7 +1,7 @@ # Patch by Vlastimil Babka <caster@gentoo.org> # Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust ---- configure.ac.orig 2009-01-10 00:29:01.000000000 +0100 -+++ configure.ac 2010-04-05 12:17:35.000000000 +0200 +--- a/configure.ac 2009-01-10 00:29:01.000000000 +0100 ++++ b/configure.ac 2010-04-05 12:17:35.000000000 +0200 @@ -24,22 +24,16 @@ JAVA_HOME=/usr/local/jdk fi diff --git a/dev-java/tijmp/tijmp-0.8.ebuild b/dev-java/tijmp/tijmp-0.8-r1.ebuild index 9fea8db45ca0..a6e2774efc3a 100644 --- a/dev-java/tijmp/tijmp-0.8.ebuild +++ b/dev-java/tijmp/tijmp-0.8-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 inherit autotools java-pkg-2 -DESCRIPTION="Java Memory Profiler for java 1.6+" +DESCRIPTION="Java Memory Profiler" HOMEPAGE="http://www.khelekore.org/jmp/tijmp/" SRC_URI="http://www.khelekore.org/jmp/tijmp/${P}.tar.gz" @@ -13,14 +13,19 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" +RDEPEND=" + >=virtual/jre-1.6" -RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6" +DEPEND=" + >=virtual/jdk-1.6" -java_prepare() { - epatch "${FILESDIR}/${PN}-jni.h.patch" - epatch "${FILESDIR}/${P}-respect-javacflags.patch" +PATCHES=( + "${FILESDIR}/${PN}-jni.h.patch" + "${FILESDIR}/${P}-respect-javacflags.patch" +) + +src_prepare() { + default eautoreconf } @@ -28,20 +33,16 @@ src_configure() { econf --docdir="/usr/share/doc/${PF}" } -src_compile() { - emake || die "make failed" -} - src_install() { - emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install || die + emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar" java-pkg_regso "${D}/usr/$(get_libdir)/lib${PN}.so" - cat > "${T}/tijmp" <<-"EOF" - #!/bin/sh - java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}" + cat > "${T}/${PN}" <<- "EOF" || die +#!/usr/bin/env bash +java -Dtijmp.jar="$(java-config -p tijmp)" -agentlib:tijmp "${@}" EOF - dobin "${T}/tijmp" + dobin "${T}/${PN}" } pkg_postinst() { |