commit: 2627f95eb9b40367a899cd86e7a88ce958f1b87c Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Dec 28 22:00:17 2018 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Fri Dec 28 23:30:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2627f95e
x11-themes/gnome-themes-extra: add 3.28 release Package-Manager: Portage-2.3.53, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> .../gnome-themes-standard-3.14.2.3-srcdir.patch | 26 ---------------------- ...-9999.ebuild => gnome-themes-extra-3.28.ebuild} | 17 +++----------- .../gnome-themes-extra-9999.ebuild | 2 -- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/x11-themes/gnome-themes-extra/files/gnome-themes-standard-3.14.2.3-srcdir.patch b/x11-themes/gnome-themes-extra/files/gnome-themes-standard-3.14.2.3-srcdir.patch deleted file mode 100644 index 717613b4..00000000 --- a/x11-themes/gnome-themes-extra/files/gnome-themes-standard-3.14.2.3-srcdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From db1e859fa27a4d3ca8a45937c2730f83c34405c6 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Sat, 28 Mar 2015 00:28:16 -0400 -Subject: [PATCH] HC: fix out-of-tree builds - -https://bugzilla.gnome.org/show_bug.cgi?id=746920 ---- - themes/HighContrast/icons/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am -index 76e824d..5545157 100644 ---- a/themes/HighContrast/icons/Makefile.am -+++ b/themes/HighContrast/icons/Makefile.am -@@ -6,7 +6,7 @@ render_sizes = "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" - THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$$size/* -type d`; do printf "$$dir,"; done; done;) - - %.theme: %.theme.in Makefile -- dirs="`echo $(THEME_DIRS) | sed -e 's#\./##g'`"; \ -+ dirs="`echo $(THEME_DIRS) | sed -e \"s#$(srcdir)/*##g\"`"; \ - sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ - echo "" >> $@; \ - for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \ --- -2.3.3 - diff --git a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild b/x11-themes/gnome-themes-extra/gnome-themes-extra-3.28.ebuild similarity index 58% copy from x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild copy to x11-themes/gnome-themes-extra/gnome-themes-extra-3.28.ebuild index f2b43713..2df1ada7 100644 --- a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild +++ b/x11-themes/gnome-themes-extra/gnome-themes-extra-3.28.ebuild @@ -4,9 +4,6 @@ EAPI=6 inherit autotools gnome.org -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Standard Themes for GNOME Applications" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"; @@ -14,16 +11,10 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"; LICENSE="LGPL-2.1+" SLOT="0" IUSE="" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -fi - -# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose -# their default background image +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + RDEPEND=" - >=gnome-base/gsettings-desktop-schemas-3.4 + !x11-themes/gnome-themes-standard " DEPEND=" >=dev-util/intltool-0.40 @@ -32,8 +23,6 @@ DEPEND=" " PATCHES=( - # https://bugzilla.gnome.org/show_bug.cgi?id=746920 - "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch # Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita "${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch ) diff --git a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild b/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild index f2b43713..3601cc9b 100644 --- a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild +++ b/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild @@ -32,8 +32,6 @@ DEPEND=" " PATCHES=( - # https://bugzilla.gnome.org/show_bug.cgi?id=746920 - "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch # Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita "${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch )
