gentoo resync : 15.01.2020

3 files changed, 76 insertions, 32 deletions

diff --git a/x11-themes/nimbus/Manifest b/x11-themes/nimbus/Manifest
index c6b7f884cf72..9225663ee790 100644
--- a/x11-themes/nimbus/Manifest
+++ b/x11-themes/nimbus/Manifest
@@ -1,3 +1,4 @@
+AUX nimbus-0.1.7-fix-themes.patch 1719 BLAKE2B a22ce2b19525c1232477c5f59658552225a290c2b8dd0fe8ef923829556487f6f893dd09fc2a53213e388dfb4aa178211f656f27c8e5cf99453ec5d6abfb3b80 SHA512 4608d3d05b8e83663d7b9029fd6fde1272aa6c5227b8e25f313d6e21679be0097d925fd345801c7154209ea2e98b1e835a355977ce59e19aefe414e7df86a899
 DIST nimbus-0.1.7.tar.bz2 9564020 BLAKE2B 9c0b6a28a51ccba6021e759153557547163c6c55dd6fbbe59ddda16fa224ec2ebc335a7fe0714bf3f57af174637ab0c0c37bb55b6091af5580a9637174220925 SHA512 e872bd476925f1035450cd0d6267c905111e26bb96eb8a76abeb8681e9f3a2b660dd9108251f2d4d5289247f346c69db155871af38644b3aea9491b4e7370e0b
-EBUILD nimbus-0.1.7-r1.ebuild 1624 BLAKE2B 9726ac8a01211f062579fbbd4fc402b4620b911c189b3840933288f03cb0713afe898ae1726de79702c1613bb772f04f8fc619e456ca00037903a6eaa1eac127 SHA512 03326b0f40eb4b7aaeefb274e113a48a879fd4d2e4f2c999337e8d82f31419882ec780104392726610fc149a1130f0eb267ac64aeb811e4d821ecb00645c3d24
+EBUILD nimbus-0.1.7-r1.ebuild 1260 BLAKE2B f2c8610114e73ae9be293c873561b172344f70ac1ebc1b45267de46c06f15a99078613135b4952cee47cd80f391c7b4d944e8fab1836c65cd739c96fce57beab SHA512 f4344dc23b15c199a268e250ae35aff14d3cf7d02e45a8c19ee3a13985ec109ba4b36b538982f571447dd472c4e81b3c57a8013ae7df6a3b9d8eeb1ed4100f5f
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/nimbus/files/nimbus-0.1.7-fix-themes.patch b/x11-themes/nimbus/files/nimbus-0.1.7-fix-themes.patch
new file mode 100644
index 000000000000..8135bb1dfd2c
--- /dev/null
+++ b/x11-themes/nimbus/files/nimbus-0.1.7-fix-themes.patch
@@ -0,0 +1,43 @@
+- Tango is deprecated
+- Encoding= key is obsolete
+
+--- a/dark-index.theme.in
++++ b/dark-index.theme.in
+@@ -2,7 +2,6 @@
+ Type=X-GNOME-Metatheme
+ _Name=Dark Nimbus
+ _Comment=Sun Microsystems, Inc. alternative theme
+-Encoding=UTF-8
+ 
+ [X-GNOME-Metatheme]
+ GtkTheme=dark-nimbus
+--- a/icons/index.theme.in
++++ b/icons/index.theme.in
+@@ -1,6 +1,6 @@
+ [Icon Theme]
+ Name=nimbus
+-Inherits=Tango
++Inherits=gnome,Tango
+ Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes
+ Example=user-desktop
+ 
+--- a/index.theme.in
++++ b/index.theme.in
+@@ -2,7 +2,6 @@
+ Type=X-GNOME-Metatheme
+ _Name=Nimbus
+ _Comment=Sun Microsystems, Inc. default theme
+-Encoding=UTF-8
+ 
+ [X-GNOME-Metatheme]
+ GtkTheme=nimbus
+--- a/light-index.theme.in
++++ b/light-index.theme.in
+@@ -2,7 +2,6 @@
+ Type=X-GNOME-Metatheme
+ _Name=Light Nimbus
+ _Comment=Sun Microsystems, Inc. alternative theme
+-Encoding=UTF-8
+ 
+ [X-GNOME-Metatheme]
+ GtkTheme=light-nimbus
diff --git a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
index 44cf2230a166..6ee30e99e329 100644
--- a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
+++ b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
@@ -1,9 +1,10 @@
-# 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
+
 AUTOTOOLS_AUTO_DEPEND=no
-inherit autotools gnome2-utils
+inherit autotools xdg
 
 DESCRIPTION="The default OpenSolaris theme (GTK+ 2.x engine, icon- and metacity theme)"
 HOMEPAGE="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/"
@@ -14,47 +15,46 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="gtk minimal"
 
-COMMON_DEPEND="gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( || ( x11-themes/adwaita-icon-theme x11-themes/tango-icon-theme ) )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="gtk? ( x11-libs/gtk+:2 )"
+RDEPEND="
+	${DEPEND}
+	!minimal? (
+		|| (
+			x11-themes/adwaita-icon-theme
+			x11-themes/tango-icon-theme
+		)
+	)"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
-	>=x11-misc/icon-naming-utils-0.8.90
-	!gtk? ( ${AUTOTOOLS_DEPEND} )
-	elibc_Interix? ( ${AUTOTOOLS_DEPEND} )"
-
-src_prepare() {
-	# Tango is deprecated
-	sed -i -e '/^Inherits/s:Tango:gnome,&:' icons/index.theme.in || die
+	x11-misc/icon-naming-utils
+	!gtk? ( ${AUTOTOOLS_DEPEND} )"
 
-	# Encoding= key is obsolete
-	sed -i -e '/^Encoding/d' *.theme.in || die
+PATCHES=( "${FILESDIR}"/${PN}-0.1.7-fix-themes.patch )
 
-	use gtk || { sed -i \
-		-e '/^gtk-engine/d' -e '/GTK2/d' -e '/^SUBDIRS/s:gtk-engine ::' \
-		configure.in Makefile.am || die; }
+src_prepare() {
+	xdg_src_prepare
 
-	local f=po/POTFILES.skip
-	echo light-index.theme.in >> ${f}
-	echo dark-index.theme.in >> ${f}
+	echo light-index.theme.in >> po/POTFILES.skip || die
+	echo dark-index.theme.in >> po/POTFILES.skip || die
 
-	if [[ ${CHOST} == *-interix* ]] || ! use gtk; then
+	if ! use gtk; then
+		sed -e '/GTK2/d' \
+			-e '/^gtk-engine/d' \
+			-e '/^SUBDIRS/s:gtk-engine ::' \
+			-i configure.in Makefile.am || die
+		mv configure.{in,ac} || die
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	econf $(use gtk && echo --disable-static)
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
+	default
 
-	use gtk && find "${ED}"/usr -name libnimbus.la -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }