commit: 5c167bcd5a7d064970b9583b1b57d7e46933b3da Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Apr 13 22:22:37 2015 +0000 Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk> CommitDate: Mon Apr 13 22:22:37 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5c167bcd
dev-java/jutils and dev-java/jinput now in the tree. dev-java/jinput/ChangeLog | 22 ------- dev-java/jinput/Manifest | 6 -- dev-java/jinput/files/jinput-javah-classpath.patch | 10 --- .../files/jinput-remove-getDeviceUsageBits.patch | 74 ---------------------- dev-java/jinput/jinput-2.0.6.ebuild | 55 ---------------- dev-java/jinput/metadata.xml | 16 ----- dev-java/jutils/ChangeLog | 8 --- dev-java/jutils/Manifest | 4 -- dev-java/jutils/jutils-1_pre20070306.ebuild | 39 ------------ dev-java/jutils/metadata.xml | 15 ----- 10 files changed, 249 deletions(-) diff --git a/dev-java/jinput/ChangeLog b/dev-java/jinput/ChangeLog deleted file mode 100644 index 4f7aecf..0000000 --- a/dev-java/jinput/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -# ChangeLog for dev-java/jinput -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 03 Jun 2012; James Le Cuirot <[email protected]> jinput-2.0.6.ebuild: - Fix wrt PMS section 7.3.1. - - 16 Nov 2011; James Le Cuirot <[email protected]> - -jinput-1_pre20100416.ebuild, +jinput-2.0.6.ebuild, - +files/jinput-remove-getDeviceUsageBits.patch, - +files/jinput-javah-classpath.patch: - Version bump. Use real version number now. Patches to fix implicit - declaration and build failure under JDK 7. - - 19 Dec 2010; James Le Cuirot <[email protected]> - -jinput-1_pre20060905.ebuild, -files/jinput-fix-build.xmls.patch, - +jinput-1_pre20100416.ebuild: - Version bump and cleanup. Respect CFLAGS and LDFLAGS. Don't prestrip. - Tests generally only work as root and probably aren't reliable so remove. - - 22 Jan 2009; Alistair Bush <[email protected]> ChangeLog: - Add ChangeLog for QA. diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest deleted file mode 100644 index 7ead3f4..0000000 --- a/dev-java/jinput/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX jinput-javah-classpath.patch 469 RMD160 e254d54fadf3042ed8ec8075d2038574cce616a7 SHA1 019a45c29798a47cafa2a43c242e96555662a8d7 SHA256 7653b41686f8cea84aa926cc58b796ef3b9474f3208116043026f61779e9f7a5 -AUX jinput-remove-getDeviceUsageBits.patch 3151 RMD160 331f2b286b9fd76e53bcf9754b8a269ed437fefb SHA1 83b00c5bd2ad7fb574de1e5fcb4fe199e3138471 SHA256 313ca5baf443acf70a7f4ffc82cb1494d691264049c1a005ea254047ccbaabee -DIST jinput-r247.tar.xz 92596 RMD160 c92ddea2cc41194421ed8ff150512105cd4b8664 SHA1 e9c4608f7e5f4004695d09f785a055c01e1b5d05 SHA256 8a82c9a2e6879cadf0ef472b3207e64196a55e2012e5f536417de5a9ee4295e0 -EBUILD jinput-2.0.6.ebuild 1342 RMD160 69063dc123766016fe59644035e05b3af5b50ae4 SHA1 01a2a517f8a51b8791ac9b09d0ea28d02c982839 SHA256 9b6d9c201c2ee2c3a9a4d93cb7f403e561c7e32776fcb26518498e650249a3a1 -MISC ChangeLog 930 RMD160 104f275a9efc1a32998271b8b84f759ae645e304 SHA1 17428c013783ca57aea99b5360fa4593e2fe2741 SHA256 6b0e53740cb42f0035b28559482c0aa12349ce4efc4ae4f839b992d1ad7641aa -MISC metadata.xml 597 RMD160 cc53ae57677268e685476b4ed0c7d4f137247cb0 SHA1 2eea23a26258899945c4a96ab83be694ea85374c SHA256 9de1f23c46844e2a6c0432ce6d88a62188342935e51031f5ceb9cb74be8f28e9 diff --git a/dev-java/jinput/files/jinput-javah-classpath.patch b/dev-java/jinput/files/jinput-javah-classpath.patch deleted file mode 100644 index ae90584..0000000 --- a/dev-java/jinput/files/jinput-javah-classpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/linux/build.xml.orig 2006-07-11 22:07:38.000000000 +0100 -+++ plugins/linux/build.xml 2011-11-16 15:49:21.140789781 +0000 -@@ -56,6 +56,7 @@ - <javah destdir="src/native"> - <classpath> - <pathelement location="classes"/> -+ <pathelement location="../../coreAPI/classes"/> - </classpath> - <class name="net.java.games.input.LinuxEventDevice"/> - <class name="net.java.games.input.LinuxJoystickDevice"/> diff --git a/dev-java/jinput/files/jinput-remove-getDeviceUsageBits.patch b/dev-java/jinput/files/jinput-remove-getDeviceUsageBits.patch deleted file mode 100644 index 52829c7..0000000 --- a/dev-java/jinput/files/jinput-remove-getDeviceUsageBits.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: trunk/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java -=================================================================== ---- trunk/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java (revision 247) -+++ trunk/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java (working copy) -@@ -94,28 +94,6 @@ - } - - private final Controller.Type guessType() throws IOException { -- Controller.Type type_from_usages = guessTypeFromUsages(); -- if (type_from_usages == Controller.Type.UNKNOWN) -- return guessTypeFromComponents(); -- else -- return type_from_usages; -- } -- -- private final Controller.Type guessTypeFromUsages() throws IOException { -- byte[] usage_bits = getDeviceUsageBits(); -- if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE)) -- return Controller.Type.MOUSE; -- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD)) -- return Controller.Type.KEYBOARD; -- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD)) -- return Controller.Type.GAMEPAD; -- else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK)) -- return Controller.Type.STICK; -- else -- return Controller.Type.UNKNOWN; -- } -- -- private final Controller.Type guessTypeFromComponents() throws IOException { - List components = getComponents(); - if (components.size() == 0) - return Controller.Type.UNKNOWN; -@@ -342,15 +320,6 @@ - } - private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException; - -- private final byte[] getDeviceUsageBits() throws IOException { -- byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1]; -- if (getVersion() >= 0x010001) { -- nGetDeviceUsageBits(fd, bits); -- } -- return bits; -- } -- private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException; -- - public final synchronized void pollKeyStates() throws IOException { - nGetKeyStates(fd, key_states); - } -Index: trunk/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c -=================================================================== ---- trunk/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c (revision 247) -+++ trunk/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c (working copy) -@@ -112,20 +112,6 @@ - return num_effects; - } - --JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) { --#if EV_VERSION >= 0x010001 -- int fd = (int)fd_address; -- jsize len = (*env)->GetArrayLength(env, usages_array); -- jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL); -- if (usages == NULL) -- return; -- int res = ioctl(fd, EVIOCGUSAGE(len), usages); -- (*env)->ReleaseByteArrayElements(env, usages_array, usages, 0); -- if (res == -1) -- throwIOException(env, "Failed to get device usages (%d)\n", errno); --#endif --} -- - JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) { - int fd = (int)fd_address; - jsize len = (*env)->GetArrayLength(env, bits_array); diff --git a/dev-java/jinput/jinput-2.0.6.ebuild b/dev-java/jinput/jinput-2.0.6.ebuild deleted file mode 100644 index 01daf15..0000000 --- a/dev-java/jinput/jinput-2.0.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -# svn export https://svn.java.net/svn/jinput~svn/trunk jinput-r${REV} -# rm -r jinput-r${REV}/lib/* -# tar Jcf jinput-r${REV}{.tar.xz,} - -REV="247" -MY_P="${PN}-r${REV}" - -WANT_ANT_TASKS="ant-nodeps" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="An implementation of an API for game controller discovery and polled input" -HOMEPAGE="https://jinput.dev.java.net"; -SRC_URI="http://dev.gentooexperimental.org/~chewi/distfiles/${MY_P}.tar.xz"; -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.4 - dev-java/jutils" - -RDEPEND=">=virtual/jre-1.4 - dev-java/jutils" - -S="${WORKDIR}/${MY_P}" - -JAVA_PKG_BSFIX="off" -EANT_BUILD_TARGET="dist" - -src_prepare() { - java-pkg_jar-from --into lib jutils - - epatch "${FILESDIR}/jinput-remove-getDeviceUsageBits.patch" # http://java.net/jira/browse/JINPUT-44 - epatch "${FILESDIR}/jinput-javah-classpath.patch" # http://java.net/jira/browse/JINPUT-45 - - sed -i \ - -e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \ - -e '/<apply .*executable="strip"/,/<\/apply>/d' \ - plugins/linux/src/native/build.xml || die -} - -src_install() { - java-pkg_dojar dist/jinput.jar - java-pkg_doso dist/*.so - - use source && java-pkg_dosrc */src/java/* */**/src/java/* -} diff --git a/dev-java/jinput/metadata.xml b/dev-java/jinput/metadata.xml deleted file mode 100644 index 68a43bb..0000000 --- a/dev-java/jinput/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>java</herd> -<maintainer> -<email>alistair.bush at gmail.com</email> -<name>Alistair Bush</name> -</maintainer> -<longdescription lang="en"> -The JInput Project hosts an implementation of an API for game controller -discovery and polled input. It is part of a suite of open-source technologies -initiated by the Game Technology Group at Sun Microsystems with intention of -making the development of high performance games in Java a reality. -</longdescription> -</pkgmetadata> - diff --git a/dev-java/jutils/ChangeLog b/dev-java/jutils/ChangeLog deleted file mode 100644 index ce79640..0000000 --- a/dev-java/jutils/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -# ChangeLog for dev-java/jutils -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 22 Jan 2009; Alistair Bush <[email protected]> - jutils-1_pre20070306.ebuild: - QA Fixes. - diff --git a/dev-java/jutils/Manifest b/dev-java/jutils/Manifest deleted file mode 100644 index 0632841..0000000 --- a/dev-java/jutils/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST jutils-1_pre20070306.tar.bz2 10999 RMD160 afcd9b9b3f87140bf2517716f509b54f6dd3bd29 SHA1 f417b9d69a9bb7abf96fa76aac5c859b520d4bfa SHA256 61944ce42c07f2db5f94f7872820ac92dccd74df6681ac41332a70b7b37f9caf -EBUILD jutils-1_pre20070306.ebuild 1027 RMD160 7c0d7b31a989491c1b595941116e2ffc9f0fa7c5 SHA1 40ea698c12a3878a97714760abe3a7347d676535 SHA256 844084da762af75e777fb635e295cc3c2d7ce193596c181100c8082ed5fb545b -MISC ChangeLog 211 RMD160 03a3a66544e51487de4cd027a1195c3f78d0f207 SHA1 04d35c1e6f4a5af88d3836cf390752e528598479 SHA256 48356ee79e356455b19cce3887b5e1cfb5b8f2f1e5cd7496a99044e3c6044be0 -MISC metadata.xml 536 RMD160 78b581dd62a3e35c0792a470dbb2a5d19d8c122b SHA1 6961898d5462d659b95965aeaac1088f76ea97f4 SHA256 01917e4a1f23edea5fe891bd1c19615f71b9ef10d9467770b6a186227e0c318d diff --git a/dev-java/jutils/jutils-1_pre20070306.ebuild b/dev-java/jutils/jutils-1_pre20070306.ebuild deleted file mode 100644 index 9630b6f..0000000 --- a/dev-java/jutils/jutils-1_pre20070306.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -#extracted from cvs on 20070603 -#cvs -d :pserver:[email protected]:/cvs login -#cvs -d :pserver:[email protected]:/cvs export -r HEAD jutils -# Then clean away binaries and .cvsignore files - -DESCRIPTION="A set of APIs utilized by the Java Game Technology Group." -HOMEPAGE="https://jutils.dev.java.net"; -SRC_URI="http://dev.gentoo.org/~betelgeuse/overlay_distfiles/${P}.tar.bz2"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.4" -RDEPEND=">=virtual/jre-1.4" -IUSE="" - -S="${WORKDIR}/${PN}" - -# Uses additionalparam to feed -source which makes javadoc fail when we -# add the source attribute -JAVA_PKG_BSFIX_SOURCE_TAGS="${JAVA_PKG_BSFIX_SOURCE_TAGS/javadoc}" - -# Graphical tests -RESTRICT="test" - -src_install() { - java-pkg_dojar bin/*.jar - use source && java-pkg_dosrc src/java/net - use doc && java-pkg_dojavadoc apidocs -} diff --git a/dev-java/jutils/metadata.xml b/dev-java/jutils/metadata.xml deleted file mode 100644 index 0795ca6..0000000 --- a/dev-java/jutils/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>java</herd> -<maintainer> -<email>alistair.bush at gmail.com</email> -<name>Alistair Bush</name> -</maintainer> -<longdescription lang="en"> -The JUtils Project hosts an implementation of a set of APIs utilized by other -Java Game Technology Group projects (eg JInput,JOAl, JOGL). Some of those other -projects may have build and/or run-time dependancies on the jutils.jar file. -</longdescription> -</pkgmetadata> -
