gentoo resync : 25.08.2018

15 files changed, 180 insertions, 276 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 521e8ad59af8..5bc66a2b9ad2 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 817d00d5f18d..ce9096f44e9f 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,12 +1,8 @@
 AUX di-4.33-build.patch 1041 BLAKE2B 971d2cdcab457ede532c490d2a584ea76d7c7181587e670a18ee51431716e9fa64c1acc89ae41b51fadf58829e3d0edbd34181bd439adc50f028eac49786115f SHA512 5ed513a857585bd460e530d406488729e3b75f9a945faa600de1c41ed30762f2a5ed578ee10c5df16f3980b2063a05648d6c85c2882da8ef40e657e058788214
-AUX di-4.45-no_echo-n.patch 4828 BLAKE2B 132d7b6812f6ad0b6f2a6d6777fbf9dd863014e8070491624498a53a83e26287a1dac80d6426b109960dc852a7642f8d95ae1366e287535000e5293a27ef7ea0 SHA512 41186a74f25f6471229ad57c3c9739128856c77e287ad4e39ce48217b5ca47ae73a44ce1c16174eac38adbbd94f4fd673cc336933dbb19e3338ace9c470f635d
 AUX di-4.46-no_echo-n.patch 7166 BLAKE2B 5e975431b01a5abf0cda04a82c28cc5127136380c9f52563221f2fa5fd2e64da6a9683e8861e2045f4daf0979df309b930fbeb0a1b8f3761f72b195b4e6b9c20 SHA512 b0de0f6925bd52b86915914c135d44c6c77688cfae2fb69bac8873e042e79dc34daa3e55b871398e55acbac91a6e70306c33b60eb2fc3cd044f12f460e5aaf5c
-DIST di-4.43.tar.gz 267160 BLAKE2B c8e56e07d82df21eb839e97ee1d20ca76530ad3485888523faffdf0ad79941b35da41fde83645b58a747c1b40882fe68838255d081bc5fa32d9a3dd4846b43a8 SHA512 5b84c2ebf6fa22f6c7fee5872cc81a76e897cadbdaf8ce1b1b8dac0d53d5460127c8144f94fad204bdc522117cd1fcbac2905a065057d83b8aed0d69a5b95f9a
-DIST di-4.44.tar.gz 267509 BLAKE2B 0dd84906a1e710db9868c15cbc3334976469206d44d302a4ec31bad05cbc43643acd1076f0c12a22c9d642e21c6a9a03d6359db62902da5814bba73a346fae3d SHA512 e4d04def74ee1d9349daa8f01519243833135d63220678b3841505ba2d4667d1d5ec81a09e891bf1abb5e0016fc9cb6e674292665d0d29af7371160ff6eced5c
-DIST di-4.45.tar.gz 213282 BLAKE2B aafeed268940a9680e21cdbf6b3b21c7636d6638f35347be8389af7654fa993839c85845468ba7cb44bacc63a71efe9db36dcf9bea8fb4ef03a91f04d93c13c3 SHA512 f66fbc69f984b3a3bebbec935f583fb1ad84e33265ebb2734486f784459604071d9ec1639fa0edec5a4b48397f465656d40570f42d10fa0ef50dea17ed9cdd75
+AUX di-4.47-no_echo-n.patch 658 BLAKE2B cfd3df4c24333dd168ceef279c7cfcad2194e7fd7b3f1b2722cc9e54ae51abf963971666458455117ae990613ffc920541e3db4d603948c1a2dcdbd9f9912331 SHA512 2184eb38daa2eb67d3f61d337ee1d95188f66a1e63838916305aa72ef16c50e93147a5cee7388785bf96088479acc4ddddf7f2a1a4bb6e0c2de47abca4bbb071
 DIST di-4.46.tar.gz 217096 BLAKE2B 4757dec7d9c0da121d0057e8088ecb5994f60eec8de49db4a12e84a68d2ad9dc86462f01370786e0c03a792f39984aead2d838d34b4881396aacb39386635bfd SHA512 ead1172dfa9db74d6a8378f8ded460b365c0445d75d71154c67446585d63c0824f8fdc4818438b3d9c3c4795af518f1499c29762712fd62ab97e9be7e680d133
