gentoo resync : 23.03.2018

5 files changed, 9 insertions, 32 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 8686f3478152..942df0b0ff74 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,4 +1,3 @@
-AUX 1.3.5-generate_menu-printf-fix.patch 1188 BLAKE2B 6a57f273c8ef2434d069450521cdcbab1b904f408d8f55ceb22070c77b4b12e03d80f998ecd01575add218a780089c7bc0c8dbfb9aa91b4e2c672156d0533620 SHA512 78949c35a153d21f98e640e67abc73b124346fcbd31dbc200b6892bfc0af7bab22a5383759482864721644c5cff3cf423914861212390ab96dbebb09c5ba7e38
 AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9cd74e8dba2890bd20d91714c03834286a8f6fe962e793ba5815a7ef1215c09c276cc6eb219851655f19f8402a5 SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1
 AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
@@ -8,7 +7,7 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r3.ebuild 3175 BLAKE2B b928065f6ebca4830db1b2de639c7a66730e34457d68d1bd17ab1e43015ad32f13c3aa528da76cc266007858cb9b1cd141b181974eeda97276472cd5b7ac425d SHA512 0419913064ad2d4edfe00c429b74936fc4284cd208f6db1004fce7cf8eb3fe2cd18ff8422c9232f49ef52e24a8c48c3ee4d92cc1d9e10cc8795f0adf3bb93bc0
-EBUILD fluxbox-1.3.7-r4.ebuild 3217 BLAKE2B f02470ac8c6c60a73b2df359801f85a75028608fd800ebaf34ef234575153633aa1c522c849e9c500bc85313c8f042b87fca4407871d05da52c4fd2343608e9b SHA512 16ca60b87181b516bb6d76e6cea2c7507e4a0a435f567c8758fb660a521f4168d92d8ec9a41ed9d6d44878278856bb53b1d9700d52f0767cd45c3788a3096207
-EBUILD fluxbox-9999.ebuild 3003 BLAKE2B 11673f919a8a953122ce411308194ebf0a158cebe229b71e61ff7e51a9db756da5dbd7ffbce1ec694e03107406565ae69052e2438f5d1433cd384d2d536e3d11 SHA512 d9cff50cad586aafb16b9de11f581a81405f35c85523965f89a079e9fcdfab6484addc06d2280ea6f923e2f3597960605eb154b67ccb811823fe2516c7e32026
+EBUILD fluxbox-1.3.7-r3.ebuild 3161 BLAKE2B a3a91a131ed781773ecfa148b48cf98c662102ad75c8cc66012ef843ea24a895a32692c5dff45dfe5a9a401ca9865c4cb16a1fa044ad8ad3c8ea883bf9c8b42f SHA512 7bbb10e470ee491e893e5ecea72781e460a68bd551cd626e13b2ca5f344d84e06f89f66e3e1fd34ce8447790b34ed976eb842d8e42cbfa95f39bfdc2e48465e2
+EBUILD fluxbox-1.3.7-r4.ebuild 3203 BLAKE2B eb0d9092e7fd93d62a271aa28742412f38fee058415e871788dc58656d605731e28b75243d46351c379bb0a47f82538679c54acafd44d6b523512b1d6db389e5 SHA512 49044b2b559363442d1a01ece2e076c73f897951aa0ca1f075fdff485c8b21172e3efc0ae2713a300cde4640e580984be4314fb1aa78456c5632d9b84bcf28ab
+EBUILD fluxbox-9999.ebuild 2989 BLAKE2B 178229fc33528be2ca6c8fd47588651ec8c2757c081ecddc52d35e1347e44a31292855ab029d325b749827f65f61992946893e1848279055c654fe2d75f88831 SHA512 867dafcbf0964944811de4328f0f95f2b57454f03cae66f536e9f015998ce873e00b4d198e02f3948d8cd27cc41a7a38f464966c3b54e621cde16975deb48cfe
 MISC metadata.xml 1000 BLAKE2B 37bb680df975da4d9074c20418218ba2da7ace4d50d89ab9b802a3b71ac1270a48c1ae33f25c1c3ec07719d6b021d4538a44a535f945c8b73de5a22d9b4eabd8 SHA512 7c3c819b2e19ea143255b2305722bb09f70cfc304f8becad482ffacbf751a934de96a3e3635cc95acd6e2529ef810a08eb7011632baf064fdc6ce27c307341d6
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
deleted file mode 100644
index f9246f159076..000000000000
--- a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
-diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
-index 525315c..33b0153 100755
---- a/util/fluxbox-generate_menu.in
-+++ b/util/fluxbox-generate_menu.in
-@@ -330,13 +330,13 @@ searchForIcon(){
-     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
-     if [ -f "$entry_icon" ]; then
-     # if icon exists and entry does not already exists, add it
--        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
--            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
-+        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-+            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
-         else 
--            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
-+            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
-         fi
-     else
--        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
-+        echo "# No icon file found for $execname" >> $ICONMAPPING
-     fi
- }
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
index c4f2aee10842..c2443384420c 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
 
 REQUIRED_USE="systray? ( toolbar )"
 
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+DESCRIPTION="X11 window manager featuring tabs and an iconbar"
 
 SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
 HOMEPAGE="http://www.fluxbox.org"
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 2edfed184eaf..404b247f0126 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
 
 REQUIRED_USE="systray? ( toolbar )"
 
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+DESCRIPTION="X11 window manager featuring tabs and an iconbar"
 
 SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
 HOMEPAGE="http://www.fluxbox.org"
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index 7d8e0f9002ab..399a7ee66f9c 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
 
 REQUIRED_USE="systray? ( toolbar )"
 
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+DESCRIPTION="X11 window manager featuring tabs and an iconbar"
 
 EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
 SRC_URI=""