gentoo resync : 20.10.2021

7 files changed, 32 insertions, 24 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index c4b9a53bd047..3049394ada49 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/dfu-util/Manifest b/app-mobilephone/dfu-util/Manifest
index 11790ad988e7..a8c9b6605a99 100644
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@@ -1,6 +1,6 @@
 DIST dfu-util-0.11.tar.gz 152462 BLAKE2B 3734698dd62de8a1c781f7631ae17ee9755241ce4d614b028fe6d6c3a117f3a301c174dcadf52252d55b08cfd75298c27a588e880837317ff73c32ab8863ccdd SHA512 fc5304a483ac10e35bf1b9304becdeb407b2e44d8ac51474d2fa17877e6cf71b0126f7e12ebb331d75e7adeb9c173ff5cf083a06ded5847dbe477534cf26a553
 DIST dfu-util-0.9.tar.gz 138397 BLAKE2B e3a9db3276204d25fbcdd7d50caacd28a8e043d2781b5f942cd0df343d046870003abeaa1005a2774d03c4198ce96fa2124040987069c5f444e36e4f365a5e0e SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952
-EBUILD dfu-util-0.11.ebuild 617 BLAKE2B 47e3d3d28b1e22d26ea01b2ffc2b07987940877038463607b316a7f2d30e2bd9896f5df06bac07672f4d3489d0511bc4c8690702f19a81d4126a5b88795e3641 SHA512 7b992b0c8b4a73eb8ca435010564c937439ff37607b30d8446c95cc9d3adfa2200325a5c337ce42b43b80074bf8161e62de1a95c5b8033f86cfb019879651dcd
+EBUILD dfu-util-0.11.ebuild 624 BLAKE2B c17bfc7d7ae1583239e76ed7e710e23771bcd97d9a12d8e83c0fc197572b2bf3e37056568b1e33765508dcedd58e2227aa2a6c88d3a6954f771b1a878cc186cb SHA512 433025d5702855deb3478d8d794197bea5af5b161bde8e104570d2d38d5fc25ee6de5531f95e987327f1ad4d9af009ef4a32adb1523b3f13e09a29cd5d11f3dd
 EBUILD dfu-util-0.9.ebuild 611 BLAKE2B 1684c27777969c7aefefa831a4f93b1e58bee27042d2f57d026aaa3cc8a71597211fad44ee5b7763c22ba307bb6fac6b89318ccaf94998673eccc2f9e536774b SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f
 EBUILD dfu-util-9999.ebuild 617 BLAKE2B 47e3d3d28b1e22d26ea01b2ffc2b07987940877038463607b316a7f2d30e2bd9896f5df06bac07672f4d3489d0511bc4c8690702f19a81d4126a5b88795e3641 SHA512 7b992b0c8b4a73eb8ca435010564c937439ff37607b30d8446c95cc9d3adfa2200325a5c337ce42b43b80074bf8161e62de1a95c5b8033f86cfb019879651dcd
 MISC metadata.xml 330 BLAKE2B 8dd6ce23111123463d3a9585b1fdff4cdf8a7670803dc36c007daa02796e764a29eff3b420dba2651e8812ae39d7df0a7de6f20a10ad5447c0b799074346fb42 SHA512 fb9646c59340854d13fb4f82e13f467a34090eb629937cf846c9db1a6ed2095d9bf6456741e6ba3460709d95f9a36bc6bdbc6063492eb5222330190b52c961df
diff --git a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
index 0f4c6cd5a619..b6dbaf8f4aa0 100644
--- a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
diff --git a/app-mobilephone/vmoconv/Manifest b/app-mobilephone/vmoconv/Manifest
index c479eb37379e..fc1b3b649253 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -1,6 +1,6 @@
 AUX vmoconv-1.0-external-libgsm.patch 863 BLAKE2B 3468d81dfcb51ca6da6b9dba74f3a8536955686456a4e055823184cad06f7d28908338c0bc61f109cd48594d89718fc2e3d0fb6818b4ab15d95d31898a496e34 SHA512 d02dc343c59ef15d21b08478d3e9f6393f95c59ecf340afb09945d4897481e9c859f83752b6d79e1ae03563b9d9deb129a0a1db5e0acd69ed1a815b5be408058