-EBUILD di-4.43.ebuild 674 BLAKE2B e44ed39ba56e0d08ac8f4d5dc49192ab60901b5001118fa90f9300b3ac8f07368f8b38bb8539dd246785629b2333d78d35ea0fb1ee181372ddecd271d2ca0528 SHA512 ca27a044a6e272ff919522d0c689146495da00cfda2220525333a8add79bc0da4df9013284efa8c3531913d619d049eb33bde14c919501b16afd1ca7fbf9499a
-EBUILD di-4.44.ebuild 678 BLAKE2B 11a9217a6deac2acd477c51b956119ff0704738531a3cc29cd87146b61d5d22a8d373d616f1d5bed7ab5697e28ffaf2f7f0451cd21192e7bb8304e9317b2cd85 SHA512 f3c0dac6c5c720e700093838e9776e0ce6f009cf6b06d5aa5b3e1c7f5f4450b5f784d071e58d00455acdf310bf9db7fe91b1a4dbf66eb0b2664373979130e2be
-EBUILD di-4.45.ebuild 760 BLAKE2B 2486fb4d9959d5eca45cc560e09fbf0fadd0ef04383fe5d6f6dd78e8e9f8d1f099b57e53adb6f1a174382969f335fb5d886ab9978d3418e9052b6aaa4718b6ff SHA512 76606da4d0573811ad1daf31ee5ab36aafd0ed24be32bfc86dacad1e3e4b64d144cac762a6fcab09ff166161f4614040703b7a1db2fe2132795bcf3a4b9baca1
-EBUILD di-4.46.ebuild 760 BLAKE2B e5f80639fc237e98e4da6c2ca3a4e0baad1612d3dc010b9d58982453cf7f5c71cc0e2f2788e5bf8aa6919222416e9de7d6887f0e24994ff363b2a5aeb454a517 SHA512 7ffd670cccd374141f71e8f8a0e8a227389a91c9a2135133802634eaa9950f50d0e55f3faa26c3205a6d612ce923b6cbfd7bb7c797e448ee0c988448b4e30228
+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
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/di/di-4.43.ebuild b/sys-block/di/di-4.43.ebuild
deleted file mode 100644
index 7cccda50f360..000000000000
--- a/sys-block/di/di-4.43.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.33-build.patch
-}
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-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.44.ebuild b/sys-block/di/di-4.44.ebuild
deleted file mode 100644
index 6ca0d1c3fa8b..000000000000
--- a/sys-block/di/di-4.44.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.33-build.patch
-}
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-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.46.ebuild b/sys-block/di/di-4.46.ebuild
index c84517d06767..220281ec25b7 100644
--- a/sys-block/di/di-4.46.ebuild
+++ b/sys-block/di/di-4.46.ebuild
@@ -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
diff --git a/sys-block/di/di-4.45.ebuild b/sys-block/di/di-4.47.ebuild
index 0f2ee5708aa4..129c2ef259fc 100644
--- a/sys-block/di/di-4.45.ebuild
+++ b/sys-block/di/di-4.47.ebuild
@@ -19,7 +19,7 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.33-build.patch
-	"${FILESDIR}"/${PN}-4.45-no_echo-n.patch
+	"${FILESDIR}"/${PN}-4.47-no_echo-n.patch
 )
 
 src_configure() {
diff --git a/sys-block/di/files/di-4.45-no_echo-n.patch b/sys-block/di/files/di-4.45-no_echo-n.patch
deleted file mode 100644
index a15901a257b5..000000000000
--- a/sys-block/di/files/di-4.45-no_echo-n.patch
+++ /dev/null
@@ -1,190 +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.45/C/tests.d/rpmbuild.sh
-+++ di-4.45/C/tests.d/rpmbuild.sh
-@@ -12,13 +12,13 @@
- locatecmd locrpmbuild rpmbuild
- 
- if [ "${locrpmbuild}" = "" ];then
--  echo ${EN} " skipped${EC}" >&5
-+  printf '%s' " skipped" >&5
-   exit 0
- fi
- 
- rvers=`rpmbuild --version | tr -cd '0-9' | sed 's/^\(...\).*/\1/'`
- if [ $rvers -lt 470 ]; then
--  echo ${EN} " old version skipped${EC}" >&5
-+  printf '%s' " old version skipped" >&5
-   exit 0
- fi
- 
---- di-4.45/mkconfig/bin/shellfuncs.sh
-+++ di-4.45/mkconfig/bin/shellfuncs.sh
-@@ -28,17 +28,6 @@
-   echo "mkconfig version ${_MKCONFIG_VERSION}"
- }
- 
--setechovars () {
--  EN='-n'
--  EC=''
--  if [ "`echo -n test`" = "-n test" ]; then
--    EN=''
--    EC='\c'
--  fi
--  export EN
--  export EC
--}
--
- dosubst () {
-   subvar=$1
-   shift
---- di-4.45/mkconfig/bin/testfuncs.sh
-+++ di-4.45/mkconfig/bin/testfuncs.sh
-@@ -19,14 +19,14 @@
- 
- chkccompiler () {
-   if [ "${CC}" = "" ]; then
--    echo ${EN} " no C compiler; skipped${EC}" >&5
-+    printf '%s' " no C compiler; skipped" >&5
-     exit 0
-   fi
- }
- 
- chkdcompiler () {
-   if [ "${DC}" = "" ]; then
--    echo ${EN} " no D compiler; skipped${EC}" >&5
-+    printf '%s' " no D compiler; skipped" >&5
-     exit 0
-   fi
- }
---- di-4.45/mkconfig/mkconfig.sh
-+++ di-4.45/mkconfig/mkconfig.sh
-@@ -28,7 +28,6 @@
- . ${_MKCONFIG_DIR}/bin/shellfuncs.sh
- 
- doshelltest $0 $@
--setechovars
- 
- LOG="mkconfig.log"
- _MKCONFIG_TMP="_tmp_mkconfig"
-@@ -154,7 +153,7 @@
-   tlabel=$2
- 
-   echo "   $ifleveldisp[${tname}] ${tlabel} ... " >&9
--  echo ${EN} "${ifleveldisp}${tlabel} ... ${EC}" >&1
-+  printf '%s' "${ifleveldisp}${tlabel} ... " >&1
- }
- 
- _doexport () {
---- di-4.45/mkconfig/mkc.sh
-+++ di-4.45/mkconfig/mkc.sh
-@@ -16,7 +16,6 @@
- . ${_MKCONFIG_DIR}/bin/shellfuncs.sh
- 
- doshelltest $0 $@
--setechovars
- 
- rc=0
- args=$@
---- di-4.45/mkconfig/units/c-main.sh
-+++ di-4.45/mkconfig/units/c-main.sh
-@@ -559,7 +559,7 @@
-       eval $cmd
-       echo "## dcl(C): ${dcl}" >&9
-       c=`echo ${dcl} | sed 's/[^,]*//g'`
--      ccount=`echo ${EN} "$c${EC}" | wc -c`
-+      ccount=`printf '%s' "$c" | wc -c`
-       domath ccount "$ccount + 1"  # 0==1 also, unfortunately
-       c=`echo ${dcl} | sed 's/^[^(]*(//'`
-       c=`echo ${c} | sed 's/)[^)]*$//'`
---- di-4.45/mkconfig/units/d-main.sh
-+++ di-4.45/mkconfig/units/d-main.sh
-@@ -1680,7 +1680,7 @@
-       echo "## tdcl(D): ${tdcl}" >&9
-       if [ $argflag = 1 ]; then
-         c=`echo ${tdcl} | sed 's/[^,]*//g'`
--        ccount=`echo ${EN} "$c${EC}" | wc -c`
-+        ccount=`printf '%s' "$c" | wc -c`
-         domath ccount "$ccount + 1"  # 0==1 also, unfortunately
-         c=`echo ${tdcl} | sed 's/^[^(]*(//'`
-         c=`echo ${c} | sed 's/)[^)]*$//'`
---- di-4.45/tests.d/buildsh.sh
-+++ di-4.45/tests.d/buildsh.sh
-@@ -43,7 +43,7 @@
-       fi
-     fi
- 
--    echo ${EN} " ${d}${EC}" >&5
-+    printf '%s' " ${d}" >&5
-     ${MAKE:-make} ${TMAKEFLAGS} realclean
-     ${MAKE:-make} ${TMAKEFLAGS} -e prefix=${instdir} all > make.log 2>&1
-     rc=$?
---- di-4.45/tests.d/diarg.sh
-+++ di-4.45/tests.d/diarg.sh
-@@ -93,7 +93,7 @@
-   tdir=$_MKCONFIG_RUNTOPDIR/$d
- 
-   if [ -x ${tdir}/di ]; then
--    echo ${EN} " ${d}${EC}" >&5
-+    printf '%s' " ${d}" >&5
-     # most all unix
-     ${tdir}/di -n -f M / 2>/dev/null | grep '^/[ ]*$' > /dev/null 2>&1
-     rc=$?
-@@ -135,7 +135,7 @@
-     done
- 
-     if [ $lrc -ne 0 ]; then
--      echo ${EN} "*${EC}" >&5
-+      printf '%s' "*" >&5
-       grc=1
-     fi
-   else
---- di-4.45/tests.d/disort.sh
-+++ di-4.45/tests.d/disort.sh
-@@ -41,7 +41,7 @@
-     fi
-   )
-   if [ -x $tdir/di ]; then
--    echo ${EN} " ${d}${EC}" >&5
-+    printf '%s' " ${d}" >&5
-     echo "## regular sort first, then di sort"
-     echo "by special"
-     ${tdir}/di -n -a -f S | sort > s1
-@@ -118,12 +118,12 @@
- 
-     rm -f s1 s2
-     if [ $grc -ne 0 ]; then
--      echo ${EN} "*${EC}" >&5
-+      printf '%s' "*" >&5
-     fi
-   else
-     if [ $d = C ]; then
-       echo "## no di executable found for dir $d"
--      echo ${EN} "*${EC}" >&5
-+      printf '%s' "*" >&5
-       grc=1
-     fi
-   fi
---- di-4.45/tests.d/ditot.sh
-+++ di-4.45/tests.d/ditot.sh
-@@ -27,7 +27,7 @@
-     fi
-   )
-   if [ -x ${tdir}/di ]; then
--    echo ${EN} " ${d}${EC}" >&5
-+    printf '%s' " ${d}" >&5
-     for format in $FORMATS; do
-       echo "Checking format: $format"
-       # have to exclude zfs, null (dragonflybsd)
-@@ -37,7 +37,7 @@
-       didata=`${tdir}/di -n -d1 -f $format -t -a -x null,zfs,ctfs,objfs,sharefs 2>/dev/null `
-       summtot=`(echo "0 ";echo $didata | sed 's/  */ + /g'; echo " - p") | dc`
-       if [ $summtot -ne 0 ]; then
--        echo ${EN} "*${EC}" >&5
-+        printf '%s' "*" >&5
-         echo "## format: $format failed"
-         grc=1
-       fi
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
new file mode 100644
index 000000000000..ff6c2045f23f
--- /dev/null
+++ b/sys-block/di/files/di-4.47-no_echo-n.patch
@@ -0,0 +1,24 @@
+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 "$*"; }'
+ }
+ 
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index a0ecd55af63c..3311645fe91b 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -2,4 +2,4 @@ DIST ms-sys-2.4.0.tar.gz 46501 BLAKE2B 584d0fb711f447e14e5fde9b4cbec316069b1f6b9
 DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
 EBUILD ms-sys-2.4.0.ebuild 674 BLAKE2B 8d9a9cf58f37719f806b9b1d6c24eb3c12917c68eabc5335fc489f289f915d3fcdd8e6307fcd489bb9c1e8fa4ecfb13ec7c706490018107c2a8b2631835525f7 SHA512 c8cffb3ad411300c5ebcb2ae91be4a10f530c91ebb59f9de88f1895d3e57fb7771eb0cd60eb080042f219d7640c65f4806030f32fb40eb0baea725937fd8b0b3
 EBUILD ms-sys-2.5.3.ebuild 676 BLAKE2B abd4cc612c096937cfd6b7c475b0caca40a9f889a12e6e3f583a38c99eb4711e1de61a42425952c1a7806dc7905aa80ef65e4af4b7d65a1d4338e49f0c4342d5 SHA512 d794ef17fda984747d7b4f600f2902cb9e879536b5d650a4a0e5bb8c500b82685fbf2a0012538cf4d44a218cd28baca4b36f0eefd22912479d9626f4d0fd120a
-MISC metadata.xml 312 BLAKE2B 1a9a47e9b027c4d381574e1b6f77df7b0f1de5cb9bd2d6d836f01062a65581a2e68d4847352d3aa263491ce03a69707f1cadc107ded11100daa95932f4d2e9a7 SHA512 7cef8408091a48c263cdcbbeb6dab1043f75748cb74415f1376e5a990862e371ac09b902a8d8c46455d20de3b6b81a7fedc16be3265f7613dc8466fd879627bb
+MISC metadata.xml 303 BLAKE2B efd83ecd89e4afa7f5254e7fdafcf22883a2293264393af9f20bc1462db09792a97044cb09444331db5fb83f3ee1f9d9fea27fd702a11e7e0732f076f35c966d SHA512 42ef32f756ed48890908bbb142342bfc2b3a1e46c9d8aef7118d0d486d5143d1d43cea0a96f6d0d1ec59bb346d98191032a0f6e12dd0f1f3a1c8930f321b3c56
diff --git a/sys-block/ms-sys/metadata.xml b/sys-block/ms-sys/metadata.xml
index 749556f5e689..60ec7c0f8e23 100644
--- a/sys-block/ms-sys/metadata.xml
+++ b/sys-block/ms-sys/metadata.xml
@@ -4,6 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">ms-sys</remote-id>
-		<bugs-to>https://sourceforge.net/tracker/?group_id=59200</bugs-to>
+		<bugs-to>https://sourceforge.net/p/ms-sys/bugs/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index d61403c79b44..f2339c5ce7bb 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,8 +1,10 @@
 DIST nbd-3.15.3.tar.xz 505856 BLAKE2B 8536b01908eb84733448382dcafe011e2786fe5e1363d6d957f1f8895ff257a35c56cecba3b177a1eb2270cec2a7c00082db7408cb8023aa3f20a22eb28bc295 SHA512 c4cd580272faa6a0564469d188decd2db99a5b9d691dca511eea16154ce6185c38e6f695a05bd18941d42cb9e4bb92e30e9eca70d38dce8054a0785ab16b711a
 DIST nbd-3.16.2.tar.xz 504880 BLAKE2B 12579169755f4f57ec295531dc11b88ff412678270cf77cb80b7c76cf3193d115c4602432b7913e58abe417a6e59a13c3ffaee84bd9b4a1f0f34ae104491ce5c SHA512 ebdf42a837aeed7625420958d136c7a98c0b168d80fbfbab4b96cb6510dbc12ec2410716301f68385d69f68329c751aef3266cc74c6e341540e1df5f6c531349
 DIST nbd-3.17.tar.xz 511224 BLAKE2B 9289419e6d1c030d37704e1482f6fbdd2cacb8a1d0f5403e307fbef9b307e842a3bb7ee7240a6b31467ced3ecef1f244fbd916138a32521d26848b3fd1fdc42e SHA512 bcbd025d829d407dc3c0b837cbc1c16f673c5f4c0483d5bee83a52b40d528088499860c775e4e77cf47a8ac1d83dcda24df1092d658dd915ed01c638b3ebc57b
+DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a689be498959d90bb44dd39681fdcd005fe8e48f9a79fbe29bfd67d98fc0eb6440e51b1ac3a5de4d002060d SHA512 f9fe221b585c126efa3fb65e2344477a38f2ce42164b04d0dc4681c5a3bfd34d5d3e227454fff24eee9039853eb38a8707ea0aab0337f44906cccf379c185ce8
 EBUILD nbd-3.15.3.ebuild 692 BLAKE2B 7726d0000f9ebaa2c6490dda7f9483ffe546bdfb77ed2f30524666b01505d4b5678bd0b98f17dfc53e57eafb3445625fcc97a20cc32125dd727d9b2094eae317 SHA512 d0bf5937ebe43552c3415f8957b87efd7a651d7a7ecec9243e81b3b6666352255b781b4cf1a09e111ed5c1ff17c76b8865ee66733d623ffdbb2927b64be0fc1a
 EBUILD nbd-3.16.2.ebuild 702 BLAKE2B e3e10fc916cbede8773876a8e87bd99269c48116b2f7b30879d1b0fe95552e88d653cf73b381895e70c3775d51d71d3c54ace15e380ed6b795bd2f8e17f19dbe SHA512 d4344bf7b98c4ff46dc7f1d20763ed64da940b84b0074212a08f7a86752e4ecde408a43a1ee04c3a2f1e735d87d6f2b1269562231b088dcbe1a585ca9e3b607c
 EBUILD nbd-3.17.ebuild 727 BLAKE2B f51ca61d5b7ad61b904c3b15c71f0f2469c71ed7d0628e07b14501689d377364a136a099573574155567ea1476034b45e414c74b3935fe123b5b7cd1196249c1 SHA512 0228b016b62479e4457b58ea635754dff0319109b600d390d057623c54604f1a1af9df7a9c913e366df0f72ee2ebd126e673671dd5a342643ba9fd1b9af552eb
