gentoo resync : 28.04.2021

15 files changed, 14 insertions, 383 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index b3af2ebb9969..0aff8925dc4d 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/adb-sync/Manifest b/app-mobilephone/adb-sync/Manifest
index dc891f00366b..f98dffe6a701 100644
--- a/app-mobilephone/adb-sync/Manifest
+++ b/app-mobilephone/adb-sync/Manifest
@@ -1,5 +1,3 @@
-DIST adb-sync-0_p20181127.tar.gz 13952 BLAKE2B b9097f44eebd76e54cee41f097933f85151399e99275268274252b53f47ab241ecb888f3631dd9f657213160f02e9f3638d782fb24de8e38631d0e2a81b6b03e SHA512 007b9ec089170f3e679a26f23952043ad922a2f988532183200ddd15792858d4d38c6dbd617b32ff0e17d01b37b246c173e4a3f8c008f7cf4bca551e64cd0ca3
 DIST adb-sync-0_p20190101.tar.gz 13956 BLAKE2B 380109fa302fc5376de8124aa31c3fa03a27ece22d7f2d74638a5387820ad7c2b294daa6e8185f6eef49524e987d7a7f1222a1ee3b6550247993ebcc7c1ac98d SHA512 8bd5eb514c63327860017402f509231a0882cd3624ed3350039b2383f38e503abc6cd319ff41a47d70031958b0b38b973c36272fc4af6e69cce54e15e6bb6990
-EBUILD adb-sync-0_p20181127-r1.ebuild 714 BLAKE2B 1225383f63c8ecb4619777e680f5fe4648829cf4c7ac1ba38205e3805f2c9ba39d5b65d0ff214cde22c21a67db2796d7aeac5f9f8a4d5af4b034871735ee8167 SHA512 3da2b139e2f7351f7bdf0a0f61505190d3e626841ad0f269f7bd37289cf2fcbd67c1b56f11b9d3fc373c4931d7df7b1abdff0df68ed4d99c3570cc250be7bb2f
 EBUILD adb-sync-0_p20190101.ebuild 751 BLAKE2B 861dae70b50306c214dea35a9205a13b50995a6a8341d5f6358b96e6533bbad3b99d5ba9d23957b38fba614ead4378924a206f23db79df058abdcab4b7d1425f SHA512 559379a084300dc9829486cd53278422201db44c3f16f876be67d65e9cfae4151c9602f3525eb64d3ccd2032672f6cf4f2fc4c5774987e7dadf4c29baa14b13a
 MISC metadata.xml 397 BLAKE2B a06cb2d113e9c9bfe80355a888692a18e6aa0d1f159899b8bbe2679957aa573ad928c47a1e9a5223180e908399829153a75db97b9108118fa33c707a40318f44 SHA512 f3f8f9e16be8bc09a0480034d8ed4c8f16cf4780652207c2b2ef4143c46dca56309db1888999167de671f1e47eb41b797937f5dc8a287b92916ec237bdb6821c
diff --git a/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild b/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild
deleted file mode 100644
index 549f4a13d6f0..000000000000
--- a/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-single-r1
-
-COMMIT=b0a2a10
-
-DESCRIPTION="Synchronize files between a PC and an Android device using ADB"
-HOMEPAGE="https://github.com/google/adb-sync"
-SRC_URI="https://github.com/google/adb-sync/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+channel"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-util/android-tools
-	channel? ( net-misc/socat )"
-DEPEND=""
-
-S="${WORKDIR}/google-adb-sync-${COMMIT}"
-
-src_install() {
-	dodoc README.md
-	python_doscript adb-sync
-	use channel && dobin adb-channel
-}
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 8e4cfb237b29..e0a45b8e2d82 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -6,6 +6,6 @@ AUX gnokii-0.6.31-gcc7.patch 830 BLAKE2B 308123e9f4a341a9ec1b2dd90e6c88b9ba9f2d8
 AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2d8692cf5879f3b3b0f5304dba257a56dc3c45b920c29b5fbda120daa7bbd3135f9a53880e09447580fd320b SHA512 11ecd345c1bd93a8c0f316b411106bc22c5fecff2a848d075e9feb1bd1581a255dbf5a7eaa7fc525325af9b1c7d90736a7b58104f870f3d7ec329ea0b43c2dc3
 AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
 DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
