From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4153C138330 for ; Mon, 12 Sep 2016 17:48:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56B5DE080B; Mon, 12 Sep 2016 17:48:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23F57E080B for ; Mon, 12 Sep 2016 17:48:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F095C340A5D for ; Mon, 12 Sep 2016 17:48:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5B432464 for ; Mon, 12 Sep 2016 17:48:12 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1473702489.2d40752985d61f765c23ef4f5ba60e172e8972cc.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild X-VCS-Directories: mate-base/mate-applets/files/ mate-base/mate-applets/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 2d40752985d61f765c23ef4f5ba60e172e8972cc X-VCS-Branch: master Date: Mon, 12 Sep 2016 17:48:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3359bab-845a-4288-b23f-2aeed3c9b1f2 X-Archives-Hash: 2660e93f97c1548a9ae975882284630a commit: 2d40752985d61f765c23ef4f5ba60e172e8972cc Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 12 17:47:25 2016 +0000 Commit: NP Hardass gentoo org> CommitDate: Mon Sep 12 17:48:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d407529 mate-base/mate-applets: Drop mate-icon-theme requirement, #593474 Package-Manager: portage-2.3.0 .../mate-applets-1.10.4-drop-icon-theme-dep.patch | 33 ++++++++++++++++++++++ ...0.4-r1.ebuild => mate-applets-1.10.4-r2.ebuild} | 16 +++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch new file mode 100644 index 00000000..4137029 --- /dev/null +++ b/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch @@ -0,0 +1,33 @@ +From 0a9439346e00aded616fe99773ffec2f3f7bcc49 Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Thu, 1 Oct 2015 00:27:53 +0200 +Subject: [PATCH] drop dpendency to mate-icon-theme + +The dependency is not really needed; depending on GTK+ should be enough +to guarantee the presence of a spec-compliant icon theme. +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b69e1a4..284dba7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,6 @@ LIBNOTIFY_REQUIRED=0.7.0 + UPOWER_REQUIRED=0.9.4 + DBUS_REQUIRED=1.1.2 + DBUS_GLIB_REQUIRED=0.74 +-MATE_ICON_THEME_REQUIRED=1.1.0 + LIBXML_REQUIRED=2.5.0 + POLKIT_REQUIRED=0.92 + dnl *************************************************************************** +@@ -122,9 +121,6 @@ dnl *************************************************************************** + dnl *** Use pkg-config to check for dependancies *** + dnl *************************************************************************** + +-dnl -- Check for mate-icon-theme (required) ---------------------------------- +-PKG_CHECK_MODULES(GIT, mate-icon-theme >= $MATE_ICON_THEME_REQUIRED) +- + dnl -- check for gio (required) ------------------------------------------ + PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0) + AC_SUBST(GIO_CFLAGS) diff --git a/mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild similarity index 88% rename from mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild rename to mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild index ebfebd0..fdde0c2 100644 --- a/mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild +++ b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild @@ -7,7 +7,7 @@ EAPI="5" GCONF_DEBUG="no" PYTHON_COMPAT=( python2_7 ) -inherit eutils gnome2 python-single-r1 versionator +inherit eutils gnome2 python-single-r1 autotools versionator MATE_BRANCH="$(get_version_component_range 1-2)" @@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org" LICENSE="GPL-2 FDL-1.1 LGPL-2" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="X ipv6 policykit +upower" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -45,7 +45,6 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libX11:0 >=x11-libs/libwnck-2.30:1 x11-libs/pango:0 - >=x11-themes/mate-icon-theme-1.10:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.92:0 )" @@ -59,6 +58,17 @@ DEPEND="${RDEPEND} sys-devel/gettext:* virtual/pkgconfig:*" +PATCHES=( + "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" + "${FILESDIR}/${PN}-1.10.4-drop-icon-theme-dep.patch" +) + +src_prepare() { + epatch ${PATCHES[@]} + eautoreconf + gnome2_src_prepare +} + src_configure() { gnome2_src_configure \ --libexecdir=/usr/libexec/mate-applets \