gentoo resync : 03.11.2019

10 files changed, 73 insertions, 22 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 748425318680..bcbc06775c2a 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/devio/Manifest b/sys-block/devio/Manifest
index 344ffe6793cd..f4792f796065 100644
--- a/sys-block/devio/Manifest
+++ b/sys-block/devio/Manifest
@@ -1,3 +1,3 @@
 DIST devio-1.2.tar.gz 88650 BLAKE2B f6ebc16a578ac782cc267731fb93ce3c62cfa0df19a6ebe0c004d0a3e161b875156cbe7dd5572494ac66e901b27fc90d1c0fc167b12dcbc68774b481c2665f05 SHA512 7620a5144f13fb66252e9f689df2a790d3868877184d0a013ada6270b6c3fc4a87f20ed283f2a017285d0219418f87c6425b481f397f46f49fc1ebc374aa791f
-EBUILD devio-1.2.ebuild 434 BLAKE2B 0009216674afb304eb95bf7e8fdbe75630cec89c4d25fc267f76db0fda3db93d013b251768d7a5c132292ab7afafecffcd32f18a11ec39deffccf84b7fe9688b SHA512 426a104ef3c7228b7a4b9f49b48ad1a000729b92147a87418041051ba593826e119d0e74662e5f6aea9be8319a42694ecb3ed03125678909d510e0854dd79c66
+EBUILD devio-1.2.ebuild 320 BLAKE2B 47976970321fe813832941927d4999e471ddc9a3cc26a9bcb29b5514b81362213e33cfba72f2a88f7c0f244b27113cc1a72fe970fb17958da504d05cee59eca9 SHA512 0b3a5b4ea4d8bbf61915b4e42d2365ce54c11eb7182876b8d4de7d6ffeb2e2653a92837fe55467f228efc793b405543c58dde7f033007323d7bb52d3455eff07
 MISC metadata.xml 326 BLAKE2B 4ac2f4bedc3e70746331803b1e6e39644ec82be1c8336dd2d6fefa756f863dec8d82b74e3322ea4d6043a1bffac709cf3068609cabf745bcc92e87f97c83b938 SHA512 4c51163aac18aac80ad23e4f5856a6747ae0e8681a4db5ea12d2b34a455e20f0cdb804882600632f6eeacb46dc441e90c79ec3a2cb54b39ac87cc420e56eea6b
diff --git a/sys-block/devio/devio-1.2.ebuild b/sys-block/devio/devio-1.2.ebuild
index 1f8e8b52a58d..e726f3424a48 100644
--- a/sys-block/devio/devio-1.2.ebuild
+++ b/sys-block/devio/devio-1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="correctly read (or write) a region of a block device"
 HOMEPAGE="http://devio.sourceforge.net/"
@@ -10,11 +10,3 @@ SRC_URI="mirror://sourceforge/devio/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 arm x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 99e01b385cb9..c9a94ba71114 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,7 +1,9 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
 AUX di-4.47-no_echo-n.patch 658 BLAKE2B cfd3df4c24333dd168ceef279c7cfcad2194e7fd7b3f1b2722cc9e54ae51abf963971666458455117ae990613ffc920541e3db4d603948c1a2dcdbd9f9912331 SHA512 2184eb38daa2eb67d3f61d337ee1d95188f66a1e63838916305aa72ef16c50e93147a5cee7388785bf96088479acc4ddddf7f2a1a4bb6e0c2de47abca4bbb071
 DIST di-4.47.1.tar.gz 221051 BLAKE2B d1012ab500f808363ce445b6c0bb80f3e91f85560faff1d31bbed4f3d44f894dadb5d59d417a16335fce45659861b483dc82b53a59718ee1c8a1b6b21265d4d9 SHA512 3312634617b5614d36d7ce9c0725a4d03e55e694b9588db88bb1c2bfab05373516cadbab8a23db3328f4944b99ae07dacabb98d56cc909f0502d58ccc6f5301c
