[gentoo-commits] repo/gentoo:master commit in: x11-themes/gnome-themes-standard/files/, x11-themes/gnome-themes-standard/

[Mart Raudsepp]

commit:     8aa4ad2484e336060f9f2cae4a6e870ceca2119d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 21:00:29 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 21:19:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa4ad24

x11-themes/gnome-themes-standard: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-themes/gnome-themes-standard/Manifest          |  1 -
 ...ome-themes-standard-3.20.2-exclude-engine.patch | 48 ---------------------
 .../gnome-themes-standard-3.20.2-r1.ebuild         | 49 ----------------------
 3 files changed, 98 deletions(-)

diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 3ffde615387..ef8b10f395f 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,2 +1 @@
-DIST gnome-themes-standard-3.20.2.tar.xz 2878508 SHA256 9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915 SHA512 ce6dd2697e4afd5f36b6c362086eb5d5f3732ab863770f024e4970b2f7399b8ae6e49241de99bf8b558e4d80869ec1002d817f3dd9e7b8fbf9ea8da5a1d386fc WHIRLPOOL aa3e2f2f8a845cf6d1d09726cb58b113a8f4d6cf0cbf04b450602ba8ff17668dd827e0c2de40326f1a388d9a8998e03db4c301395a2e41ec3666e0c40cd23883
 DIST gnome-themes-standard-3.22.3.tar.xz 2904736 SHA256 61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a SHA512 aa2f3ad4d867732cd09df6adb4f48ed2757e3f28930ef791ba97a82007332c810d84dd1074ca518ec0fe71bd7d8b95404854bd799e3b1fe616e1809e8ee33501 WHIRLPOOL cf45ce25f1fec524364c39aa8e367678e353c0f20443ec5bb380f187cf44d76fdb3c602b6c96a74f16a4ac479bf856e6fb84ddbb7a5b869e69d7734652db9613

diff --git a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.20.2-exclude-engine.patch b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.20.2-exclude-engine.patch
deleted file mode 100644
index fd48594f6a3..00000000000
--- a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.20.2-exclude-engine.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 15f99289cfa0d845cb8381b7151c938ca8531698 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Mon, 3 Oct 2016 00:38:57 +0200
-Subject: [PATCH] Control build of gtk+2 adwaita theme engine from configure
-
-Rather than whole gtk+-2 theme.
-
-This only makes sense in Gentoo as the theme engine has been split to
-a separate package to allow gtk+2 free systems.
----
- themes/Adwaita/Makefile.am         | 6 +-----
- themes/Adwaita/gtk-2.0/Makefile.am | 2 ++
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am
-index 8583535..617b9a6 100644
---- a/themes/Adwaita/Makefile.am
-+++ b/themes/Adwaita/Makefile.am
-@@ -1,8 +1,4 @@
--SUBDIRS = gtk-3.0
--
--if GTK2_ENGINE
--SUBDIRS += gtk-2.0
--endif
-+SUBDIRS = gtk-2.0 gtk-3.0
- 
- THEME_NAME=Adwaita
- THEME_IN_FILES=index.theme.in
-diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
-index b78f7dc..1c73e67 100644
---- a/themes/Adwaita/gtk-2.0/Makefile.am
-+++ b/themes/Adwaita/gtk-2.0/Makefile.am
-@@ -1,3 +1,4 @@
-+if GTK2_ENGINE
- enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
- engine_LTLIBRARIES = libadwaita.la
- 
-@@ -5,6 +6,7 @@ libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS)
- libadwaita_la_SOURCES = adwaita_engine.c
- libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
- libadwaita_la_LIBADD =  $(GTK2_ENGINE_LIBS)
-+endif
- 
- themedir = $(datadir)/themes/Adwaita/gtk-2.0
- theme_DATA = gtkrc main.rc apps.rc
--- 
-2.10.0
-

diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild
deleted file mode 100644
index 6e55cdc5a28..00000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome.org
-
-DESCRIPTION="Standard Themes for GNOME Applications"
-HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
-# their default background image
-RDEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.4
-"
-DEPEND="
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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.20.2-exclude-engine.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		--disable-gtk2-engine \
-		--disable-gtk3-engine \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}