-EBUILD gnokii-0.6.31-r3.ebuild 3514 BLAKE2B 1c22c3b5fdf3b7b7d683330ca43503ca464925613fb9e15d4bf37ceb39cfe9f561b54d1e68f67c4703ff51fcdfc21aac03b3230f3292f5f97411b653131e0b87 SHA512 1da9fa658837cc119bb8cfb780e6c54a1baf127ae8a00bf9fdeca450287ceff925fce32bb9d27e9762719ae7a78c5e22b320c227bdb74d25d9929aab3395889f
-EBUILD gnokii-9999.ebuild 3347 BLAKE2B 68b0e4f22aadfe6a0f22bdc54adb555e5d840b12e41eed4c11c65fa99f575694b29e7b003fef3cd01cfe4739a9ddbc6c8dddfb559461327e42844cf69434dc7c SHA512 433039368e1b48382406fa03d59fa8be2aea545172173795d21ed79dabe03371d05750daaa1fadc210f8b81cbbd7f64546bfdd0c8da7d80e46645e7e10af257d
+EBUILD gnokii-0.6.31-r3.ebuild 3520 BLAKE2B d78ab63cd422b9a4db7a4d66f27566a917ce29b17e9921858e47295de4d2520392fa1fb75e44c8c43b07bfa5155b9b393b219716a0a7abea1fa56138599f17a8 SHA512 458ed4d9b9cfcf670f1ba7d8fda594000042955eea0c33adace26ea03045b2105e588a900625e800f1d9804ed3bb7b4e7b200e6c4adb5535f3dcdb2ad3f3448d
+EBUILD gnokii-9999.ebuild 3353 BLAKE2B 057de65fdfc9a45360f025e318fc72435b24e5542b7e980674598dccf2669038429a2314cd81157f7332a9a04d509af14e9795b65472703c84751caacbe4d0cc SHA512 27d857b47d9ccfe8d9a7a445a88f2dcd23340dc72ae973f2d740ede6a5aaff3ff2c7ee0c728deef929f11776e233735a40ecf58190497c67322300e15ea0146d
 MISC metadata.xml 756 BLAKE2B 840e51ec7099b1ae34694dfa328d908147c90a32689165201a98bbc6559c1d6db8c63dffc0264210203775ba502d1c64d3245b32c4def375abf7a7685539c458 SHA512 7fbdd7684cd7810fe6114146a3378c346ca8d01df54adbbea292b0727fb039d5ceec29e4a5fd4d3031c17f9f229a4de0d635ae23e57eb507103255ebcb057983
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
index 949ac0b84603..ea8a7db38ad6 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools desktop eutils linux-info
 
 HOMEPAGE="https://www.gnokii.org/"
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="
 		git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
@@ -55,7 +55,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	[[ $PV == *9999 ]] && \
+	[[ ${PV} == *9999 ]] && \
 		PATCHES=(
 			"${FILESDIR}"/${P}-icon.patch
 			"${FILESDIR}"/${P}-translations.patch
@@ -133,7 +133,7 @@ pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ $PV == *9999 ]]; then
+	if [[ ${PV} == *9999 ]]; then
 		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
 		elog "You can keep track of the most recent commits at:"
 		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
index 48d40e6b607e..a0db30a29c88 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools desktop eutils linux-info
 
 HOMEPAGE="https://www.gnokii.org/"
