diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-java/libmatthew-java | |
parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) |
gentoo resync : 05.04.2019
Diffstat (limited to 'dev-java/libmatthew-java')
-rw-r--r-- | dev-java/libmatthew-java/Manifest | 2 | ||||
-rw-r--r-- | dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild (renamed from dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild) | 36 |
2 files changed, 25 insertions, 13 deletions
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest index 5968257c6c58..580abd35457f 100644 --- a/dev-java/libmatthew-java/Manifest +++ b/dev-java/libmatthew-java/Manifest @@ -1,4 +1,4 @@ AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 BLAKE2B 9662d03e04b55a3041807661b9503644b0595e3cf0ae4479eef9818dbd9edbfa5d7c4a9886e51c1adfc194dec5c06746ac18c559bd4d6768a49c3a8bfef802c9 SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3 DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a -EBUILD libmatthew-java-0.7.2-r1.ebuild 1292 BLAKE2B e793fc6135cde82e6da91898124e486962bc257ae52bb4d235e864a6875b350963c5b47bf79eaed33317c1e9b145c9f0bd5d31ea86ee09438242e63f8f4389f4 SHA512 3a863464c5291fa01b249af04fc22b94103f3c91c8c31b06d75836c3b8f9ea9560774c5746e34db749b6a9a622f066147f3a293ab47c3e0cee6f686cb0dadd32 +EBUILD libmatthew-java-0.7.2-r2.ebuild 1351 BLAKE2B 5d6ca2a5d0fc989208765dbea60a0e6ea22ae5c45d25ffafbc442054b66b8d4b4ee43695ac6fbed6c89f8620bb8401ac13686ec2523afa688d0d268d414e45af SHA512 55cedb239ebe764c9281f3b91861303a7e42631cc17e4b2765ebca60385c2fe1e4628e540a65f57bfab742b54dae07f634feab80ed3d07052b4bcc01f6dfbeef MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild index cb98a553c6be..083085e8d325 100644 --- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild +++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild @@ -1,32 +1,44 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=6 JAVA_PKG_IUSE="doc source" + inherit eutils java-pkg-2 flag-o-matic toolchain-funcs DESCRIPTION="A selection of libraries for Java" HOMEPAGE="http://www.matthew.ath.cx/projects/java/" -SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz" +SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ppc64 x86" -IUSE="" -RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5" +RDEPEND=" + >=virtual/jre-1.5" + +DEPEND=" + >=virtual/jdk-1.5" + +PATCHES=( "${FILESDIR}"/${P}-makefile-fixes.patch ) +DOCS=( INSTALL changelog README ) -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-makefile-fixes.patch +src_prepare() { + default + sed -i -e '167d;' cx/ath/matthew/unix/UnixSocket.java || die "sed failed" rm -v "${S}"/cx/ath/matthew/debug/Debug.java || die "rm failed" } src_compile() { - CC=$(tc-getCC) LD=$(tc-getCC) INCLUDES="$(java-pkg_get-jni-cflags)" \ - emake -j1 JARDIR=/usr/share/libmatthew-java/lib JCFLAGS="$(java-pkg_javac-args)" all $(usev doc) || die "emake failed" + CC=$(tc-getCC) \ + LD=$(tc-getCC) \ + INCLUDES="$(java-pkg_get-jni-cflags)" \ + emake -j1 \ + JARDIR=/usr/share/libmatthew-java/lib \ + JCFLAGS="$(java-pkg_javac-args)" \ + all \ + $(usev doc) } src_install() { @@ -38,7 +50,7 @@ src_install() { java-pkg_newjar unix-0.5.jar unix.jar java-pkg_doso libcgi-java.so java-pkg_doso libunix-java.so - dodoc INSTALL changelog README || die + einstalldocs use source && java-pkg_dosrc cx/ use doc && java-pkg_dojavadoc doc } |