gentoo resync : 23.09.2020

3 files changed, 3 insertions, 105 deletions

diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index 656b0b80ce5a..60cfba9903ce 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -4,6 +4,5 @@ AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da069
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
 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-r1.ebuild 2227 BLAKE2B 5d1452dbaddce8f467f46ed44a789e10dfa2717e6683c6823319129fea5960603a078795b7d75f2fd9db144b6ec331da9d14d9418928ff2dd383ff7c57f66271 SHA512 4a97e69b8601c3ec5ced216f3236c5e564fe2edc91f813ac0a620bd602b07bbc15d471c6f10c3d05d4a6720e12d914d0236e228723ad74f607f7a46dec6e6c1d
-EBUILD rxtx-2.2_pre2.ebuild 2300 BLAKE2B bac12b8d60a71184581a8c6fd72e02aae1d13359bdd47cd06599edd82c4e30e690556e4271ddb746a9db1f8da073cb58a3020d4213223bf67693125fb11f5c88 SHA512 04eea992fa9f8553ecd4fa8eef777db949996bfae176ed8f23e575034d334c1eff3ebb783452899edefbabae459ac04e5c59ca41fadb78ff530ce90d4191ed70
+EBUILD rxtx-2.2_pre2-r1.ebuild 2222 BLAKE2B f94fffc150c4ec4fec5788ac72156208bfedad321ebf40b220b1abc98e31be3df6ad22705b6491df61028e0fd79e9cca453f5a989322006ebf153b53b6da34b9 SHA512 92a9461b5789013746a149a11d3d52e2476933200b127975c64c6969751193919fe70ff7b871ae0e1b6c59f7ac4d3292d66ad9fdf3a189766e428254db7ede12
 MISC metadata.xml 333 BLAKE2B 1863349617d00ca1b5076d4a8f626e43afbe0be700385cd46a4c6a9636486ce100cb916ac6013b6fe8de41bc69dae4bfd95f96c60c960ca04730411e90fdb94d SHA512 fa687c6a61c8be4e5b80f14b9eb6ef7637f9de649e3c35dd81f81096c1bbafe67ee5979c551d958422fdbff1ebb08b43a1630d9cbdf283e56c4ea5aca1cd3ac7
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
index 4a59306f198f..250fe5e92412 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,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 x86"
 IUSE="lfd"
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
deleted file mode 100644
index 906a1b6e0471..000000000000
--- a/dev-java/rxtx/rxtx-2.2_pre2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs versionator autotools java-pkg-2
-
-MY_PV="$(delete_version_separator 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Native lib providing serial and parallel communication for Java"
-HOMEPAGE="http://rxtx.qbang.org/"
-SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="doc source lfd"
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core
-	lfd? ( sys-apps/xinetd )
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# some minor fixes
-	sed -i -e "s:UTS_RELEASE::g" configure.in || die
-	sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in || die
-	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in || die
-	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
-
-	# some patches
-	epatch "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
-	epatch "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
-	epatch "${FILESDIR}/${P}-add-ttyACM.patch"
-
-	# update autotools stuff
-	rm acinclude.m4
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable lfd lockfile_server)
-}
-
-src_compile() {
-	emake
-
-	if use lfd ; then
-		# see INSTALL in src/ldf
-		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed"
-	fi
-
-	if use doc ; then
-		emake docs
-	fi
-
-	#Fix for src zip creation
-	if use source ; then
-		mkdir -p src_with_pkg/gnu
-		ln -s ../../src src_with_pkg/gnu/io
-	fi
-}
-
-src_install() {
-	java-pkg_dojar RXTXcomm.jar
-	java-pkg_doso ${CHOST}/.libs/*.so
-
-	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
-	dohtml 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
-}