gentoo resync : 30.06.2019

3 files changed, 43 insertions, 3 deletions

diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index ce9096f44e9f..0b1a921d7c16 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -2,7 +2,9 @@ AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587
 AUX di-4.46-no_echo-n.patch 7166 BLAKE2B 5e975431b01a5abf0cda04a82c28cc5127136380c9f52563221f2fa5fd2e64da6a9683e8861e2045f4daf0979df309b930fbeb0a1b8f3761f72b195b4e6b9c20 SHA512 b0de0f6925bd52b86915914c135d44c6c77688cfae2fb69bac8873e042e79dc34daa3e55b871398e55acbac91a6e70306c33b60eb2fc3cd044f12f460e5aaf5c
 AUX di-4.47-no_echo-n.patch 658 BLAKE2B cfd3df4c24333dd168ceef279c7cfcad2194e7fd7b3f1b2722cc9e54ae51abf963971666458455117ae990613ffc920541e3db4d603948c1a2dcdbd9f9912331 SHA512 2184eb38daa2eb67d3f61d337ee1d95188f66a1e63838916305aa72ef16c50e93147a5cee7388785bf96088479acc4ddddf7f2a1a4bb6e0c2de47abca4bbb071
 DIST di-4.46.tar.gz 217096 BLAKE2B 4757dec7d9c0da121d0057e8088ecb5994f60eec8de49db4a12e84a68d2ad9dc86462f01370786e0c03a792f39984aead2d838d34b4881396aacb39386635bfd SHA512 ead1172dfa9db74d6a8378f8ded460b365c0445d75d71154c67446585d63c0824f8fdc4818438b3d9c3c4795af518f1499c29762712fd62ab97e9be7e680d133
+DIST di-4.47.1.tar.gz 221051 BLAKE2B d1012ab500f808363ce445b6c0bb80f3e91f85560faff1d31bbed4f3d44f894dadb5d59d417a16335fce45659861b483dc82b53a59718ee1c8a1b6b21265d4d9 SHA512 3312634617b5614d36d7ce9c0725a4d03e55e694b9588db88bb1c2bfab05373516cadbab8a23db3328f4944b99ae07dacabb98d56cc909f0502d58ccc6f5301c
 DIST di-4.47.tar.gz 250479 BLAKE2B 64156867ab31c448dfc428331a54900a54df4689f851f86f6b8e33403b2f0b785aadd8140576bc75f03ed675cf31fffe15d577b477e5d07a4e678bf625f46f49 SHA512 6bb004a9230dd59174c59b823a80ccc9b237a08947ac15502a805cf95e8803c05ac4e8c2282164130db2e23e8f521bf16c30f2c0996c96a9612d139d66df89f5
 EBUILD di-4.46.ebuild 756 BLAKE2B 85e9a30897397f78edd92ecb6c7a1bfa278d2987b9e03a23dd1d68df5aaf6104dd8b1bcdfdf71a20ae8325f611033204565a2ea4d327b05ab7157b0ee128e379 SHA512 e6a4b158e9922c5a3bef82a59c7f69b06fc9c9a7438b4412dae15f181ac42c318ff92a300195f9c2ca38c70c83be171abd9d51b97c02486c0b38f390ab9e5919
-EBUILD di-4.47.ebuild 760 BLAKE2B 1ab5758bc90abfb6d8417fd03f8e4f4e9dd2e785332372ab1e3f55c9eb745e1e8b0bd386bc19ab0aac6a4877275446983c0fbc078ed74ca0fb409156608b2215 SHA512 b0560905b165869f87ec9140a1143f41bc5853a23d0c2af7f837aadcf6fdbed834ada37840235a4a95d104b9bbe179287606649c8b4ad97b75f140cfc879caeb
+EBUILD di-4.47.1.ebuild 710 BLAKE2B 613195ec309e0f696eab066bbd854cabd388c3b72ae462e0886afeb7cf2f2bcc6a01cb7e496e71a2662f6994067bf0c974cbf7af3ceefad3aac14284086aaea1 SHA512 409ad6ef98284cbbc884ac473dd4190065dc90416da90ec1f925cdb9f98214d223009007e275fe3e46979b9c7fe7d5ef62a460531d0149a0bd8ec42ee720111b
+EBUILD di-4.47.ebuild 755 BLAKE2B e0b64e4e3a30353f48adc6dbe476569d3eb65646f3bdcd2c710e83cdbcfab39594062a0a844b52a9a2c1527c6ac420fb54482f0a3286f4e7dd605f2e7bc3e37d SHA512 49a9ba326ca8fd087b30630f8315c53a3ef04c5e8018cb41a0a13baa70a4f422efe3a9d1bdecb4b69ac430b05de4d54c76af59ea3726c9bc889eda234b1f867f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.47.1.ebuild b/sys-block/di/di-4.47.1.ebuild
new file mode 100644
index 000000000000..5a54e3014059
--- /dev/null
+++ b/sys-block/di/di-4.47.1.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 ~x86-fbsd"
+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/di/di-4.47.ebuild b/sys-block/di/di-4.47.ebuild
index 129c2ef259fc..a8e918ed2bef 100644
--- a/sys-block/di/di-4.47.ebuild
+++ b/sys-block/di/di-4.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471