Version bump (bug #515854); dropped code for failing tests

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 333 insertions, 10 deletions

diff --git a/dev-java/netty-codec/ChangeLog b/dev-java/netty-codec/ChangeLog
index 696cf8a8463d..816bec75d8d4 100644
--- a/dev-java/netty-codec/ChangeLog
+++ b/dev-java/netty-codec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/netty-codec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-codec/ChangeLog,v 1.1 2014/05/28 17:28:39 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-codec/ChangeLog,v 1.2 2014/07/15 08:24:05 ercpe Exp $
+
+*netty-codec-4.0.21 (15 Jul 2014)
+
+  15 Jul 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/netty-codec-4.0.21-build.xml, +netty-codec-4.0.21.ebuild:
+  Version bump (bug #515854); dropped code for failing tests
 
 *netty-codec-4.0.19 (28 May 2014)
 
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index 04f5d60551f0..28ae0c542c83 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 AUX netty-codec-4.0.19-build.xml 12836 SHA256 efb739c01580d280ce81b6a489ba28e150b3f09a6e64563ad0bf08283af6bb76 SHA512 8afc4a6d38a8d2db29e22e1a19a54b9a933734e0704f1f598100bb5747bedb413b5f5d85402e584cdc866fd00127e18e45711261f17b7d507406f24b6991af58 WHIRLPOOL 52708909e62cd7217c04fe131ab70b9f78993800724f127fa8d08f3630b0576eee904a90b082566466b63fabebee85b25caa4c4fe46d94ea117937b162cf32b0
+AUX netty-codec-4.0.21-build.xml 12760 SHA256 9037dd6e0d53596aed810a40131159c362030d1d0d6ed3dbb1032f3d8263786d SHA512 1c65888adf7203c212ca683b6c1079f4afe111fcfb945bb0d9df3d68efc0f512c5d72ca82cea066ee09d1564a0563c879d3881640ce586914f689e9fc3976ed7 WHIRLPOOL 50d40a78f3eb38c2e33ba726397749eb22898d779070c6e2ed21bcf8edc7e6af9db575027e1afa7be798b60f35eca0d32a5145dd91c1df9252ea994ef9a8f1e3
 DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
 EBUILD netty-codec-4.0.19.ebuild 2011 SHA256 cc1bd2ce847520c0fa495a3aa8e4302854dba22a953cf162dbbf41db0d8cbd20 SHA512 c61834c59aecbf0957506c5f60edbcbe699306a95d0f5f0380352ca6efd58aecde8226dc0859136e5823615b0e3bb8464d4d4ce41525fc4c9ac801c23673c2d1 WHIRLPOOL 7e1f06706de7198b1c63d528e043f48b0a9398bf5b2b606b2e3c857b872988f559cf5b049792c81498f19102bfefb81ae4d5158750a3947ac4ce2b6bdc5b9991
-MISC ChangeLog 570 SHA256 195a5c8f1d61af6fcf27f6a73d163d3092776b3a1a847f5aecc73890c9132fd1 SHA512 141dca8018f42a6499996e250ba3a0b946aa09c2a99c4c5e0d0dd36d344d67992d7eab6179d7cbce0d919676e2b4c04b4b67f07d0bd168b1758d960651fad758 WHIRLPOOL 3979f1652c7bf9721b77826684e4ff908d93280d4a0703290aac594e519d677222627b00fbb236f288f60d99403bc795555f9b274d605d3197deff5caad0aa21
+EBUILD netty-codec-4.0.21.ebuild 1561 SHA256 180172bd6c6ad6aea09f0833a55fca7d8f509867a7b36963748aeb60c9046770 SHA512 961ed5734ccb63bfb365a795a196edac574ec5db8bd969d03c5ea997a0194da89f879b24521f1b5f5f28baca1c6381f7b4994c32234531028bcdd07f25692d42 WHIRLPOOL abc8f768a6b44a9fa197e057764f10d2219f250cb26372bf3d1e60fb6c5070cc210724c9c066a3d6f4389fb80497b7f56cdcdaeefae85b8bb2b0c4d1628c831b
+MISC ChangeLog 782 SHA256 3516f1170f2ab95e4f5c701e9fbb78186c251ec9e1671d9a3e0cc8295533de5e SHA512 fb2f05a9ce2bd14cd2ba24ff0d8ccf8f0ff197a21deaad6f1f5c88dc5e0b0b806c38f18d6c4d1720603a6cacfd1029abcfd285b2e132897e74d0417410948fd4 WHIRLPOOL 0b5b4d82ed69aa03410360577e49271279f5ed47f2b58b0b4b5a51789284e9b909db4ee8f5c1d8280a4795912d6e2f11e75967936fd0f65f16442bba888374ea
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJThhyjAAoJEJWyH81tNOV9jAsIAKulzRYNTGPfi5p+GWUobF+P
-ycGLuo15FY+BjIfxQktfbm+F07w61kKP6YEOsr0rhUfIpze1l3hJoUYAWjjYmQcF
-qVZIhr8FkFUZWj0XYc3W0gWlLXVd9xWrgNERPqUJ5GDL5M5GErPKiDyZLaHbCFug
-tlbRC5fSGnrG36tm5LtTp6Jv/Bmj3dBq1CcVAYd6xUABEuxjtFJfOcaH0pNkoKjz
-gzhjQOkc4Jx/xVKLfHv0JcSPRJHEWvXlIziCzJZzurycT6yrdG8j35fx8tT/JnA4
-BHoSe1+qzNKgXmD7tLH+olZKnIyJJ/RkgTct49bQZtBpl78LRt5JtY0GGgXBPSY=
-=/Bcg
+iQEcBAEBCAAGBQJTxOUmAAoJEKCEBkJ3xQHthsoH/RFe8YbgFGhQyVl5IILfg6lZ
+zYNB0D9eboV0+c3Xn1JVgSzs1+FTr1KHi0lLTjTTKblXMlL0zZ6PdaHxHFjB8zMy
+5e6km/mLefGcrMyV4WbaxVsTn+NBNLxZmj7LH93MsVlCs/s6qSZDyLg5xaiMhXlp
+RVhh04moz+ZnJ4V1Bob4iHFieqS2BJ37qvPOgOazUh0QmPgABsl07bVGWiRGravl
+6AayKeMrL4ruUv/I+7RChnsFEcyC/YRgKf1VG+feY/U4+o7JbnhPXQqCXL2VkHPT
+gSfE2ttLMKttr8J6xd7nDNKvu5oquy7deO22ipUQyx/Z1qkR50/uoqiqfHCW1Zk=
+=yjQv
 -----END PGP SIGNATURE-----
diff --git a/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml
new file mode 100644
index 000000000000..cf611db90336
--- /dev/null
+++ b/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 5/15/14 7:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-codec-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="netty-codec-4.0.21.Final"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-serial/1.3.18.GA/jboss-marshalling-serial-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-river/1.3.18.GA/jboss-marshalling-river-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/javassist/javassist/3.18.0-GA/javassist-3.18.0-GA.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/3.2/easymock-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.3/objenesis-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock/2.6.0/jmock-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit-dep/4.4/junit-dep-4.4.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.13/logback-classic-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.13/logback-core-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/*Test*.java"/>
+          <include name="**/*Benchmark*.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="false" 
+             use="true" 
+             author="false" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="true"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/netty-codec/netty-codec-4.0.21.ebuild b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
new file mode 100644
index 000000000000..a6f8567d2302
--- /dev/null
+++ b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-codec/netty-codec-4.0.21.ebuild,v 1.1 2014/07/15 08:24:05 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	dev-java/${MY_PN}-common:0
+	dev-java/${MY_PN}-transport:0
+	dev-java/jboss-marshalling:0
+	dev-java/jzlib:1.1.3
+	dev-libs/protobuf[java]"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,jboss-marshalling,${MY_PN}-transport,jzlib-1.1.3,protobuf"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+#    [junit] Testcase: testZLIB_OR_NONE2 took 0.008 sec
+#    [junit] 	Caused an ERROR
+#    [junit] null
+#    [junit] java.lang.InstantiationException
+#    [junit] 	at java.lang.reflect.Constructor.newInstance(Constructor.java:408)
+RESTRICT="test"
+
+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
+}