-AUX vmoconv-1.0-flags.patch 683 BLAKE2B 9320d396eaf46480c7473fa52934c8786ca31dac2d638a8463a8e5350d5006f73938e4085622034ec0abc1d866d7ceefee59b17f3e8cfe987fe1fd6ad550be67 SHA512 431e10787bed24cc775a43f44c60a64610f03c25956efb8892d7117476e01261ae06c644a1ac9ada6f9dc94ad5a38745beb8fb2dbe3dfe8546ecfa51902f0770
-AUX vmoconv-1.0-glibc28.patch 876 BLAKE2B 5d58b8ddda99b268748bdcea1004dfc4ddb48547ea502fd5a3f98683338230f23a15584d854bfa2147e702be06a22621a03767c9563522cf6c350155c7e13cfd SHA512 14477a9c13fabae162dfe8fc4b701019fb52e387198c70542275b1e9562a683532f8b88a96a9b8c7d9aea8e5f27224baa27046a04ce164adcd2d260f0a22e011
+AUX vmoconv-1.0-flags.patch 777 BLAKE2B 93720ca0a8cbd8fe29025632034d2e125a8c5d076a8ea6ecdf7d07b3de03729df6540a27a1412c390232fdb512b88a8937d2817a0e6b8173dc2432c12b88e492 SHA512 928d8b4f5722fe030f1b4b588c8117388a56a6ae44aead185c27ca55d6082283e01e33840363f54bfcf494d71a200567eba3c1fbb22c6b7abed9657ebe94343f
+AUX vmoconv-1.0-glibc28.patch 546 BLAKE2B 1f0d7913e64c8486ed277cf99279bdbe820b6eb437f39705ace632ea1b112404c1cb11d49d56bf25ab6ed912daebb4156fd3415d0ec34521eabcd69f1cc8a420 SHA512 bf17a7dbe17bba0fa94b41128b7c6481781e822f30867b042b76fefb266493ff899e7f648df09f73b14e7bcd77bc4086784377ea04bad5316320d1fd3d4b61c2
 DIST vmoconv-1.0.tar.gz 315028 BLAKE2B c31d2f4f5c45511b52a80b829b9c632519eccaf6aeb3bb74deef8ff9cdf0aea244e52c82751f8d23865e5250004d33dfc2c0b101fd03ce7cf0c08f94c3a79ce2 SHA512 c4bd65f2c034317e43736198eaea6a3cfbbc6be015dc1ac5efa51633c2779bf5af87ea037084173b377a7521538e4a235f264b5f09fedcdaf7f4a815289a7ec2
-EBUILD vmoconv-1.0-r1.ebuild 749 BLAKE2B 4d937fc8d3069fd9cfbc836e2d6a1dd9250fdfb8addcfc3d77eab93d84de61c58754f8d91d1454cdf8d4553ed84057a2b3a4c7ddde6da57a1cb0196b12a8f701 SHA512 d07e19ad9a24fa004cc66c70277103f5582b01dfc78f42a6ea01be5d4c0fbdc6c243ef98577110c1bb282e377227f23119c8d7963f9b33991f6236c5000b347d
+EBUILD vmoconv-1.0-r1.ebuild 636 BLAKE2B a20002455a2c548a56cf191a214e72bd4a2705816ed81843a8e8c43c0bad27be3d24913043d647a2799820f550128c4e9033b9dcc019a16a758ab869d9ae20bf SHA512 45e8168a28c482a8a2eb9dd3306a84934d5e93b61b19620560b95a48be100c23f0a095b753fe0c3c3670ef2ad3fb3b14989a5b1543055f0213a2e8f5814a5152
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
index 031b6eefaaca..c0d145257858 100644
--- a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
@@ -1,6 +1,14 @@
-diff -Nru vmoconv-1.0.orig/configure.in vmoconv-1.0/configure.in
---- vmoconv-1.0.orig/configure.in	2004-09-26 15:17:48.000000000 +0000
-+++ vmoconv-1.0/configure.in	2009-03-03 21:32:40.000000000 +0000
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@
+ # try CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes -Werror"
+ AC_INIT(vmoconv, 1.0, zany@triq.net)
+ AM_INIT_AUTOMAKE(vmoconv, 1.0)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl AM_MAINTAINER_MODE
+ 
 @@ -26,10 +26,10 @@
      [printf(__func__)],,
      [AC_DEFINE(__func__, "", [non-C99 fake support for __func__])])
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
index ec957b40c5cd..02c000412fbf 100644
--- a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
@@ -1,6 +1,5 @@
-diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
---- vmoconv-1.0.orig/src/gsm2vmo.c	2008-06-15 12:57:07.000000000 -0400
-+++ vmoconv-1.0/src/gsm2vmo.c	2008-06-15 12:57:36.000000000 -0400
+--- a/src/gsm2vmo.c
++++ b/src/gsm2vmo.c
 @@ -27,7 +27,7 @@
   * 12 bit header and 260 bits standard GSM frame, as described
   * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
@@ -10,11 +9,10 @@ diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-diff -Naur vmoconv-1.0.orig/src/vmo2gsm.c vmoconv-1.0/src/vmo2gsm.c
---- vmoconv-1.0.orig/src/vmo2gsm.c	2008-06-15 12:57:07.000000000 -0400
-+++ vmoconv-1.0/src/vmo2gsm.c	2008-06-15 12:57:36.000000000 -0400
+--- a/src/vmo2gsm.c
++++ b/src/vmo2gsm.c
 @@ -27,7 +27,7 @@
-  * 12 bit header and 260 bits standard GSM frame, as described
+  * 12 bit header and 260 bits standart GSM frame, as described
   * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
   */
 -
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
index 6a145ab58049..0e19246d04ba 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch autotools
+inherit autotools
 
 DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav"
 HOMEPAGE="http://triq.net/obex/"
 SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 DEPEND="media-sound/gsm"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc28.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-external-libgsm.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc28.patch"
-	epatch "${FILESDIR}/${P}-flags.patch"
-	epatch "${FILESDIR}/${P}-external-libgsm.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	default
 	eautoreconf
 }
 
 src_install() {
 	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	einstalldocs
 }