[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-utils/

["NP Hardass" <np-hardass@gentoo.org>]

commit:     6a5597b826cddc790d1fbbd8af161adbb7b2b05d
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 18:44:25 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 19:35:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5597b8

mate-extra/mate-utils: Make utils available on all DEs, #585252

Package-Manager: portage-2.3.0

 mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild | 90 +++++++++++++++++++++++
 mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild |  8 ++
 2 files changed, 98 insertions(+)

diff --git a/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild
new file mode 100644
index 00000000..8005839
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Utilities for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="X applet ipv6 test"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4:0[gtk]
+	sys-libs/zlib:0
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.10:0 )"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50:*
+	>=mate-base/mate-common-1.10:0
+	x11-proto/xextproto:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove -D.*DISABLE_DEPRECATED cflagss
+	# This method is kinda prone to breakage. Recheck carefully with next bump.
+	# bug 339074
+	LC_ALL=C find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	LC_ALL=C find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+	if ! use test; then
+		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die
+	fi
+
+	# Fix up desktop files.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e 's/Categories\(.*\)MATE/Categories\1X-MATE/' -i {} + || die
+
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+}
+
+src_configure() {
+	local myconf
+	if ! use debug; then
+		myconf="${myconf} --enable-debug=minimum"
+	fi
+
+	gnome2_src_configure \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6) \
+		$(use_with X x) \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		${myconf}
+}
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"

diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
index 1022226..5369732 100644
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
@@ -52,6 +52,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" )
 
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
 src_configure() {
 	mate_src_configure \
 		--disable-maintainer-flags \