gentoo (valentine's day) resync : 14.02.2021

4 files changed, 11 insertions, 37 deletions

diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 88257d88cf61..6af35cc03c92 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,9 +1,8 @@
 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.3.tar.gz 221113 BLAKE2B 9e5d07a5839f107186b6010c6429b4b30f94da3a365b04e916af0f919c0a46746e8e854f6445e6b3927b600235ffef92b216cdab48a80c37b40c6f05c6de899e SHA512 d97a99a720181bbd9f5de2c9a97b099e332df6ffbba8f59130dec19a85846339fef4a2db08f84561722262552e087619c8a181e7de1c3b5744b17312f84bab59
-DIST di-4.47.tar.gz 250479 BLAKE2B 64156867ab31c448dfc428331a54900a54df4689f851f86f6b8e33403b2f0b785aadd8140576bc75f03ed675cf31fffe15d577b477e5d07a4e678bf625f46f49 SHA512 6bb004a9230dd59174c59b823a80ccc9b237a08947ac15502a805cf95e8803c05ac4e8c2282164130db2e23e8f521bf16c30f2c0996c96a9612d139d66df89f5
+DIST di-4.48.0.1.tar.gz 227599 BLAKE2B 128e72c1b3bd5b61de9a7df14d66c746b4e41e2b4a303853922f400e62bf200be82f320ca78b94d2d40bb661f2cf647d28657a807fc0bd4fc42cdc6a2e843182 SHA512 a5fbfd1c3790694b03a870ab56c61abe3f23bac12b41bdfe3d572d618a9f51194796d7fe020ff1fb196c422274ad8b2bce8d09cc01f8ba75b30696f5df11dc8c
 DIST di-4.48.tar.gz 222454 BLAKE2B 763e535e4e57c3805758dea8f7f05e75ff3d2acf9926619b8d45619bcef6157e9bd1b91a647efcee1728dbf2593ce91b934f77f24bb004d3ef546ad58e8434ee SHA512 942e71b7afbf2a4d3ef56cc2844bfbbe1a2001eee750b99951743f43b05c7bf692a59586f9efc228321ea3f91265211d71a4acc2e49e61efd15bcbaf41f98eb6
 EBUILD di-4.47.3.ebuild 696 BLAKE2B 0bcbdb88f4e1dd07a8fa7c33d559342a89fc61b30af5ae0747c151978d929152e45ca6bee199d3b13327bbef91ad585f1fa20cb9acddd5e325fb1a6731724471 SHA512 87a86586490e1dd8aad44bd987f0a5216f1758cf5669f4f387059e76d854249e3b5972ba796f0e0267de293d8b0e38870cd69c146b2f92ccc52aa67541cb51be
-EBUILD di-4.47.ebuild 745 BLAKE2B ec14acb393b46e484e84c5a080c014ecc3be2605fc1b5e31953ec087e0d4df00352ada72cc1e267bbad8c330290385c671a2d8156fd1dfc51718ea2d7686272b SHA512 4c8d25f3ad8101a5a9cb7a7b20ad174eb2a3dac4236ac4491cff9925fe22de70ddc89e91752619c124db1f0728b804bdbc714021a8ea2fc93216fa501d86397c
-EBUILD di-4.48.ebuild 704 BLAKE2B 183a3b8b536c29b40d2705479d0e047f76f08288e6c0e6a7980e296ae6837a43ec4654c2ae313cacf952637c56d4b4515f18aebd3a2dceed8136e55fc36b326b SHA512 fab0d43f5c51b583019a4dccb42d6ac7b042916b940681756c0d0ea76730d77f6e46071dea4f1831ca86ca336c737ffd520d43776b42659579d71491587066a9
+EBUILD di-4.48.0.1.ebuild 728 BLAKE2B 3d02b92353cad5eaca264dd5fbe6997f746f7da9cfbc4d225b6d93cf592817e668e80d41015154a48db1dadb7a0713c137d27c7f5a469a385865f885017cd410 SHA512 27e107843cd750005ae9bb2e912ee360d2cf2951f40817781fd91f9cfa32869eb703f78cf777797b01f17e545a84d446812d938f3081ced26feb46f29ccc1e33
+EBUILD di-4.48.ebuild 700 BLAKE2B 933be4b8f39dd46623cc6240e9898352446b096f895fd3d946c4b1678c338874ff0897da9f54abeeb16faa5771b610de532e10caff09f8871d93510b644c2ebd SHA512 6db6ca87d319e035c9bcc6142335184ac7c75e9218ba11e7ba994252103c0c8018eaea9f0d91a5cb434cad9a97fe56ff7b91acd6a24aeb6c1d33f2c98471bdc3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.47.ebuild b/sys-block/di/di-4.48.0.1.ebuild
index ebf2b8b6d8b6..0b91156a628d 100644
--- a/sys-block/di/di-4.47.ebuild
+++ b/sys-block/di/di-4.48.0.1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Disk Information Utility"
-HOMEPAGE="https://www.gentoo.com/di/"
-SRC_URI="https://www.gentoo.com/di/${P}.tar.gz"
+HOMEPAGE="https://diskinfo-di.sourceforge.io/"
+SRC_URI="mirror://sourceforge/diskinfo-di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
 
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.33-build.patch
-	"${FILESDIR}"/${PN}-4.47-no_echo-n.patch
 )
 
 src_configure() {
@@ -35,5 +34,5 @@ src_install() {
 	emake install prefix="${D}/usr"
 	# default symlink is broken
 	dosym di /usr/bin/mi
-	dodoc README
+	dodoc README.txt
 }
diff --git a/sys-block/di/di-4.48.ebuild b/sys-block/di/di-4.48.ebuild
index 7ff47b4545fc..31664c4b2ed8 100644
--- a/sys-block/di/di-4.48.ebuild
+++ b/sys-block/di/di-4.48.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=7
@@ -10,7 +10,7 @@ SRC_URI="https://gentoo.com/di/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls"
 
 RESTRICT="test" #405205, #405471
diff --git a/sys-block/di/files/di-4.47-no_echo-n.patch b/sys-block/di/files/di-4.47-no_echo-n.patch
deleted file mode 100644
index ff6c2045f23f..000000000000
--- a/sys-block/di/files/di-4.47-no_echo-n.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Neither "echo -n" nor "echo ... \c" is POSIX compliant.
-
-See "man 1p echo" section "APPLICATION USAGE" or
-https://www.in-ulm.de/%7Emascheck/various/echo+printf/
-
---- di-4.47/mkconfig/bin/shellfuncs.sh
-+++ di-4.47/mkconfig/bin/shellfuncs.sh
-@@ -45,15 +45,7 @@
- 
- test_echo () {
-   # It was suggested to use printf().
--  # printf does not quite work the same in the Tru64 shell.
--  # Of course no one uses that any more...
--  _tEN='-n'
--  _tEC=''
--  if [ "`echo -n test`" = "-n test" ]; then
--    _tEN=''
--    _tEC='\c'
--  fi
--  eval 'putsnonl () { echo ${_tEN} "$*"${_tEC}; }'
-+  eval 'putsnonl () { printf '%s' "$*"; }'
-   eval 'puts () { echo "$*"; }'
- }
-