commit: e927d60e5b2d164a60f3dc62300d66f219a6b6e9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Apr 30 16:14:46 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri May 2 09:50:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e927d60e
dev-java/rxtx: treeclean Closes: https://bugs.gentoo.org/543096 Closes: https://bugs.gentoo.org/761103 Closes: https://bugs.gentoo.org/867409 Closes: https://bugs.gentoo.org/874444 Closes: https://bugs.gentoo.org/898170 Closes: https://bugs.gentoo.org/939374 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/rxtx/Manifest | 1 - dev-java/rxtx/files/lockfiled.xinetd | 13 -- dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff | 14 -- dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff | 90 --------- dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff | 16 -- dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff | 20 -- dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch | 10 - .../files/rxtx-2.2_pre2-fix-for-java-10+.patch | 46 ----- .../files/rxtx-2.2_pre2-fix-invalid-javadoc.patch | 223 --------------------- .../rxtx/files/rxtx-2.2_pre2-format-security.patch | 113 ----------- dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch | 10 - .../rxtx/files/rxtx-2.2_pre2-missing-include.patch | 10 - dev-java/rxtx/metadata.xml | 11 - dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild | 112 ----------- 14 files changed, 689 deletions(-) diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest deleted file mode 100644 index 0c54300b0c51..000000000000 --- a/dev-java/rxtx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 diff --git a/dev-java/rxtx/files/lockfiled.xinetd b/dev-java/rxtx/files/lockfiled.xinetd deleted file mode 100644 index 8d6e95a5e444..000000000000 --- a/dev-java/rxtx/files/lockfiled.xinetd +++ /dev/null @@ -1,13 +0,0 @@ -service lfd -{ - port = 50001 - bind = localhost - type = UNLISTED - flags = REUSE - socket_type = stream - wait = no - user = uucp - server = /usr/sbin/in.lfd - log_on_failure += USERID - disable = yes -} diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff deleted file mode 100644 index 496d732ae2fa..000000000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- src/lfd/lockdaemon.c.orig 2004-10-12 10:59:28.000000000 +0200 -+++ src/lfd/lockdaemon.c 2006-10-29 22:46:58.000000000 +0100 -@@ -248,9 +248,8 @@ - - if ( check_group_uucp() ) - { -- syslog( LOG_INFO, "check_lock_status: No permission to create lock file. -- -- please see: How can I use Lock Files with rxtx? in INSTALL\n" ); -+ syslog( LOG_INFO, "check_lock_status: No permission to create lock file.\n\n" -+ "please see: How can I use Lock Files with rxtx? in INSTALL\n" ); - return 1; - } - diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff deleted file mode 100644 index fb05955c65f1..000000000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff +++ /dev/null @@ -1,90 +0,0 @@ ---- src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200 -+++ src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200 -@@ -87,6 +87,7 @@ - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ - #if defined(__linux__) -+#if 0 - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -98,6 +99,7 @@ - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } -+#endif - #endif /* __linux__ */ - #endif /* WIN32 */ - } ---- src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200 -+++ src/RawImp.c 2006-10-26 21:25:59.000000000 +0200 -@@ -231,6 +231,7 @@ - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ - #if defined(__linux__) -+#if 0 - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -242,6 +243,7 @@ - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } -+#endif - #endif /* __linux__ */ - #endif /* WIN32 */ - } ---- src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200 -+++ src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200 -@@ -87,6 +87,7 @@ - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ - #if defined(__linux__) -+#if 0 - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -98,6 +99,7 @@ - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } -+#endif - #endif /* __linux__ */ - #endif /* WIN32 */ - } ---- src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100 -+++ src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200 -@@ -280,6 +280,7 @@ - gettimeofday(&seloop, NULL); - #endif /* DEBUG_TIMING */ - #if defined(DEBUG) && defined(__linux__) -+#if 0 - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -295,6 +296,7 @@ - getchar(); - } - LEAVE( "RXTXPort:Initialize" ); -+#endif - #endif /* DEBUG && __linux__ */ - } - ---- src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200 -+++ src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200 -@@ -102,6 +102,7 @@ - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ - #ifdef DEBUG -+#if 0 - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -114,6 +115,7 @@ - name.release); - getchar(); - } -+#endif - #endif /* DEBUG */ - #endif /* __BEOS__ */ - #endif /* WIN32 */ diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff deleted file mode 100644 index 2f3f5d623ca9..000000000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/RawImp.c b/src/RawImp.c -index 077f30e..813fcf9 100644 ---- a/src/RawImp.c -+++ b/src/RawImp.c -@@ -99,10 +99,8 @@ - # include <linux/serial.h> - # include <linux/version.h> - #endif --#ifndef __APPLE__ /* dima */ --#ifndef PPC -+#if !defined(__APPLE__) && !defined(PPC) && !defined(__powerpc__) && !defined(__powerpc64__) /* dima */ - #include <sys/io.h> --#endif /* PPC */ - #endif /* dima */ - - extern int errno; diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff deleted file mode 100644 index b8fa3edf5016..000000000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/gnu/io/RXTXCommDriver.java b/src/gnu/io/RXTXCommDriver.java -index 3dce198..954b102 100644 ---- a/src/gnu/io/RXTXCommDriver.java -+++ b/src/gnu/io/RXTXCommDriver.java -@@ -576,6 +576,7 @@ public class RXTXCommDriver implements CommDriver - String[] Temp = { - "ttyS", // linux Serial Ports - "ttySA", // for the IPAQs -+ "ttyPZ", // for G4/G5 RackMac - "ttyUSB", // for USB frobs - "rfcomm", // bluetooth serial device - "ttyircomm", // linux IrCommdevices (IrDA serial emu) -@@ -608,6 +609,7 @@ public class RXTXCommDriver implements CommDriver - // linux ISI serial card - "ttyMX",// linux Moxa Smart IO cards - "ttyP", // linux Hayes ESP serial card -+ "ttyPZ", // linux PPC/PPC64 Zilog serial ports - "ttyR", // linux comtrol cards - // linux Specialix RIO serial card - "ttyS", // linux Serial Ports diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch deleted file mode 100644 index ac3a0a9dbee5..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java.orig -+++ rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java -@@ -574,6 +574,7 @@ - if(osName.equals("Linux")) - { - String[] Temp = { -+ "ttyACM", // linux USB modems - "ttyS", // linux Serial Ports - "ttySA", // for the IPAQs - "ttyUSB", // for USB frobs diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch deleted file mode 100644 index 9ed045fef250..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch +++ /dev/null @@ -1,46 +0,0 @@ -Debian patch for fixing build issues on JDK 10 and above. -In particular, 'javah' needs to replaced by 'javac -h' since 'javah' -has been removed due to JEP 313 (https://openjdk.java.net/jeps/313). - -To support Javadoc generation with JDK 17 and above, the '-source 1.8' -option must be included in the arguments to 'javadoc'. Otherwise, the -following error would be raised: - - src/gnu/io/LPRPort.java:373: error: invalid use of a restricted identifier 'yield' - yield(); - ^ - (to invoke a method called yield, qualify the yield with a receiver or type name) - -The original patch can be found at: -https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/java10-compatibility.patch - -Bug: https://bugs.gentoo.org/831394 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -111,11 +111,6 @@ - $(CLASSES): $(javafiles) $(TOP)/Makefile - $(JAVAH_FIX) - $(JAVAC) $(javafiles) -- $(JAVAH) `(for i in $(javahfiles);do \ -- if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \ -- echo $(CLASSDIR).$$i; \ -- fi; \ -- done)` - $(JAR) cf $(JARTARGET) $(CLASSTOP)/* - - # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its ---- a/configure.in -+++ b/configure.in -@@ -485,9 +485,9 @@ - *) - find_java_native_include jni_md.h - JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni" -- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8" -+ JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.8 -target 1.8 -h \$(DEST)" - JAR="\$(JPATH)/bin/jar" -- JAVADOC="\$(JPATH)/bin/javadoc" -+ JAVADOC="\$(JPATH)/bin/javadoc -source 1.8" - CFLAGS=$CFLAGS" -D_BSD_SOURCE" - ;; - esac diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch deleted file mode 100644 index b734ac7ffd25..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 4c47d6d133f727a9615987d582fa143e4a17cd01 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <[email protected]> -Date: Sun, 20 Feb 2022 08:17:59 -0800 -Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors - -Bug: https://bugs.gentoo.org/642030 -Signed-off-by: Yuan Liao <[email protected]> ---- a/src/gnu/io/RXTXPort.java -+++ b/src/gnu/io/RXTXPort.java -@@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port the name of the port thats been preopened - * @return BaudRate on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * This will not behave as expected with custom speeds - * - */ -@@ -1751,7 +1751,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port the name of the port thats been preopened - * @return DataBits on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - public static int staticGetDataBits( String port ) -@@ -1770,7 +1770,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port the name of the port thats been preopened - * @return Parity on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - public static int staticGetParity( String port ) -@@ -1789,7 +1789,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port the name of the port thats been preopened - * @return StopBits on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - public static int staticGetStopBits( String port ) -@@ -1839,7 +1839,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * the port a second time later on. - * - * @return true on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1862,7 +1862,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * the port a second time later on. - * - * @return true on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1885,7 +1885,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * the port a second time later on. - * - * @return none -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1907,7 +1907,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1927,7 +1927,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1947,7 +1947,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1967,7 +1967,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -1987,7 +1987,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -2007,7 +2007,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * - * @param port - * @return true if asserted -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - */ - -@@ -2025,7 +2025,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * This is an extension to CommAPI. It may not be supported on - * all operating systems. - * @return int the Parity Error Character -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - * Anyone know how to do this in Unix? - */ -@@ -2049,7 +2049,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * all operating systems. - * @param b Parity Error Character - * @return boolean true on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - * Anyone know how to do this in Unix? - */ -@@ -2067,7 +2067,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * This is an extension to CommAPI. It may not be supported on - * all operating systems. - * @return int the End of Input Character -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - * - * Anyone know how to do this in Unix? - */ -@@ -2091,7 +2091,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * all operating systems. - * @param b End Of Input Character - * @return boolean true on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - */ - - public boolean setEndOfInputChar( byte b ) -@@ -2111,7 +2111,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * or "16750". - * @param test boolean flag to determin if the UART should be tested. - * @return boolean true on success -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - */ - public boolean setUARTType(String type, boolean test) - throws UnsupportedCommOperationException -@@ -2127,7 +2127,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * @return type String representation of the UART type which mayb - * be "none", "8250", "16450", "16550", "16550A", "16650", "16550V2" - * or "16750". -- * @throws UnsupportedCommOperationException; -+ * @throws UnsupportedCommOperationException - */ - public String getUARTType() throws UnsupportedCommOperationException - { -@@ -2140,7 +2140,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * @param BaudBase The clock frequency divided by 16. Default - * BaudBase is 115200. - * @return true on success -- * @throws UnsupportedCommOperationException, IOException -+ * @throws UnsupportedCommOperationException -+ * @throws IOException - */ - - public boolean setBaudBase(int BaudBase) -@@ -2155,7 +2156,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - /** - * Extension to CommAPI - * @return BaudBase -- * @throws UnsupportedCommOperationException, IOException -+ * @throws UnsupportedCommOperationException -+ * @throws IOException - */ - - public int getBaudBase() throws UnsupportedCommOperationException, -@@ -2170,7 +2172,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - * Extension to CommAPI. Set Baud Base to 38600 on Linux and W32 - * before using. - * @param Divisor -- * @throws UnsupportedCommOperationException, IOException -+ * @throws UnsupportedCommOperationException -+ * @throws IOException - */ - - public boolean setDivisor(int Divisor) -@@ -2184,7 +2187,8 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS - /** - * Extension to CommAPI - * @return Divisor; -- * @throws UnsupportedCommOperationException, IOException -+ * @throws UnsupportedCommOperationException -+ * @throws IOException - */ - - public int getDivisor() throws UnsupportedCommOperationException, --- -2.34.1 - diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch deleted file mode 100644 index 2d060c338429..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch +++ /dev/null @@ -1,113 +0,0 @@ -Debian patch for fixing errors emitted due to -Werror=format-security. -The patch can be found at: -https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/format_security.patch - -Bug: https://bugs.gentoo.org/550534 - ---- a/src/SerialImp.c -+++ b/src/SerialImp.c -@@ -5108,7 +5108,7 @@ - void report_warning(const char *msg) - { - #ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #else - mexWarnMsgTxt( (const char *) msg ); - #endif /* DEBUG_MW */ -@@ -5129,7 +5129,7 @@ - #ifdef DEBUG_MW - mexErrMsgTxt( msg ); - #else -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #endif /* DEBUG_MW */ - #endif /* DEBUG_VERBOSE */ - } -@@ -5145,7 +5145,7 @@ - void report_error(const char *msg) - { - #ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #else - mexWarnMsgTxt( msg ); - #endif /* DEBUG_MW */ -@@ -5164,7 +5164,7 @@ - { - #ifdef DEBUG - # ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - # else - mexPrintf( msg ); - # endif /* DEBUG_MW */ ---- a/src/ParallelImp.c -+++ b/src/ParallelImp.c -@@ -920,7 +920,7 @@ - void report_error(char *msg) - { - #ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #else - mexWarnMsgTxt( msg ); - #endif /* DEBUG_MW */ -@@ -938,7 +938,7 @@ - void report(char *msg) - { - #ifdef DEBUG -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #endif /* DEBUG */ - } - ---- a/src/SerialImp.cpp -+++ b/src/SerialImp.cpp -@@ -1844,7 +1844,7 @@ - - - #ifdef DEBUG -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #endif - } - ---- a/CNI/SerialImp.c -+++ b/CNI/SerialImp.c -@@ -4549,7 +4549,7 @@ - void report_warning(char *msg) - { - #ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #else - mexWarnMsgTxt( (const char *) msg ); - #endif /* DEBUG_MW */ -@@ -4570,7 +4570,7 @@ - #ifdef DEBUG_MW - mexErrMsgTxt( msg ); - #else -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #endif /* DEBUG_MW */ - #endif /* DEBUG_VERBOSE */ - } -@@ -4586,7 +4586,7 @@ - void report_error(char *msg) - { - #ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - #else - mexWarnMsgTxt( msg ); - #endif /* DEBUG_MW */ -@@ -4605,7 +4605,7 @@ - { - #ifdef DEBUG - # ifndef DEBUG_MW -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - # else - mexPrintf( msg ); - # endif /* DEBUG_MW */ diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch deleted file mode 100644 index 9a69c64029db..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lfd/lockdaemon.c.orig -+++ src/lfd/lockdaemon.c -@@ -69,6 +69,7 @@ - #include <errno.h> - #include <signal.h> - #include <pwd.h> -+#include <limits.h> - - #define FHS - #define LOCKFILEPREFIX "LCK.." diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch deleted file mode 100644 index b56fe43092d0..000000000000 --- a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/SerialImp.c -+++ b/src/SerialImp.c -@@ -146,6 +146,7 @@ - #ifdef LIBLOCKDEV - #include <lockdev.h> - #endif /* LIBLOCKDEV */ -+#include <sys/sysmacros.h> - - extern int errno; - diff --git a/dev-java/rxtx/metadata.xml b/dev-java/rxtx/metadata.xml deleted file mode 100644 index eb11f49a2a1b..000000000000 --- a/dev-java/rxtx/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> - </maintainer> - <use> - <flag name="lfd">Installs and uses LockFileServer daemon (lfd)</flag> - </use> -</pkgmetadata> diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild deleted file mode 100644 index 7f3f16461549..000000000000 --- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit toolchain-funcs autotools java-pkg-2 - -MY_PV="$(ver_rs 2 '')" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Native library providing serial and parallel communication for Java" -# SSL protocol versions supported by the HTTPS website are too old for -# the latest web browsers, so please keep the HTTP URL for HOMEPAGE -HOMEPAGE="http://rxtx.qbang.org/"; -SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"; -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="amd64 ~ppc64" -IUSE="lfd" - -RDEPEND=">=virtual/jre-1.8:* - lfd? ( sys-apps/xinetd )" - -DEPEND=">=virtual/jdk-1.8:*" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die - sed -i \ - -e "s:UTS_RELEASE::g" \ - -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \ - -e "s:-source ... -target ...:$(java-pkg_javac-args):g" \ - configure.in || die - - eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-lfd.diff" - eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-nouts.diff" - eapply "${FILESDIR}/${PN}-2.1-7r2-ppcioh.diff" - eapply "${FILESDIR}/${PN}-2.1-7r2-ttyPZ.diff" - eapply -p0 "${FILESDIR}/${P}-limits.patch" - eapply "${FILESDIR}/${P}-add-ttyACM.patch" - eapply "${FILESDIR}/${P}-format-security.patch" - eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch" - eapply "${FILESDIR}/${P}-fix-for-java-10+.patch" - eapply "${FILESDIR}/${P}-missing-include.patch" - eapply_user - - rm acinclude.m4 || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable lfd lockfile_server) -} - -src_compile() { - # Parallel build on this package may cause random - # build-time errors sometimes due to race conditions - emake -j1 - - if use lfd ; then - # see INSTALL in src/ldf - $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die - fi - - if use doc ; then - emake -j1 docs - fi - - # Fix for src zip creation - if use source ; then - mkdir -p src_with_pkg/gnu || die - ln -s ../../src src_with_pkg/gnu/io || die - fi -} - -src_install() { - java-pkg_dojar RXTXcomm.jar - java-pkg_doso ${CHOST}/.libs/*.so - - dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt - docinto html - dodoc RMISecurityManager.html - - if use lfd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/lockfiled.xinetd" lfd - dosbin src/lfd/in.lfd - dodoc src/lfd/LockFileServer.rfc - fi - - use doc && java-pkg_dojavadoc api - use source && java-pkg_dosrc src_with_pkg/gnu -} - -pkg_postinst() { - if use lfd ; then - elog "Don't forget to enable the LockFileServer" - elog "daemon (lfd) in /etc/xinetd.d/lfd" - else - elog "RXTX uses UUCP style device-locks. You should" - elog "add every user who needs to access serial ports" - elog "to the 'uucp' group:" - elog - elog " usermod -aG uucp <user>" - fi -}
