gentoo resync : 31.05.2021

6 files changed, 5 insertions, 32 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 87c75872c172..7f4b668a850b 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 69e71f2f789e..9d85cbe9bc88 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,5 +1,5 @@
 AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113
 AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
-EBUILD linux-atm-2.5.2.ebuild 957 BLAKE2B 49f73fbeda0ede2e455bfeae5f1e6eea5eab6d7966c8fe8afceab67c25225fb9de916616309f8c2e2ae5979ec8936c234727d28a57fef837ef8111926ac0553f SHA512 38b4deb482f6b55b5aa359608b763b0edbc82f96236ff318372d4ef2c932d3367e6aabc374c3762fb4ac26829f674cfc0bcb8c28ff2984a87ebfd3f6d1202c51
+EBUILD linux-atm-2.5.2.ebuild 970 BLAKE2B 0b7ca699f9afd282e48d15f80e9702fe34f2215e8cc43199409c9d3be3929afa581dcf68ee58bac106c44aaca80c7de063fd3d602c9b152ec71a2d19a172d496 SHA512 4d725564cd8b71b88777ed4660ca4312a2cf1edab080082d38a42fde1ce95f608f7b8257bcddfa02393226c6169a535b9384b2a8ef53de1e28276bce4303a351
 MISC metadata.xml 251 BLAKE2B 2cb2469d547d2f3ca552692a021dbd5259b7402d2cea686916d73ecb7ce7bb520cfb55da0478e85dbed91b69f87a9cac89dda5be9736e2ccf77aaca392f82d7b SHA512 5e556ac292e2a0cb07531af98ac9da974e97534c1cf510e77daa2bf59c5e40bc445501f587e266fe694bf445ffd99219a0077dd66e4c3d4776372a84f6743efd
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index 83246f38d04f..4197658ac869 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit epatch flag-o-matic libtool linux-info ltprune
+inherit epatch flag-o-matic libtool linux-info
 
 DESCRIPTION="Tools for ATM"
 HOMEPAGE="http://linux-atm.sourceforge.net/"
@@ -41,6 +41,6 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	dodoc doc/README* doc/atm*
 }
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index 3a7dbc1ab7c2..a39181b36a31 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,5 +1,3 @@
-DIST moserial-3.0.15.tar.xz 1169728 BLAKE2B a4520ff493c86f13e8c6dc7969d630bbc9690215527a70f68d948869b64347cb4145f19a12b166945faa1d243a1f323491c2f4873eed208188761248c0e00714 SHA512 e5410243a26afbfbb7a52dd3f52a99ced099b26ce43f9be8ed85874a02a361ef99cea74663e243eecc31ca0ac3f51de7ebc7abfc7fc0f48eedbd7a8fc42f9b5d
 DIST moserial-3.0.16.tar.xz 1170976 BLAKE2B dd761019bf559112262bb92ec3a08aa9bcce5e73b03ca10a13547a0496729a229f8bd92c6e67c6661c69d07cf0cc573d885c3668703ecc2b5b594eebe73ea8cb SHA512 2101b5eef61c396f2511d08afad0c44caae63e274412ab26f2f6c9e5ff4c1bb1c1b447cabb66ab25530d5b9881a3e09cd6d9d264aa571c0e5ee48012c1917f7b
-EBUILD moserial-3.0.15.ebuild 523 BLAKE2B dd636d898dc8eae65e32a55765e5d55df679d12ff9c904d42d97b8bd5ac6680e7b199eafc6851a37c262a0b2810fb7f6f2675880a80c6c66b31b355ce7b8fe7f SHA512 0ad2a602ceec53f99c0ab9c3b185e4d1c45aa7eec836266d1ed8ecd776804eb402867a512f593539f28ab89d9958c01721b413acc0552ee298bcf03c2fbf6474
-EBUILD moserial-3.0.16.ebuild 533 BLAKE2B 24055645b672360b8c02c6d89b91988422cd771c5fc629ef97eccdd90360509b6ff3a4c46d655d8a3c119cf1ae3a4d02f3e093c7a4beb27c41fbf10d28a8825e SHA512 cd4a3f2f23f1e083a18e182e2e471590a941af2abb860fa32a6adad0cc26260cb84c6f7e0762474fa6aed50101ef4718b1e06d3eaf8be8f1a8378716b6156a53
+EBUILD moserial-3.0.16.ebuild 531 BLAKE2B af667ca6cfcc984117fcc561b80116c838cfd49d7ad16e0ed098f3957c5efa04d710323b814af3f4f372531654364856ec80f13a97b180134d81323b56d5e0e0 SHA512 88b587bfc5fc1c9ffe76ad65ab2f367b61f8a29e8d2f8f9a192cfdef96c7486ff49596aadbbe1cf7f241edaf89b291a5aa74b25a63f51604b87f95d2126a39e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-dialup/moserial/moserial-3.0.15.ebuild b/net-dialup/moserial/moserial-3.0.15.ebuild
deleted file mode 100644
index 21eb7b7c0852..000000000000
--- a/net-dialup/moserial/moserial-3.0.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="A clean and friendly gtk-based serial terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Moserial https://gitlab.gnome.org/GNOME/moserial"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2[dbus]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.2.0:3
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-"
diff --git a/net-dialup/moserial/moserial-3.0.16.ebuild b/net-dialup/moserial/moserial-3.0.16.ebuild
index 3c39e2b6c5fe..56783a653634 100644
--- a/net-dialup/moserial/moserial-3.0.16.ebuild
+++ b/net-dialup/moserial/moserial-3.0.16.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Moserial https://gitlab.gnome.org/GNOME/mo
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.16:2[dbus]