+DIST di-4.47.2.tar.gz 221092 BLAKE2B eb5d0471cf1594160e552a770eb73912fd701e1904665b8201b9813f2b630f201f9a0af781df71e4ca754800c31d6d35f79009bcb041e2ffdcbaaebc506651cb SHA512 1468d42fe7cb6041d763f66e39bc9834f45d80e754a043dd5dc3db44aead86ffaff59e8de5b6e7d19ecc5c76cc2a280598232b550067665f48a370bf4e112fd7
 DIST di-4.47.tar.gz 250479 BLAKE2B 64156867ab31c448dfc428331a54900a54df4689f851f86f6b8e33403b2f0b785aadd8140576bc75f03ed675cf31fffe15d577b477e5d07a4e678bf625f46f49 SHA512 6bb004a9230dd59174c59b823a80ccc9b237a08947ac15502a805cf95e8803c05ac4e8c2282164130db2e23e8f521bf16c30f2c0996c96a9612d139d66df89f5
 EBUILD di-4.47.1.ebuild 700 BLAKE2B 0c6ab6ca5429781cad6c6b62a80de4302b463158caf34b2650f909cabb78e023ddc1080b28fda86a38f9416046926e4d4bfda4b3688c12a738ca91b7e8ec1f1a SHA512 f267a60c98c7a034da5c33f9a43de42ba8eb6cb51a8c79c40287eb441a8fbf5396a833742e24c3c1ce3fc54aa862e226d6278aecd9b829d8c152a62b220a31d5
+EBUILD di-4.47.2.ebuild 700 BLAKE2B 0c6ab6ca5429781cad6c6b62a80de4302b463158caf34b2650f909cabb78e023ddc1080b28fda86a38f9416046926e4d4bfda4b3688c12a738ca91b7e8ec1f1a SHA512 f267a60c98c7a034da5c33f9a43de42ba8eb6cb51a8c79c40287eb441a8fbf5396a833742e24c3c1ce3fc54aa862e226d6278aecd9b829d8c152a62b220a31d5
 EBUILD di-4.47.ebuild 743 BLAKE2B 8a644ab2b1abcdc310880db519d0a0c1f97e15e762f19187af4924944926bd975d2900795a82374c55bed75562342f86d32393b2a5bffd9dcc74360efa9df56e SHA512 5fe91ae237a483bfae9ab1a91bb0a60fdfa3a3825e194d7f474641cca8b4534af6fa9c4cab360832b556d9274da7eb426682e1e13ba66d9c88b3caab2deceda9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.47.2.ebuild b/sys-block/di/di-4.47.2.ebuild
new file mode 100644
index 000000000000..64adf3b98685
--- /dev/null
+++ b/sys-block/di/di-4.47.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Disk Information Utility"
+HOMEPAGE="https://gentoo.com/di/"
+SRC_URI="https://gentoo.com/di/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RESTRICT="test" #405205, #405471
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.33-build.patch
+)
+
+src_configure() {
+	emake checkbuild
+	emake -C C config.h
+}
+
+src_compile() {
+	emake prefix=/usr CC="$(tc-getCC)" NLS=$(usex nls T F)
+}
+
+src_install() {
+	emake install prefix="${D}/usr"
+	# default symlink is broken
+	dosym di /usr/bin/mi
+	dodoc README
+}
diff --git a/sys-block/mtx/Manifest b/sys-block/mtx/Manifest
index 42b34cea8616..3d9e16ed1ee3 100644
--- a/sys-block/mtx/Manifest
+++ b/sys-block/mtx/Manifest
@@ -1,3 +1,4 @@
+AUX mtx-1.3.12-fix-buildsystem.patch 574 BLAKE2B 13a6b5005ee59b2ac0dd0e6b7f6e3fd3569e7d364ab83e0b861b41f7c68583220ea269d01667504f02cbd0cb3ebd5dc8eb6ae9296ea8e45668f8f8ca65d4a685 SHA512 61a7e259ea97fa24399db95f503dabde9cfa5ecbdc479ab681bd2c64a94a18bbed6368b536f5388c3d00d68043413962f268faa2893006f7481ee0e537a39e8b
 DIST mtx-1.3.12.tar.gz 235214 BLAKE2B af5d0dd35ecf4fca75af700c4eddd48775187c6015c00048204774a87d2905a016a8c36fcfce07535d093a3f16b1a31b9e455e3e3e605cc0a7db49bd76da088d SHA512 d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028