+EBUILD nbd-3.18.ebuild 1303 BLAKE2B cc38bdafe7c889d2c8960b9e1fe7e7f3dd347a35adbcb1a82ab7681f83dfa5e44b4c186bc84de2b66ce16027a6b5ca2b90b27905ce3174ca8c13dffc7629d796 SHA512 cc8cacad9661ba30fae805e82df0916256b5d50ade3f36225c507be9933d7d32bfd73a6914bf886c9877e4c4f2f7a789fb0388d1c2554ad11d3c411959bbd3a9
 EBUILD nbd-9999.ebuild 1303 BLAKE2B cc38bdafe7c889d2c8960b9e1fe7e7f3dd347a35adbcb1a82ab7681f83dfa5e44b4c186bc84de2b66ce16027a6b5ca2b90b27905ce3174ca8c13dffc7629d796 SHA512 cc8cacad9661ba30fae805e82df0916256b5d50ade3f36225c507be9933d7d32bfd73a6914bf886c9877e4c4f2f7a789fb0388d1c2554ad11d3c411959bbd3a9
 MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0
diff --git a/sys-block/nbd/nbd-3.18.ebuild b/sys-block/nbd/nbd-3.18.ebuild
new file mode 100644
index 000000000000..c02131c2e628
--- /dev/null
+++ b/sys-block/nbd/nbd-3.18.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="http://nbd.sourceforge.net/"
+if [[ "${PV}" = 9999 ]] ; then
+	inherit autotools git-r3
+	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"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls netlink zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.26.0
+	gnutls? ( >=net-libs/gnutls-2.12.0 )
+	netlink? ( >=dev-libs/libnl-3.1 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+if [[ "${PV}" = 9999 ]] ; then
+	DEPEND+="
+		app-text/docbook-sgml-dtd:4.5
+		app-text/docbook-sgml-utils
+	"
+fi
+
+src_prepare() {
+	default
+	if [[ "${PV}" = 9999 ]] ; then
+		emake -C man -f Makefile.am \
+			nbd-server.1.sh.in \
+			nbd-server.5.sh.in \
+			nbd-client.8.sh.in \
+			nbd-trdump.1.sh.in \
+			nbdtab.5.sh.in
+		emake -C systemd -f Makefile.am nbd@.service.sh.in
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-lfs
+		$(use_enable !debug syslog)
+		$(use_enable debug)
+		$(use_enable zlib gznbd)
+		$(use_with gnutls)
+		$(use_with netlink libnl)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index f06349307ea4..e18ffb22700f 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -5,9 +5,11 @@ DIST storcli-1.21.06_readme.txt 199925 BLAKE2B 08b7ddc9d6a0ee176e91938d00ef12b39
 DIST storcli-1.23.02.zip 48778476 BLAKE2B 9eded7793e822785dfbd15b6a6fa70e70dc1f4e32df9e6e1e213420a4e6ae01705096ce8f0ea468a6dc8d5d22097c87e06e54be6fcccb9eaf6cc321c26b69b0a SHA512 2018c8b40d7371077f01bbe586ed1135d683823b9d243fde14d45404c8bab8328f36e19ac91eb876666a174a7cce7e95a2a75485f70681460cda4c9b65d4d579
 DIST storcli-1.23.02_readme.txt 201906 BLAKE2B 6dde1f7609d51f3d0b2feec9301a57472e92086fc7f1aecad3b455b03b571fb75e23de75d508c40b78ebab357340d8c14f5529fce3ce9ee6b513f5e80d82ad99 SHA512 9eefe69aee1a65339d2360759ba574f632a21bd3d13ba9d4cb0a86980e652addf5f7d2b650588f659caaa8ee302c48bc27b9f3ad7455e65d34dbcff0a8188e03
 DIST storcli-7.0504.zip 40558670 BLAKE2B 3cd54b47b42e5bb8329ccd4b09a6c0863347a04b276fa5dc11acf10ac1124c25b5f60e4171de96c1b8975bfae4cc7408554de933ba8fd5547fbd6e9395710ce8 SHA512 1c5c248a1c19eda5974415a7e1cc10c83bfad0d6e37adbd01ae624316fc1d60628503655c4dd0005a14c79c570177664ea9cdb7330b97daf19808a9513b1311a
+DIST storcli-7.0606.zip 36634159 BLAKE2B 56cae14537872ef23d8ddc6a0790b727abdf4abecd06b9d1615dc4ad0a554a48bdd077772181d2f0ad9bbe90f015130b4a62caa16b1f02d042403cb6ca389e04 SHA512 ef8bc6b275bb915707624d73d802e84e7a04da087d275055916f047f16d15f1303047c9eb53eae8de88da97ce82fc79616822888fc320af7ba54ad6aa2999996
 EBUILD storcli-1.19.04.ebuild 2050 BLAKE2B 50e963ae4290d138661fc3b3f95a692c2e230267fc2b0c12440ec5ce68e08c9167248d2addcbac9b6d5e20456124e9398e1e60cd6524820d7121dfa06528bc89 SHA512 4b0697daca02917b91c5efb2cbbf9145af30a19ed9adb7b0279cb3b8b1a94819b2b23ff46bee7895bf016249402e2c8da467d92c25201995d8227aabbbbc298c
 EBUILD storcli-1.20.15.ebuild 2063 BLAKE2B a660891695ad51e079658f04be6a1333883326c6f36dea59bc798fa93e698efc66e2470892464f5b6ec2fcc5f67d27aaccf05aa34b21e899b0d18e1f721e6607 SHA512 8e6a5ebe11f74fc0351a1983dbc19d1cfe527513dc3f927567e500667755fbf921a531a4b41ebc59d430a6cddb36d0266e40a68c648b87f6de4be9ecffddbe33
 EBUILD storcli-1.21.06.ebuild 2656 BLAKE2B 272ee62c3fa026de02d750ca3c5bd2f6267ee2c2262fe61ae68c39ad0692271f55bdc1188cb5a004603f93ab9f97a8d2ef16cc163336a8b92995a4420cc7817d SHA512 ff8dfdfe0bbd8e7e520f76150aec96d7873cb7b17b88ed68a2d9d8ed6fa1e74f7a4ef2606cdc6a1eb7a1769899f03de2118abe6d8997246240d646956ac855e9
 EBUILD storcli-1.23.02.ebuild 2358 BLAKE2B 6a124e14392bedf31f5408ce4b2bded73b8237f08391f40b1f8438ef8df31e38d5ea9e8cca99d8888e3f5e25dac309052c9a3896cb78dc270fa7bc74fcf482d6 SHA512 279aedf5aff9387e4dcad20172f253fa24b08b862f84dc9781b30da937ee5dd3f0c406bc769da91dd72f0914e017fb7df003f3951e9f42e3ca4a4fb523a47fb7
-EBUILD storcli-7.0504.ebuild 2200 BLAKE2B 8ab87a29e96ea30e9400d666e42dc5f7c405f062af91f2571b40aca8dc43060526ec386240acf02933a0287a0404b26ab410f9af0c0a89593087abeb142c9e53 SHA512 622cb0efe07e9d4e953220a8029eb6e95698c868151e6c907acd2c458ca61c37f5a6086d7b21c3fdf677c22d9bd72300fb2fd577087ab9542b84be9f6204e76c
+EBUILD storcli-7.0504.ebuild 2214 BLAKE2B 81dd2ff9bd1e57b5e19507272eb2ea26ddf98b7c6393b6254e87f6225161a8bc63b17269491f5c6207ce3f4c6a83464b9472dbc97d0a013a8cdf0ddff2fc8a6a SHA512 8cfb0519e74681d44bed989f76dbb4fb86cbecaa42b1c72d02502dd889be0df1412eefb87c958f0c6356bcec83f58c139a470e77325e95d6a8701def87e8227e
+EBUILD storcli-7.0606.ebuild 2491 BLAKE2B b4431c3bfeeede5caf32445cac64b5b91fd48503c97b3717c303e651bdc54fb107954c04d1aa711fc6537c55bc6321fa59174a81168984f56f2c087a143e9b2e SHA512 fdf9b25919834d82a3b2b4cc851949d87ba335d1e3504b33c905da0ebb51fb36e39e41cc3f2b00a8ee027ae9b6a4ea1d8a8eb74c0fa7c23c4f4da7758e60d9c6
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.0504.ebuild b/sys-block/storcli/storcli-7.0504.ebuild
index 8201ffda1b9e..cfa99582d6a6 100644
--- a/sys-block/storcli/storcli-7.0504.ebuild
+++ b/sys-block/storcli/storcli-7.0504.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 DOCS=( readme.txt license.txt )
 
diff --git a/sys-block/storcli/storcli-7.0606.ebuild b/sys-block/storcli/storcli-7.0606.ebuild
new file mode 100644
index 000000000000..4eef2bc72669
--- /dev/null
+++ b/sys-block/storcli/storcli-7.0606.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit pax-utils
+
+# Upstream is still using strange version numbers
+MY_PV="007.0606.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.6"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+DOCS=( readme.txt license.txt )
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	local _src_file
+
+	for _src_file in ${A}; do
+		if [[ ${_src_file} == *.txt ]]; then
+			cp "${DISTDIR}/${_src_file}" "${WORKDIR}" || die "Failed to copy '${_src_file}' to '${WORKDIR}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+
+	unpack "${WORKDIR}"/MR_SAS_Unified_StorCLI_*.zip
+	rm -r "${WORKDIR}"/MR_SAS_Unified* || die
+	mv "${WORKDIR}"/versionChangeSet/univ_viva_cli_rel/Unified*.zip "${WORKDIR}" || die "Failed to move Unified_storcli_all_os.zip"
+	rm -r "${WORKDIR}"/versionChangeSet || die
+	unpack "${WORKDIR}"/Unified_storcli_all_os.zip
+
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.gz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/*_StorCLI.txt "${S}"/readme.txt || die "Failed to move *StorCLI.txt to readme.txt"
+	mv "${WORKDIR}"/Unified_storcli_all_os/Linux/license.txt "${S}"/license.txt || die "Failed to move Linux/license.txt"
+	rm -rf "${WORKDIR}"/Unified_stor* || die "Failed to cleanup Unified_storcli* dirs/files"
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+
+	if use x86; then
+		doexe storcli
+	elif use amd64; then
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	dodoc "${DOCS[@]}"
+
+	pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli
+}