gentoo resync : 09.07.2022

4 files changed, 42 insertions, 2 deletions

diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index a7a70333c158..bb53d99f8750 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,11 +1,13 @@
 AUX lockfiled.xinetd 202 BLAKE2B 38ecf8d5faadf521d5253e60183d13c3040a88035d5e039e11515e876a0ee80799d3fd31a736fb9176ae88b5e58ea40e2fff1beadb593770f2a4774acc10e32c SHA512 5ad71db04f2cc44348572876079b9548a3aafb84aa53aa6f6d422468c54911cc149cae94743d86eaf7dc62a1cc1479b95893dfa0909367778f20e1ad72b99fea
 AUX rxtx-2.1-7r2-lfd.diff 497 BLAKE2B 1e74708071d4645e0444d4ac2bffb8b952f17723d1ce98a784a75c5e1f1d22f2472ebbe0aa16c40b830be0255bd04b8d3a13ffe8d54b4d787e3a03e4d07f4be9 SHA512 fd06c021ad496036556f979e783864d6d88d1a0c039396eefacc569d66e6942b08b246970be640c73c0c2d209aa0c3247db61bdc19a99066789d4f4d0e4d390e
 AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da06972d4511905c73e1676fab4ad772a9d22aa3d639095798def629cba794f93add6e67878fff8441f628063ce421 SHA512 c7c6c11785089d321ee9680f4b67c590fe0c3cc0f031196eb71831ef7f319867fb156912c0c934a751d5d9e97774d6c26cab5c710055e919e97bcf39a789787d
+AUX rxtx-2.1-7r2-ppcioh.diff 422 BLAKE2B 818bf8cf360267ed84ac7d7a4aa6ea6bc5c67c1af78b7c3db2c32f0a7f858661e5499f130f4c837fc48f5064f12d8d69ba083244e66686e0285fdd120f76700e SHA512 c7cbe130dbb9757f6a542f495589bfaeb0fbf77a03a4034bcb25366931df2dab9ef958cf7527b35e711ca874e0e196735eb49582f4de0268b04b2c4cba4974d5
+AUX rxtx-2.1-7r2-ttyPZ.diff 893 BLAKE2B 2004bf1e5d52f62cae6407630d646d00addac73bda39eafc961c94e42baf62b910ead703772747ba77207ec4f7e6d8773e5636a49903471b0fd19acedd24c801 SHA512 5f9452a2e681d903ef07c4ff0abe99917260a857c59d5b24808389a6154134f296e68d7a2bbe629200d95a2948b24d53da371cfb407f1fa88c0020600df6bab1
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
 AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1825 BLAKE2B 5ae56268cf4e98ec78f91c4e65d17c0bccefcc297b7f34354d4de972038f894f4aa14493c8f40f4ba0ef89c93865e4384494195e93b2c2083d4612b13f54ac65 SHA512 61a1d5ced0f25cd5cd7eea7e4da57eeb933f59919c3b1137a27cf69195d08c9ad0f2d7d0a52748df2daf280c9abd5bdd4f610783b8ccaccd480b02ef1d0a8555
 AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8268 BLAKE2B f5b40ce1dbdfa2a1ec98ad6c886a932ddfea7157ff5a2e21f7c56c32e50dfe9b220e033ced0e41f94b0432669d042eebb37dc23e0b1084127f5376fb8f1faaa1 SHA512 a86dbc331e6c3a697f09a517abdebbf450ecffdd0a90dd0b539a4ea7ccda366655e1efd626d8fd503d58a9e221be9a01ad44ac37327316149d8d0e2fb6923802
 AUX rxtx-2.2_pre2-format-security.patch 2480 BLAKE2B 5e19b8ae5d49c094a8faa84c2cd5eca513bb309836fc8f1544e142ccab5b9a53f05771f2412b2953cae3f13e1c96d8d84e1f4a1f4dfdcc3719947d5ec182cec8 SHA512 c0ed0d34c04cfe87b134c55c819af65017c30e38cce00eedd146d70bb7e3a304b92b8fa8c11f3ab9076701f71f7370b28a902c7e3fee18f46f5a6a2aea3ed66a
 AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
-EBUILD rxtx-2.2_pre2-r2.ebuild 2650 BLAKE2B 2095d6555f375b9d1ee75538abb734c719785516047727b5d929de1c00a2fa8b03fe57522560c38074212a7ba7742f607c22f621269da38b3d00de910217f778 SHA512 323bb50e9c3a636fdbd4018391c4feea544e9d3f4f6458ec4a9b6868c882ce4e9ca79bf8685395bd03be111be8a7689d649a5a561ca4f8c6864ebfb61ce70bec
+EBUILD rxtx-2.2_pre2-r2.ebuild 2752 BLAKE2B 4b8ec7df31ef7fce2cedd4b82722f1702205bbcebf55fe7656570ae9108f0f26d59c9a996d08a7b6f7b447a7c9a213b5b5876f1c8e58a6cc0d6134b863deb4d8 SHA512 85e77dc19acc5bac48e58a10a03309b36733927e73693c071c19fcb12dd76c2bc1a858dbc0e43b8b640ce65e585efac0c0935ebdd9dc67e0bf3af2307c32b4fd
 MISC metadata.xml 334 BLAKE2B b86a021232d18fba74442a66f689351c6440a1cca9be38d526ec2c9e65fa634f1cb265177d974bdf6b6f764c1df9531f75346f69ac071de6ed3f880eb09a3f44 SHA512 cb51df875f3ab1e39a5141ffe2cf79fed88339a9bf2bcb747be78b5986035dd5925fccd120cdb54ab8ab4e0371eda1cb9412f141bcc7583cb55f7bcf85a3683a
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
new file mode 100644
index 000000000000..2f3f5d623ca9
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..b8fa3edf5016
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff
@@ -0,0 +1,20 @@
+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/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 16874cfaeefa..2d39447cb63b 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
 SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="lfd"
 
 RDEPEND=">=virtual/jre-1.8:*
@@ -39,6 +39,8 @@ src_prepare() {
 
 	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"