| 1 |
commit: 2627f95eb9b40367a899cd86e7a88ce958f1b87c |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 28 22:00:17 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 28 23:30:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2627f95e |
| 7 |
|
| 8 |
x11-themes/gnome-themes-extra: add 3.28 release |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 11 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
| 12 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
| 13 |
|
| 14 |
.../gnome-themes-standard-3.14.2.3-srcdir.patch | 26 ---------------------- |
| 15 |
...-9999.ebuild => gnome-themes-extra-3.28.ebuild} | 17 +++----------- |
| 16 |
.../gnome-themes-extra-9999.ebuild | 2 -- |
| 17 |
3 files changed, 3 insertions(+), 42 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index 717613b4..00000000 |
| 22 |
--- a/x11-themes/gnome-themes-extra/files/gnome-themes-standard-3.14.2.3-srcdir.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,26 +0,0 @@ |
| 25 |
-From db1e859fa27a4d3ca8a45937c2730f83c34405c6 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
| 27 |
-Date: Sat, 28 Mar 2015 00:28:16 -0400 |
| 28 |
-Subject: [PATCH] HC: fix out-of-tree builds |
| 29 |
- |
| 30 |
-https://bugzilla.gnome.org/show_bug.cgi?id=746920 |
| 31 |
---- |
| 32 |
- themes/HighContrast/icons/Makefile.am | 2 +- |
| 33 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
- |
| 35 |
-diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am |
| 36 |
-index 76e824d..5545157 100644 |
| 37 |
---- a/themes/HighContrast/icons/Makefile.am |
| 38 |
-+++ b/themes/HighContrast/icons/Makefile.am |
| 39 |
-@@ -6,7 +6,7 @@ render_sizes = "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" |
| 40 |
- THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$$size/* -type d`; do printf "$$dir,"; done; done;) |
| 41 |
- |
| 42 |
- %.theme: %.theme.in Makefile |
| 43 |
-- dirs="`echo $(THEME_DIRS) | sed -e 's#\./##g'`"; \ |
| 44 |
-+ dirs="`echo $(THEME_DIRS) | sed -e \"s#$(srcdir)/*##g\"`"; \ |
| 45 |
- sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ |
| 46 |
- echo "" >> $@; \ |
| 47 |
- for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \ |
| 48 |
--- |
| 49 |
-2.3.3 |
| 50 |
- |
| 51 |
|
| 52 |
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 |
| 53 |
similarity index 58% |
| 54 |
copy from x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild |
| 55 |
copy to x11-themes/gnome-themes-extra/gnome-themes-extra-3.28.ebuild |
| 56 |
index f2b43713..2df1ada7 100644 |
| 57 |
--- a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild |
| 58 |
+++ b/x11-themes/gnome-themes-extra/gnome-themes-extra-3.28.ebuild |
| 59 |
@@ -4,9 +4,6 @@ |
| 60 |
EAPI=6 |
| 61 |
|
| 62 |
inherit autotools gnome.org |
| 63 |
-if [[ ${PV} = 9999 ]]; then |
| 64 |
- inherit gnome2-live |
| 65 |
-fi |
| 66 |
|
| 67 |
DESCRIPTION="Standard Themes for GNOME Applications" |
| 68 |
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/" |
| 69 |
@@ -14,16 +11,10 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/" |
| 70 |
LICENSE="LGPL-2.1+" |
| 71 |
SLOT="0" |
| 72 |
IUSE="" |
| 73 |
-if [[ ${PV} = 9999 ]]; then |
| 74 |
- KEYWORDS="" |
| 75 |
-else |
| 76 |
- 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" |
| 77 |
-fi |
| 78 |
- |
| 79 |
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose |
| 80 |
-# their default background image |
| 81 |
+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" |
| 82 |
+ |
| 83 |
RDEPEND=" |
| 84 |
- >=gnome-base/gsettings-desktop-schemas-3.4 |
| 85 |
+ !x11-themes/gnome-themes-standard |
| 86 |
" |
| 87 |
DEPEND=" |
| 88 |
>=dev-util/intltool-0.40 |
| 89 |
@@ -32,8 +23,6 @@ DEPEND=" |
| 90 |
" |
| 91 |
|
| 92 |
PATCHES=( |
| 93 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=746920 |
| 94 |
- "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch |
| 95 |
# Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita |
| 96 |
"${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch |
| 97 |
) |
| 98 |
|
| 99 |
diff --git a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild b/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild |
| 100 |
index f2b43713..3601cc9b 100644 |
| 101 |
--- a/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild |
| 102 |
+++ b/x11-themes/gnome-themes-extra/gnome-themes-extra-9999.ebuild |
| 103 |
@@ -32,8 +32,6 @@ DEPEND=" |
| 104 |
" |
| 105 |
|
| 106 |
PATCHES=( |
| 107 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=746920 |
| 108 |
- "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch |
| 109 |
# Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita |
| 110 |
"${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch |
| 111 |
) |
Archives