-if [[ $PV == *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="
 		git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
@@ -52,7 +52,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	[[ $PV == *9999 ]] && \
+	[[ ${PV} == *9999 ]] && \
 		PATCHES=(
 			"${FILESDIR}"/${P}-icon.patch
 			"${FILESDIR}"/${P}-translations.patch
@@ -126,7 +126,7 @@ pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
-	if [[ $PV == *9999 ]]; then
+	if [[ ${PV} == *9999 ]]; then
 		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
 		elog "You can keep track of the most recent commits at:"
 		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 1c924d3b10fe..a944d5050eed 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,6 +1,6 @@
 DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
 DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
-EBUILD heimdall-1.4.2-r1.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
+EBUILD heimdall-1.4.2-r1.ebuild 1032 BLAKE2B 2098606391be23818664ae61af8757f78d65bcdbc6d377e97de0776b53aa89e714f29a1b315f1ed0a2f58212f48dfec20408fcfe8c7df12162c36841395812d5 SHA512 07f6b8a103e3ad382fa99e11ef3d95c6cd7fff5ea51ae20a1f44ea722ffeae2f87a9c54ab35ac8016bddcacbdaed411201e9c69a2e6e2056c21596004d02bc98
 EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
 EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
 MISC metadata.xml 484 BLAKE2B 735cec9feaeda05021f60068a46ab3156e6fe08c8e6c6abbb986170817db5d2c09b704f34c25b5c3da3549999ac28af0150a267b60a24555bf3beb0c34966865 SHA512 7425925defbe15e76ec54212daa8d1e6d45035102962fe4dcc9bd976f0610e2b535c52974b498cdbf55298f20095ee41c2f3545407534841c01fa40a6f89de2c
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
index e4026eb23735..9bd4e13eb6db 100644
--- a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/Heimdall-${PV}"
 else
 	inherit git-r3
diff --git a/app-mobilephone/smsclient/Manifest b/app-mobilephone/smsclient/Manifest
deleted file mode 100644
index c87635208874..000000000000
--- a/app-mobilephone/smsclient/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX smsclient-2.0.9a-gentoo.patch 6145 BLAKE2B 47844bd58422f1eb7e9beea18f89e5f7dc9e91d3a7201f07b7bbb119b098bc7876621ecb4160276ff914149c4d7dba01a05260339c07a6bc58756d37c22f1440 SHA512 6a1e0f82d430e12050c1b5525d84d3b916790c6b413b15c1cffe61cab815f7c08576edfa06ee66717a475f6c843040bdfc0d12767a22b90c79a800db47417406
-AUX smsclient-2.0.9a-sender.patch 6223 BLAKE2B eac74ed01e7d7737e12902c2a2c5e2fcb9614d2a902b9130c4333ab5d07ca5f8a40f92756fb97b1ff7a4604576a0c9e019f33f4d4c21a6c7ef0df7541160b25a SHA512 13f588aaae9379c44285a7a6a72de196dddd7d31be2fc98b09a0d721492f6ff2a81d4314fee544932876b1996724274a22de78b800f90050c7be4b3bba41a3d6
-DIST smsclient-2.0.9a.tar.gz 151600 BLAKE2B be51d81770d89626d0bb86a013c970add6f2fb60bf5dba4faff898ea7b542a9649274d3ea5a3b76e43ff34494b5e073a78030134af33b9b9cb5f787db0d0ce7c SHA512 85ab34b34cb1b3e1cfeeefed6618ca5cf7c66f26a1f5fe211b079a65694259fc2272abc6fe2e74d008e680d67f057288a704a87558e65e015554517fb99ba89d
-EBUILD smsclient-2.0.9a-r1.ebuild 1353 BLAKE2B dd6d7d5271f867c6fa7c10eafb3df78f4ae64b627be5e42bebf5a3778c436b13b26a280c072c3c3c439b061ef34f44dd3a64bc7d158a0dd26f4cb0aa7235c9fb SHA512 07a006014449b2b895f05bb1c748945d6d23a58a75f3eed1d5bdedb5d3f5d0429c1afbc78a57d9d8466c9fa83383cdb8007c2e66550b7e2fad4da29444de02e4
-MISC metadata.xml 318 BLAKE2B 940df32013c737c9111fe0336d2aba0e5a2fbb6df515a30799a5496feebc25cb1339167c48cb69af4c5521749b608e69671fe901667910583e129d47883077ab SHA512 bad4778937d1a9e0b1b6e4d2dc75f34a15c91ab6a5a865fa823335349127e81a93f874e55f5961bc0e77ac4744105293326128aaafe0360ed11279f5ed856348
diff --git a/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch b/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch
deleted file mode 100644
index b38b1309c339..000000000000
--- a/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Nur smsclient-2.0.9a.orig/config/Makefile.config.linux smsclient-2.0.9a/config/Makefile.config.linux
---- smsclient-2.0.9a.orig/config/Makefile.config.linux	2006-02-25 12:52:12.203797250 +0200
-+++ smsclient-2.0.9a/config/Makefile.config.linux	2006-02-25 12:52:38.837461750 +0200
-@@ -39,7 +39,7 @@
- PLATFORM = -DLINUX
- CC       = gcc
- MAKE     = make
--CFLAGS   = -O2 -g -I. -Wall -pedantic -fsigned-char $(PLATFORM)
-+CFLAGS   += -I. -Wall -pedantic -fsigned-char $(PLATFORM)
- XTRALIBS = 
- 
- # --------------------------------------------------------------------
-@@ -59,7 +59,7 @@
- MLOCALSMSRC   = .sms_addressbook
- MGLOBALSMSRC  = $(ETCPREFIX)/etc/smsclient/sms_addressbook
- MSERVICEDIR   = $(ETCPREFIX)/etc/smsclient
--MLIBDIR	      = $(PREFIX)/usr/lib/smsclient
-+MLIBDIR	      = $(PREFIX)/usr/share/smsclient
- MLOGFILE      = $(LOGDIR)/smsclient.log
- MSNPPDLOGFILE = $(LOGDIR)/smsclient.snppdlog
- MSMSDLOGFILE  = $(LOGDIR)/smsclient.smsdlog
-@@ -80,10 +80,10 @@
- 
- # --------------------------------------------------------------------
- 
--BINDIR  = $(DESTDIR)/usr/bin
--ETCDIR  = $(DESTDIR)/etc
--LIBDIR	= $(DESTDIR)/usr/lib
--MANDIR  = $(DESTDIR)/usr/share/man
-+BINDIR  = /usr/bin
-+ETCDIR  = /etc
-+LIBDIR	= /usr/lib
-+MANDIR  = /usr/share/man
- MANEXT  = 1
- INSTALL = /usr/bin/install
- RM      = /bin/rm -f
-diff -Nur smsclient-2.0.9a.orig/sms/Makefile smsclient-2.0.9a/sms/Makefile
---- smsclient-2.0.9a.orig/sms/Makefile	2006-02-25 12:52:12.203797250 +0200
-+++ smsclient-2.0.9a/sms/Makefile	2006-02-25 12:49:49.166858000 +0200
-@@ -34,28 +34,26 @@
- all:
- 
- install: 
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MLIBDIR)/services
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
-+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MLIBDIR)/services
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
-+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
- 
- 	( cd services ;\
- 	  for service in * ; do \
- 		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 $$service $(DESTDIR)$(MLIBDIR)/services; \
--		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services/$$service ; \
--		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors/$$service ; \
- 	  done )
- 
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
-+	$(INSTALL) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
-+	$(INSTALL) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
-+	$(INSTALL) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
-+	$(INSTALL) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
-+	$(INSTALL) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
-+	$(INSTALL) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
- 	
- uninstall:
- 	$(RM) $(DESTDIR)$(MLIBDIR)/services/*
-diff -Nur smsclient-2.0.9a.orig/sms/sms_config smsclient-2.0.9a/sms/sms_config
---- smsclient-2.0.9a.orig/sms/sms_config	2006-02-25 12:52:12.203797250 +0200
-+++ smsclient-2.0.9a/sms/sms_config	2006-02-25 12:49:49.166858000 +0200
-@@ -9,7 +9,7 @@
- 
- 	SMS_lock_action	     = "BLOCK"
- 	SMS_lock_retry_delay = 5000000
--	SMS_lockfile         = "/var/lock/smslock"
-+	SMS_lockfile         = "/var/lock/sms/client.lock"
- 
- 	# SMS_lockfile        = "/var/opt/sms/smslock"	# UNIXWARE
- }
-diff -Nur smsclient-2.0.9a.orig/src/client/Makefile smsclient-2.0.9a/src/client/Makefile
---- smsclient-2.0.9a.orig/src/client/Makefile	2006-02-25 12:52:12.203797250 +0200
-+++ smsclient-2.0.9a/src/client/Makefile	2006-02-25 12:49:49.166858000 +0200
-@@ -35,9 +35,9 @@
- all: ../../bin/sms_client ../../bin/sms_address 
- 
- install: ../../bin/sms_client ../../bin/sms_address
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(BINDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_client $(BINDIR)
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_address $(BINDIR)
-+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)/$(BINDIR)
-+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_client $(DESTDIR)/$(BINDIR)
-+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_address $(DESTDIR)/$(BINDIR)
- 
- uninstall:
- 	$(RM) $(BINDIR)/sms_client
-diff -Nur smsclient-2.0.9a.orig/src/logfile/Makefile smsclient-2.0.9a/src/logfile/Makefile
---- smsclient-2.0.9a.orig/src/logfile/Makefile	2006-02-25 12:52:12.203797250 +0200
-+++ smsclient-2.0.9a/src/logfile/Makefile	2006-02-25 12:49:49.166858000 +0200
-@@ -34,7 +34,7 @@
- all: logfile.o
- 
- install:
--	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
-+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
- 
- clean:
- 	$(RM) *.o
diff --git a/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch b/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch
deleted file mode 100644
index f7339d71cbc5..000000000000
--- a/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Nru smsclient-2.0.9a.orig/Changelog smsclient-2.0.9a/Changelog
---- smsclient-2.0.9a.orig/Changelog	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/Changelog	2007-02-03 08:43:12.000000000 +0200
-@@ -1,3 +1,7 @@
-+2007-02-02 12:00  Andreas Bollhalder <bolle@geodb.org>
-+
-+	* Added SMS_sender_number to UCP driver
-+
- 2002-03-26 14:00  Koenraad Heijlen <vipie@ulyssis.org>
- 	
- 	RELEASED as 2.0.9a
-diff -Nru smsclient-2.0.9a.orig/sms/services/d2 smsclient-2.0.9a/sms/services/d2
---- smsclient-2.0.9a.orig/sms/services/d2	2002-03-07 00:04:51.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/d2	2007-02-03 08:44:55.000000000 +0200
-@@ -14,6 +14,12 @@
- 	SMS_centre_number = "01722278020"  # D2 SMSC Number
- 
- 	# +49 must be added for dialing from outside germany
-+
-+    # ------------------------------------------------------------
-+    # Your sender number.
-+    # ------------------------------------------------------------
-+
-+    # SMS_sender_number = "1234567890"
- }
- 
- # --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/sms/services/kpntext smsclient-2.0.9a/sms/services/kpntext
---- smsclient-2.0.9a.orig/sms/services/kpntext	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/kpntext	2007-02-03 08:43:12.000000000 +0200
-@@ -16,6 +16,12 @@
- 
-         SMS_centre_number = "0665181802"  # PTT/KPN Telcom service
-                                           # centre number
-+
-+        # ------------------------------------------------------------
-+        # Your sender number.
-+        # ------------------------------------------------------------
-+
-+        # SMS_sender_number = "1234567890"
- }
- 
- # --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/sms/services/kpnucp smsclient-2.0.9a/sms/services/kpnucp
---- smsclient-2.0.9a.orig/sms/services/kpnucp	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/kpnucp	2007-02-03 08:43:12.000000000 +0200
-@@ -16,6 +16,12 @@
- 
-         SMS_centre_number = "0653141414"  # PTT/KPN Telcom service
-                                           # centre number
-+
-+        # ------------------------------------------------------------
-+        # Your sender number.
-+        # ------------------------------------------------------------
-+
-+        # SMS_sender_number = "1234567890"
- }
- 
- # --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/sms/services/swisscom smsclient-2.0.9a/sms/services/swisscom
---- smsclient-2.0.9a.orig/sms/services/swisscom	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/swisscom	2007-02-03 08:43:12.000000000 +0200
-@@ -13,6 +13,12 @@
- 
- 	  SMS_centre_number = "0794998990"  # SWISSCOM SMSC Number (Analog V.34)
- 	# SMS_centre_number = "0900900941"  # SWISSCOM SMSC Number (ISDN V.120)
-+
-+    # ------------------------------------------------------------
-+    # Your sender number.
-+    # ------------------------------------------------------------
-+
-+    # SMS_sender_number = "1234567890"
- }
- 
- # --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/sms/services/telenor smsclient-2.0.9a/sms/services/telenor
---- smsclient-2.0.9a.orig/sms/services/telenor	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/telenor	2007-02-03 08:43:12.000000000 +0200
-@@ -13,6 +13,12 @@
- 
- 	SMS_centre_number =  "90002198"  # TELENOR SMSC Number
- 	                                 # From Inside Norway
-+
-+    # ------------------------------------------------------------
-+    # Your sender number.
-+    # ------------------------------------------------------------
-+
-+    # SMS_sender_number = "1234567890"
- }
- 
- # --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/sms/services/telia smsclient-2.0.9a/sms/services/telia
---- smsclient-2.0.9a.orig/sms/services/telia	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/sms/services/telia	2007-02-03 08:43:12.000000000 +0200
-@@ -16,6 +16,12 @@
- 	# ------------------------------------------------------------
- 	# +46 must be added for dialing from outside Sweden
- 	# ------------------------------------------------------------
-+
-+    # ------------------------------------------------------------
-+    # Your sender number.
-+    # ------------------------------------------------------------
-+
-+    # SMS_sender_number = "1234567890"
- }
- 
- #  --------------------------------------------------------------------
-diff -Nru smsclient-2.0.9a.orig/src/driver/ucp.c smsclient-2.0.9a/src/driver/ucp.c
---- smsclient-2.0.9a.orig/src/driver/ucp.c	2007-02-03 08:43:40.000000000 +0200
-+++ smsclient-2.0.9a/src/driver/ucp.c	2007-02-03 08:43:12.000000000 +0200
-@@ -184,6 +184,8 @@
-         /* Place any extended driver    */
-         /* variables here               */
- 
-+        char *szSenderNumber;
-+
- } driver_env;
- 
- /* -------------------------------------------------------------------- */
-@@ -197,6 +199,7 @@
-     { RESOURCE_NUMERIC, "SMS_timeout",              0, 0, NULL, 0,  NULL,       10,   &(driver_env.def.timeout)             },
-     { RESOURCE_NUMERIC, "SMS_write_timeout",        0, 0, NULL, 0,  NULL,       10,   &(driver_env.def.write_timeout)       },
-     { RESOURCE_NUMERIC, "SMS_max_deliver",          0, 0, NULL, 0,  NULL,       1,    &(driver_env.def.max_deliver)         },
-+    { RESOURCE_STRING,  "SMS_sender_number",        0, 1, NULL, 0,    "",       0,    &(driver_env.szSenderNumber)          },
-     { RESOURCE_NULL,     NULL,                      0, 1, NULL, 0,  NULL,       0,    NULL                                  }
-   };
- 
-@@ -248,9 +251,9 @@
- 
- 
-                             /* data:  AdC/OAdc/OAC/MT/..   */
--                            /*    ->  recipient///3/...    */
-+                            /*    ->  recipient/sender//3/...    */
- 
--   nc = sprintf(msgData, "%s///%1.1d/", msisdn, msgType);
-+   nc = sprintf(msgData, "%s/%s//%1.1d/", msisdn, driver_env.szSenderNumber, msgType);
- 
-                             /* ... additional parameters depending on MT */
-                             /* For MT=3 (alphanumeric) this is hex coded */
diff --git a/app-mobilephone/smsclient/metadata.xml b/app-mobilephone/smsclient/metadata.xml
deleted file mode 100644
index 4ac469947f7d..000000000000
--- a/app-mobilephone/smsclient/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>SMS Client is a UNIX command line based utility which allows you to send SMS messages to mobile phones and pagers.</longdescription>
-</pkgmetadata>
diff --git a/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild b/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
deleted file mode 100644
index c7dd3ea6f2b6..000000000000
--- a/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="Utility to send SMS messages to mobile phones and pagers"
-HOMEPAGE="http://www.smsclient.org"
-SRC_URI="http://www.smsclient.org/download/${PN}-${PV%?}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_setup() {
-	enewgroup dialout
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-sender.patch"
-	sed -i -e \
-		"s:\$(CFLAGS) -o:\$(CFLAGS) \$(LDFLAGS) -o:g" \
-		src/client/Makefile
-}
-
-src_configure() {
-	rm .configured && ./configure
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR) rc" \
-		RANLIB="$(tc-getRANLIB)" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dosym sms_client /usr/bin/smsclient
-	dosym sms_address /usr/bin/smsaddress
-
-	diropts -g dialout -m 0770
-	keepdir /var/lock/sms
-	diropts
-
-	doman docs/sms_client.1
-	dodoc AUTHORS Changelog* FAQ README* TODO docs/sms_protocol
-}
-
-pkg_config() {
-	local MY_LOGFILE="${ROOT}/var/log/smsclient.log"
-	[ -f "${MY_LOGFILE}" ] || touch "${MY_LOGFILE}"
-	fowners :dialout "${MY_LOGFILE}"
-	fperms g+rwx,o-rwx "${MY_LOGFILE}"
-}
-
-pkg_postinst() {
-	einfo "If you run sms_client as normal user, make sure you are member of dialout group."
-}
diff --git a/app-mobilephone/vmoconv/Manifest b/app-mobilephone/vmoconv/Manifest
index 4172cb631bb6..c47459c63bdf 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -2,5 +2,5 @@ AUX vmoconv-1.0-external-libgsm.patch 863 BLAKE2B 3468d81dfcb51ca6da6b9dba74f3a8
 AUX vmoconv-1.0-flags.patch 683 BLAKE2B 9320d396eaf46480c7473fa52934c8786ca31dac2d638a8463a8e5350d5006f73938e4085622034ec0abc1d866d7ceefee59b17f3e8cfe987fe1fd6ad550be67 SHA512 431e10787bed24cc775a43f44c60a64610f03c25956efb8892d7117476e01261ae06c644a1ac9ada6f9dc94ad5a38745beb8fb2dbe3dfe8546ecfa51902f0770
 AUX vmoconv-1.0-glibc28.patch 876 BLAKE2B 5d58b8ddda99b268748bdcea1004dfc4ddb48547ea502fd5a3f98683338230f23a15584d854bfa2147e702be06a22621a03767c9563522cf6c350155c7e13cfd SHA512 14477a9c13fabae162dfe8fc4b701019fb52e387198c70542275b1e9562a683532f8b88a96a9b8c7d9aea8e5f27224baa27046a04ce164adcd2d260f0a22e011
 DIST vmoconv-1.0.tar.gz 315028 BLAKE2B c31d2f4f5c45511b52a80b829b9c632519eccaf6aeb3bb74deef8ff9cdf0aea244e52c82751f8d23865e5250004d33dfc2c0b101fd03ce7cf0c08f94c3a79ce2 SHA512 c4bd65f2c034317e43736198eaea6a3cfbbc6be015dc1ac5efa51633c2779bf5af87ea037084173b377a7521538e4a235f264b5f09fedcdaf7f4a815289a7ec2
-EBUILD vmoconv-1.0-r1.ebuild 752 BLAKE2B 22f7972256f0bf71c839357c95e08e980fe2e319d1ab16170466660d1e88e9553d6bf165db90edfee75979fd6e5b7a5c29c942b950515b1fbd1100932e880d2a SHA512 e8e28d1de9e9c58fcf80313bbf9feb8e0fd23981574b512f268cbcc9792cff861c09cbdfd86745e75b9fbc066c6aecd9477889ea71f3dc719d2370a97835ac91
+EBUILD vmoconv-1.0-r1.ebuild 749 BLAKE2B 4d937fc8d3069fd9cfbc836e2d6a1dd9250fdfb8addcfc3d77eab93d84de61c58754f8d91d1454cdf8d4553ed84057a2b3a4c7ddde6da57a1cb0196b12a8f701 SHA512 d07e19ad9a24fa004cc66c70277103f5582b01dfc78f42a6ea01be5d4c0fbdc6c243ef98577110c1bb282e377227f23119c8d7963f9b33991f6236c5000b347d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
index d7f1da29f215..6a145ab58049 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav"
 HOMEPAGE="http://triq.net/obex/"