-EBUILD mtx-1.3.12.ebuild 477 BLAKE2B 6575f347839d4da3ce922940bf479fe4083717cc737b7344fb56118560365a7dd3ef9a7ef2c0d72d59d91277f3ea18190a5953241998f2e2660070b4cc636085 SHA512 43ba1155d7707586727b02493e1f5c1312330bd8bfa099825916b970d1bd11c95bd6f54477eb8f0f2a86379a044c09429bcc38a80c35e71bfdf5161111517641
+EBUILD mtx-1.3.12.ebuild 492 BLAKE2B 07c17df7c02ef19dfe8587af46d90ad552b2dfaa68ae630721cd71b0db96e764be402ef7f28dcfc3da946586c9172edadb83b99fa5171c295436dba9dc2670f8 SHA512 8bb3489238fbb66157c567a8e2d7c7a22de1306296f865c1d67c619a815500e0508467c2d5bbd3fe645db9046e0a0103efc636deb50fb1bf47a1f8c108eed246
 MISC metadata.xml 323 BLAKE2B d0c394421bd8dca2c1595f979dae3db3dfd8f08d7471cba729a9e7dc6503cc3f8053d2c6fde8293c2ab6c616285d753a772fe5fe9ecd8a2df8659f589468c25b SHA512 2988c2031af8998f902e82b0e5a703a71030d079dfa28f6f3c433e7fa6d8797b1bf31c8bdfcb7057a78f33eaaa390f0bc9b60d1c5c8d675ac3d21af8c880425f
diff --git a/sys-block/mtx/files/mtx-1.3.12-fix-buildsystem.patch b/sys-block/mtx/files/mtx-1.3.12-fix-buildsystem.patch
new file mode 100644
index 000000000000..6627bfac0504
--- /dev/null
+++ b/sys-block/mtx/files/mtx-1.3.12-fix-buildsystem.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -109,13 +109,13 @@
+ dbgs: $(DBGS)
+ 
+ install: $(BINS)
+-	$(INSTALL_DIR) $(sbindir)
++	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
+ 	for file in $(BINS); do \
+-	$(INSTALL_BIN) "$$file" $(sbindir) ; \
++	$(INSTALL_BIN) "$$file" $(DESTDIR)$(sbindir) ; \
+ 	done	
+-	$(INSTALL_DIR) $(mandir) $(mandir)/man1
++	$(INSTALL_DIR) $(mandir) $(DESTDIR)$(mandir)/man1
+ 	for file in mtx.1 tapeinfo.1 scsitape.1 scsieject.1 loaderinfo.1 ; do \
+-	$(INSTALL_DOC) "$$file"  $(mandir)/man1 ; \
++	$(INSTALL_DOC) "$$file"  $(DESTDIR)$(mandir)/man1 ; \
+ 	done
+ 
+ clean:
diff --git a/sys-block/mtx/mtx-1.3.12.ebuild b/sys-block/mtx/mtx-1.3.12.ebuild
index 0053c550bc54..593c08791e97 100644
--- a/sys-block/mtx/mtx-1.3.12.ebuild
+++ b/sys-block/mtx/mtx-1.3.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Utilities for controlling SCSI media changers and tape drives"
 HOMEPAGE="https://sourceforge.net/projects/mtx/"
@@ -10,10 +10,8 @@ SRC_URI="mirror://sourceforge/mtx/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
 
-src_install () {
-	einstall || die
-	dodoc CHANGES COMPATABILITY FAQ README TODO
-	dohtml mtxl.README.html
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
+
+DOCS=( CHANGES COMPATABILITY FAQ README TODO )
+HTML_DOCS=( mtxl.README.html )
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 753209f843e1..474d21c576de 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -2,7 +2,7 @@ DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a68
 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16
 DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc
 EBUILD nbd-3.18.ebuild 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e
-EBUILD nbd-3.19.ebuild 1295 BLAKE2B 3d8baefc09ef790cdbfe32e839dd6b1b523c6ccaa091cf4ddca871167f467cda95794da46a9c96346ada153ee81fc6a10dbfdd9bca500575f4b77ea4d6b323ed SHA512 12c9dd3f32858048f7827b99b86bf8bba9e8ed43d0c1650f4ac188921bb34ecde4995b29d72b14e7f43f9407efa26558e0c85fc5e4c50d639ed37d82cd267666
+EBUILD nbd-3.19.ebuild 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e
 EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc
 MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
diff --git a/sys-block/nbd/nbd-3.19.ebuild b/sys-block/nbd/nbd-3.19.ebuild
index d7fd329715ed..927bb90f26d6 100644
--- a/sys-block/nbd/nbd-3.19.ebuild
+++ b/sys-block/nbd/nbd-3.19.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
 else
 	SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"