From bcb30ea6b81ca973d39bfc0f901323efa2749f98 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 24 Sep 2015 16:18:03 +0100 Subject: dev-java/jnr-unixsocket: Bump Java version to 7 as jnr-enxio also has This relates to bug #561352. jnr-unixsocket builds with Java 6 but it should have a Java version at least as high as its dependencies. I have also changed the jnr-ffi SLOT to match the one used by jnr-enxio, otherwise you end up with two conflicting versions on the classpath. jruby (a revdep) also uses the older version but it is masked and totally broken anyway. This demands a revbump but should still be safe enough to commit straight to stable. Package-Manager: portage-2.2.20.1 --- .../jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild | 43 ++++++++++++++++++++++ dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild | 43 ---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild delete mode 100644 dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild (limited to 'dev-java/jnr-unixsocket') diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild new file mode 100644 index 000000000000..f5936f9bbe6f --- /dev/null +++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc examples source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Unix sockets for Java" +SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/jnr/jnr-unixsocket" + +SLOT="0" +KEYWORDS="amd64 x86" +LICENSE="Apache-2.0" + +CDEPEND="dev-java/jnr-constants:0 + dev-java/jnr-enxio:0 + dev-java/jnr-posix:3.0 + dev-java/jnr-ffi:2" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.7" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.7" + +java_prepare() { + cp "${FILESDIR}"/${P}-build.xml build.xml || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0" + +src_install() { + java-pkg_newjar target/${P}.jar ${PN}.jar + + use source && java-pkg_dosrc src/main/java/jnr + use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example + use doc && java-pkg_dojavadoc target/site/apidocs +} diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild deleted file mode 100644 index e1a54ccc7f33..000000000000 --- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Unix sockets for Java" -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/jnr/jnr-unixsocket" - -SLOT="0" -KEYWORDS="amd64 x86" -LICENSE="Apache-2.0" - -CDEPEND="dev-java/jnr-constants:0 - dev-java/jnr-enxio:0 - dev-java/jnr-posix:3.0 - dev-java/jnr-ffi:0.7" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.6" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.6" - -java_prepare() { - cp "${FILESDIR}"/${P}-build.xml build.xml || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-0.7,jnr-posix-3.0" - -src_install() { - java-pkg_newjar target/${P}.jar ${PN}.jar - - use source && java-pkg_dosrc src/main/java/jnr - use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example - use doc && java-pkg_dojavadoc target/site/apidocs -} -- cgit v1.2.3-65-gdbad