diff options
Diffstat (limited to 'dev-java/netty-common/netty-common-4.0.21.ebuild')
| -rw-r--r-- | dev-java/netty-common/netty-common-4.0.21.ebuild | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild index 2b47294b1b6a..eeb2263ddc94 100644 --- a/dev-java/netty-common/netty-common-4.0.21.ebuild +++ b/dev-java/netty-common/netty-common-4.0.21.ebuild @@ -6,7 +6,7 @@ EAPI="5" JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple MY_PN="netty" MY_P="${MY_PN}-${PV}" @@ -21,32 +21,26 @@ KEYWORDS="amd64 x86" CDEPEND="dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 + dev-java/slf4j-nop:0 dev-java/slf4j-api:0" -RDEPEND=">=virtual/jre-1.7 +RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.7 +DEPEND=">=virtual/jdk-1.6 ${CDEPEND}" S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}" -EANT_BUILD_TARGET="package" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api" +JAVA_GENTOO_CLASSPATH=" + log4j + slf4j-api + slf4j-nop + javassist-3 + commons-logging" + +JAVA_SRC_DIR="src/main/java" # Tests fail as they might need logging to be properly set up and/or compatible. # # junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]> # at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation RESTRICT="test" - -java_prepare() { - #EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)" - cp "${FILESDIR}"/${P}-build.xml build.xml || die -} - -src_install() { - java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} |