gentoo resync : 15.01.2020

3 files changed, 9 insertions, 45 deletions

diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 49dbab9ba596..be44d2f8e75a 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,6 +1,5 @@
-AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
-DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
-EBUILD udftools-2.0-r2.ebuild 580 BLAKE2B daa7d7fbca6685da0cc0d0690a9e8f3739ce44e27d463e97a532c7e7d6af73ec8f6799f734e0a374ad8e6cec6bee5fe4c2da5566c537c270ccdaf4484614c558 SHA512 1c86fdf192726f58a3b61514c1f8f88de7d15e2f7736e97c949b8c47d18a5f6a04471ee5b94c10e5e340b5283372ab386de793370425b8b60c1988b073b37f42
+DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
+EBUILD udftools-2.2.ebuild 581 BLAKE2B 5661c7835873585f282d2cbf4e1bbc7e549b5a20e3e83b0d2107980c458ce418567ed85044c56d4a64a5c45c9b8bd0fe233b14c01b8f4dfaa6b8931a6ec5f9fa SHA512 17e539835787fa78119e67d5a39f869bd09b959c6276764d92ca5b179f4a8522ec94029bdf92e9e432cec8d1be6db6ce8d871622ad8eb426018749ad5992d3a9
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/udftools-2.0-sysmacros.patch b/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
deleted file mode 100644
index 9df9de6d3fd9..000000000000
--- a/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cca194f17fe2892c929acab2f1d5016ad38aa305 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 2 Jan 2018 15:10:34 +0100
-Subject: [PATCH] Include <sys/sysmacros.h> to prevent build breakage with
- >=glibc-2.25
-
-libtool: link: x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2
--pipe -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -o
-mkudffs main.o mkudffs.o defaults.o file.o options.o
-../libudffs/.libs/libudffs.a
-main.o: In function `is_whole_disk':
-main.c:(.text+0x2ce): undefined reference to `major'
-main.c:(.text+0x2dd): undefined reference to `minor'
-main.o: In function `main':
-main.c:(.text.startup+0x72f): undefined reference to `minor'
-main.c:(.text.startup+0x741): undefined reference to `major'
-collect2: error: ld returned 1 exit status
-make[1]: *** [Makefile:378: mkudffs] Error 1
----
- mkudffs/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mkudffs/main.c b/mkudffs/main.c
-index 066afac..3e306ac 100644
---- a/mkudffs/main.c
-+++ b/mkudffs/main.c
-@@ -43,6 +43,7 @@
- #include <sys/ioctl.h>
- #include <linux/fs.h>
- #include <linux/fd.h>
-+#include <sys/sysmacros.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
--- 
-2.16.0.rc0
-
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
index ac92ff6d84fd..03a562512736 100644
--- a/sys-fs/udftools/udftools-2.0-r2.ebuild
+++ b/sys-fs/udftools/udftools-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -11,10 +11,12 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
+BDEPEND="
+	virtual/pkgconfig
+	virtual/udev
+"