gentoo resync : 15.01.2020

3 files changed, 33 insertions, 14 deletions

diff --git a/x11-themes/nuvox/Manifest b/x11-themes/nuvox/Manifest
index 562ffd4ee4c7..ccb3b8901da4 100644
--- a/x11-themes/nuvox/Manifest
+++ b/x11-themes/nuvox/Manifest
@@ -1,3 +1,4 @@
+AUX nuvox-07.1-fix-buildset.patch 705 BLAKE2B 9fc8e17751bb32107ae698394f4a713cf00f47e175dfac775de734b697d9b8107a5b87027d99d9e5f7be7cd47c60cca78ebb08f25f7e4b6542536e591eacea55 SHA512 dccf8ba71fe63be82aa9d6876c902cd916282d352c9fde9ee217d2bf9dd93f40470333d3407ff9656acce4ae3da3087e6ed248c0d665e63ddce5b5d0cd3c38c0
 DIST nuvoX_07.1.tar.gz 10254281 BLAKE2B cc2a20a694b898b8dddf0ca8abfe590efba77e1d91aafea8acd218dc8bb29b9c91292179463e3ce44d260459aea52d0dc417463757f03268b878753997e989ea SHA512 38a4130cf3294aed8e238ee2ec4d84613595225f27f69041c023222f23f4951c5342baf28a74c785c928590925022cb78f960c6b7d8640b6a25e3f7eb2b2d955
-EBUILD nuvox-07.1-r1.ebuild 681 BLAKE2B c2eae3bb2608f75aaf0c6546ac85ea1e383c3271942767a47a970825ca1101419e7138695c88b7d0f2e9a2df0e7fe5c6ef7ea5d9a2394c6b098fd6aacb51e2d3 SHA512 3dc06f78eeaec048a62e5306f9f3484b874ad2fd5bb39d7f10b6dccf4e87856eac06a7dd1f5c7e7ae925669238e7f2b3cd24cbe7c6d936c5e5b51ab46127d629
+EBUILD nuvox-07.1-r1.ebuild 652 BLAKE2B ef29313b3b275f016893dc81e0125485d0759d11baff06a9718d1f1793fd7f903b941d11ca052ebe728f2e667e43499c0e54ab7375d18269b740932e147a5291 SHA512 13b0789a46f559d7a61d7c746d1013e77f02a96924145f8ea7ad0ae63c42cc829129c1b775ac66918a9dc6d1000ce4cef65d63de916f3f5ffbf981ff5d2aaafb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch b/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch
new file mode 100644
index 000000000000..fba871878c70
--- /dev/null
+++ b/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch
@@ -0,0 +1,23 @@
+--- a/buildset
++++ b/buildset
+@@ -157,7 +157,6 @@
+ 
+ 
+ # Move/Remove the created directories so the user can rebuild if needed.
+-rm -fr 32x32/apps 32x32/devices 32x32/mimetypes 32x32/filesystems
+ for size in $SIZES
+ do
+ 	if [ "$size" != "32x32" ]; then # Already did the 32x32 size above
+@@ -169,12 +168,10 @@
+ echo -ne "Tarring and compressing.\n"
+ if test -f $COMPRESSOR
+ 	then
+-		tar cf $PACKAGENAME.tar $PACKAGENAME && $COMPRESSOR $PACKAGENAME.tar
+ 		echo -ne "\nThe $PACKAGENAME icon set has been built.  Use kcontrol to install the icon set.\n"
+ 		echo && ls -sh $PACKAGENAME.tar* && echo
+ fi
+ echo -ne "Removing all temporary directories...\n"
+-rm -fr $PACKAGENAME
+ 
+ echo -ne "\nAll done. ;)\n"
+ 
diff --git a/x11-themes/nuvox/nuvox-07.1-r1.ebuild b/x11-themes/nuvox/nuvox-07.1-r1.ebuild
index 328020ee4d52..7770506ddd90 100644
--- a/x11-themes/nuvox/nuvox-07.1-r1.ebuild
+++ b/x11-themes/nuvox/nuvox-07.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 MY_P=nuvoX_${PV}
 
@@ -12,18 +12,13 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/imagemagick-tools[png]"
-
 RESTRICT="strip binchecks"
 
-S=${WORKDIR}/${MY_P}
+BDEPEND="virtual/imagemagick-tools[png]"
 
-src_prepare() {
-	sed -i -e '/rm -fr/d' -e '/tar cf/d' buildset || die
-}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-07.1-fix-buildset.patch )
 
 src_compile() {
 	./buildset || die
@@ -31,8 +26,8 @@ src_compile() {
 
 src_install() {
 	dodoc nuvoX_0.7/readme.txt
-	rm nuvoX_0.7/{readme,license}.txt
+	rm nuvoX_0.7/{readme,license}.txt || die
 
 	insinto /usr/share/icons/${PN}
-	doins -r nuvoX_0.7/*
+	doins -r nuvoX_0.7/.
 }