Version bump, drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 27 insertions, 121 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index acc55e4acc12..c9e3baa3e397 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.88 2015/03/15 13:23:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.89 2015/03/28 09:33:14 pacho Exp $
+
+*gnome-shell-3.14.4 (28 Mar 2015)
+
+  28 Mar 2015; Pacho Ramos <pacho@gentoo.org> +gnome-shell-3.14.4.ebuild,
+  -files/gnome-shell-3.10-bluetooth-flag.patch,
+  -files/gnome-shell-3.10.4-bluetooth-gold.patch,
+  -files/gnome-shell-defaults.patch, -gnome-shell-3.12.2.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.14.3.ebuild:
   x86 stable, bug 534012
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch
deleted file mode 100644
index e74e18f6806b..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d15e9df8903c05fa0e355b3b1b133171c706d3ac Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Thu, 28 Feb 2013 18:48:32 +0330
-Subject: [PATCH 2/3] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 334323a..e749ca6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -116,6 +116,10 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
- PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
- 
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth],
-+	AS_HELP_STRING([--without-bluetooth],
-+		[Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -128,6 +132,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
- 	 AC_SUBST([HAVE_BLUETOOTH],[0])
- 	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
--- 
-1.8.5.1
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
deleted file mode 100644
index b688dd623cfb..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
- ld.gold
-
-For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
-the libgnome-bluetooth-applet must be linked to the binary that actually
-uses a function from libgnome-bluetooth-applet, i.e. to libgnome-shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726435
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f489a56..79838a3 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
- libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
- 
- libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
--libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
-+libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS) libgnome-shell-base.la
- libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
- 
- if HAVE_MUTTER_WAYLAND
--- 
-1.9.0
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
deleted file mode 100644
index 80634c100d19..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4fd7696fc9f392a11b91fa3fc7fe14ac7734ee62 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/3] Alter list of default applications
-
----
- data/org.gnome.shell.gschema.xml.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
-index dc27e47..e8de0ed 100644
---- a/data/org.gnome.shell.gschema.xml.in.in
-+++ b/data/org.gnome.shell.gschema.xml.in.in
-@@ -22,7 +22,7 @@
-       </_description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-       <_summary>List of desktop file IDs for favorite applications</_summary>
-       <_description>
-         The applications corresponding to these identifiers
--- 
-1.8.5.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
index c4d63af763ba..12f0fdd1c5bd 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.2.ebuild,v 1.4 2014/07/23 15:17:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild,v 1.1 2015/03/28 09:33:14 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
 
@@ -16,25 +16,24 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +i18n +networkmanager -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
 #  * gstreamer support is currently automagic
-#  * mutter/mutter-wayland support is automagic
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2[introspection]
 	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.39.1:2
+	>=dev-libs/glib-2.39.1:2[dbus]
 	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.13.2:3[introspection]
 	>=media-libs/clutter-1.15.90:1.0[introspection]
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.8:0.6
 	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.12
+	>=gnome-base/gsettings-desktop-schemas-3.14
 	>=gnome-base/gnome-keyring-3.3.90
 	gnome-base/libgnome-keyring
 	>=gnome-extra/evolution-data-server-3.5.3:=
@@ -44,7 +43,7 @@ COMMON_DEPEND="
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
 	x11-libs/libXtst
-	>=x11-wm/mutter-3.12.1[introspection]
+	>=x11-wm/mutter-3.14.4[introspection]
 	>=x11-libs/startup-notification-0.11
 
 	${PYTHON_DEPS}
@@ -120,14 +119,14 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}/${PN}-defaults.patch"
+	epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
 
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
+	epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
 
 	# Fix silent bluetooth linking failure with ld.gold, bug #503952
 	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
+	epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
 
 	epatch_user
 
@@ -154,14 +153,15 @@ src_install() {
 	# Required for gnome-shell on hardened/PaX, bug #398941
 	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
 	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"
+		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
 	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"
-	fi
+		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
 	# Required for gnome-shell on hardened/PaX #457146 and #457194
 	# PaX EMUTRAMP need to be on
-	if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"
+	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+	else
+		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
 	fi
 }