[gentoo-commits] repo/gentoo:master commit in: x11-themes/nimbus/files/, profiles/, x11-themes/nimbus/
commit: c083cb23d626ca4a6ac9fb049c48ed4fa80a3602
Author: Jakov Smolic sartura hr>
AuthorDate: Mon May 3 13:59:54 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue May 4 22:29:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c083cb23
x11-themes/nimbus: Remove last-rited pkg
Closes: https://bugs.gentoo.org/778800
Closes: https://bugs.gentoo.org/514282
Closes: https://bugs.gentoo.org/630502
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: Sam James gentoo.org>
profiles/package.mask | 5 --
x11-themes/nimbus/Manifest | 1 -
.../nimbus/files/nimbus-0.1.7-fix-themes.patch | 43
x11-themes/nimbus/metadata.xml | 8 ---
x11-themes/nimbus/nimbus-0.1.7-r1.ebuild | 60 --
5 files changed, 117 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 4f1166ada38..c4c53073989 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -665,11 +665,6 @@ dev-libs/go-usb
# Bug #779148.
app-editors/beaver
-# Jonas Stein (2021-03-27)
-# Upstream is gone. Open bugs. Removal after 2021-05-01.
-# Bug #778800
-x11-themes/nimbus
-
# Lars Wendler (2021-03-22)
# Has unidentified race condition on very fast CPUs that causes maintainer-
# mode to be triggered.
diff --git a/x11-themes/nimbus/Manifest b/x11-themes/nimbus/Manifest
deleted file mode 100644
index f184348e5fe..000
--- a/x11-themes/nimbus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nimbus-0.1.7.tar.bz2 9564020 BLAKE2B
9c0b6a28a51ccba6021e759153557547163c6c55dd6fbbe59ddda16fa224ec2ebc335a7fe0714bf3f57af174637ab0c0c37bb55b6091af5580a9637174220925
SHA512
e872bd476925f1035450cd0d6267c905111e26bb96eb8a76abeb8681e9f3a2b660dd9108251f2d4d5289247f346c69db155871af38644b3aea9491b4e7370e0b
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
deleted file mode 100644
index 8135bb1dfd2..000
--- a/x11-themes/nimbus/files/nimbus-0.1.7-fix-themes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-- 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/metadata.xml b/x11-themes/nimbus/metadata.xml
deleted file mode 100644
index 49c86a887b6..000
--- a/x11-themes/nimbus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
- desktop-m...@gentoo.org
- Gentoo Desktop Miscellaneous Project
-
-
diff --git a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
deleted file mode 100644
index 6ee30e99e32..000
--- a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND=no
-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/";
-SRC_URI="http://dlc.sun.com/osol/jds/downloads/extras/${PN}/${P}.tar.bz2";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="gtk minimal"
-
-DEPEND="gtk? ( x11-li
[gentoo-commits] repo/gentoo:master commit in: x11-themes/nimbus/files/, x11-themes/nimbus/
commit: 52c93764c13cdfd87b7a424c811e1ff7e9d89fab
Author: David Seifert gentoo org>
AuthorDate: Tue Dec 24 11:53:21 2019 +
Commit: David Seifert gentoo org>
CommitDate: Tue Dec 24 11:53:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c93764
x11-themes/nimbus: Port to EAPI 7
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
.../nimbus/files/nimbus-0.1.7-fix-themes.patch | 43 +++
x11-themes/nimbus/nimbus-0.1.7-r1.ebuild | 62 +++---
2 files changed, 74 insertions(+), 31 deletions(-)
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 000..8135bb1dfd2
--- /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 44cf2230a16..6ee30e99e32 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' \
+
[gentoo-commits] repo/gentoo:master commit in: x11-themes/nimbus/
commit: 305a19633a95638d30b89b933bf5aba955eadce3
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Nov 27 11:17:21 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Nov 27 11:20:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305a1963
x11-themes/nimbus: Use adwaita instead of dead gnome-icon-theme
Package-Manager: portage-2.3.2
x11-themes/nimbus/nimbus-0.1.7-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
index d337041..c209592 100644
--- a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
+++ b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ IUSE="gtk minimal"
COMMON_DEPEND="gtk? ( x11-libs/gtk+:2 )"
RDEPEND="${COMMON_DEPEND}
- !minimal? ( || ( x11-themes/gnome-icon-theme
x11-themes/tango-icon-theme ) )"
+ !minimal? ( || ( x11-themes/adwaita-icon-theme
x11-themes/tango-icon-theme ) )"
DEPEND="${COMMON_DEPEND}
dev-util/intltool
virtual/pkgconfig
