gentoo resync : 05.04.2019

4 files changed, 49 insertions, 55 deletions

diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
index 20e7253253f5..139713597ec8 100644
--- a/dev-java/jrrd/Manifest
+++ b/dev-java/jrrd/Manifest
@@ -1,4 +1,4 @@
-AUX 1.0.1-javacflags.patch 346 BLAKE2B 49a4a3f582865c3053964622d1953f688d3f26cd210e2db819d8006ffddff3f9e68e0e07213070b2f896baa3910ee635a3ee23dd4e9e5efb8964ac84334f1884 SHA512 4c7383d1e55bdb56657cfd3de944ba1e18fe299d90b4493ccf9708abbaa0d4fa141215170c2bd9bf0f71002124a8221d5af657cd9c28817971801349be71ffc2
+AUX jrrd-1.0.1-javacflags.patch 263 BLAKE2B d20065e16d2648c6be5718a40b0ec164ee66f644b611f932ee379470d993062038a9ba3cbfd5cac09a2da909c4aab1c1d1fe66407548f67b05e9791385627b1b SHA512 1c1475647f7535c359b1a686295edffddb9a1b2d53529f51e9a17d0d7e5de2a39846e56e9e4eb3441519b05da645052ed177b3d2e7a2779f6385ec5ace0609ba
 DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
-EBUILD jrrd-1.0.1-r1.ebuild 960 BLAKE2B e6310151eb504a73fb8e4b6fcd88b39dd5d6f21579cc8f05cce0e4cc8896568e71c9de30044c9a8336c40e118dbf96c28c72f5f74238a5aa1d5dff5870c5eb8d SHA512 fd03d9a196d210c11c87a7a3123da679b80c5ebd9cb52db6e71b850806446c436799ab7f8fe12aa41a542300380f02a94593ae33d65fc802db727802a2c78b75
+EBUILD jrrd-1.0.1-r2.ebuild 796 BLAKE2B b36e1d5d4a77184232de326b4314290851dcc56afcdee93fe854a45aa57e4622eeef654e6d3463e230cdcbf2aad9979a6de4830227bc565a70572efb01209ee0 SHA512 ff030fba1cc6a92615c747f6d0b0965948e3d3a51a2cd922e3128a0588f30e1712dc5d0b812f2ef3e846da0229ff204abc903f0aff1e9a21ff5d208660a9fa8e
 MISC metadata.xml 396 BLAKE2B 66db2600dc0aa0b7ff5e5d6275f265495f0c7c7ea97baab568f993c49642dd2b928042fcdab7dbf5e5aeca154d5f463d472be2dfd4339b21f8429154fdb05e5c SHA512 4d701ce0342203d158d1fdb3d00d1c2f0fcdaf7a5f891584be4cb33e2b3ceeac22a25b780410c9be7c1c4c3a1f4494561a2dddaf37981b68b23911d55ae1f26c
diff --git a/dev-java/jrrd/files/1.0.1-javacflags.patch b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
index 26bd523fc7ac..b211ec1f3cbe 100644
--- a/dev-java/jrrd/files/1.0.1-javacflags.patch
+++ b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
@@ -1,7 +1,5 @@
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 7413)
-+++ Makefile.am	(working copy)
+--- a/Makefile.am	(revision 7413)
++++ b/Makefile.am	(working copy)
 @@ -15,7 +15,7 @@
  
  .java.class:
diff --git a/dev-java/jrrd/jrrd-1.0.1-r1.ebuild b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
deleted file mode 100644
index f0d86291237d..000000000000
--- a/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-WANT_AUTOMAKE="1.9"
-
-inherit eutils autotools base java-pkg-2
-
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
-
-SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
-HOMEPAGE="http://www.opennms.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-COMMON_DEP="net-analyzer/rrdtool"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-PATCHES=( "${FILESDIR}/1.0.1-javacflags.patch" )
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	# Running autoconf would require some RPM macros
-	eautomake
-}
-
-src_compile(){
-	base_src_compile
-	if use doc; then
-		javadoc -d javadoc $(find org -name "*.java") || die "javadoc failed"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar "${S}/${PN}.jar"
-	java-pkg_doso .libs/*.so
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..99bc7ddf318d
--- /dev/null
+++ b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit autotools java-pkg-2
+
+DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
+
+SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
+HOMEPAGE="http://www.opennms.org/"
+KEYWORDS="amd64 x86"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+CDEPEND="net-analyzer/rrdtool"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+PATCHES=( "${FILESDIR}/${P}-javacflags.patch" )
+
+src_configure() {
+	econf
+}
+
+src_compile(){
+	emake -j1
+	use doc && ejavadoc -d javadoc $(find org -name "*.java")
+}
+
+src_install() {
+	java-pkg_newjar "${S}/${PN}.jar"
+	java-pkg_doso .libs/*.so
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc javadoc
+}