Run epatch_user (#473212 by Hristo Venev), drop old.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 13 insertions, 215 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 5dad67559020..60e5889a675a 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.37 2013/06/11 10:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.38 2013/06/14 18:57:27 pacho Exp $
+
+  14 Jun 2013; Pacho Ramos <pacho@gentoo.org> -gnome-shell-3.8.3.ebuild,
+  gnome-shell-3.8.3-r1.ebuild:
+  Run epatch_user (#473212 by Hristo Venev), drop old.
 
 *gnome-shell-3.8.3-r1 (11 Jun 2013)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index fa2c6871ce3d..50019f447042 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -11,14 +11,13 @@ AUX gnome-shell-3.8.3-relock-screen.patch 7530 SHA256 e2a0f02e9f3580935333552b56
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
 DIST gnome-shell-3.8.3.tar.xz 1513636 SHA256 145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22 SHA512 d95a7ce24073046ea196b1f299bef1a1f4581b3357da364162b7e1cc53d051e628625c0b74bcd835d60f77d39874c8e0f86e3f66c0205539179f64cbe983a16b WHIRLPOOL 9ed4566761115346f0db8e35b0da9f5409418e78176b5159a41541a6723e511bbdaa50b0808c387f8339651066452934732c5c384fabaa7a5427be8ab5e9ec9e
 EBUILD gnome-shell-3.6.3.1.ebuild 7138 SHA256 e8e1bf07cb3768a303714db4fd16b3ba59adc67624ee4b83de35a8b1a3d17f25 SHA512 600e3a5c38dfe9742d4d0540b8cc6a87fc5bf663d99cd76fcc160a0ce97f967e3d93fb750120e30abee8580c84c00cf8ba08190e9f856e34938afdb01ab3574b WHIRLPOOL 30c66e7a010818f69d0387c145041bdcc2354f44e83939796c9b3ace20e77b5e469838f055da342451baa24e940474f0aec4e74fce8e92434fbb98c0334de6c6
-EBUILD gnome-shell-3.8.3-r1.ebuild 7481 SHA256 109c1350d49a252f47d967101a6c0a61f21dcf072f7ecd990711055305199ed8 SHA512 da6f402f31e411972913623a65d1e23c8ed8682fcedc12ec84d37cd67a5c1da51c90e6cbb33bd88430d77f942ab78472f2775f4633b5c5e55100d7a7060004d0 WHIRLPOOL 576513cd3abbf349770bbf09de646bfc29b3d31b6220ec9034e44a008ea4e391588f582e061b2f7fa7acca0dff279518e57a6b25e9997628f9d356d15b19102b
-EBUILD gnome-shell-3.8.3.ebuild 7334 SHA256 9b0179a550ebe9e205df72c48378e5f9585e9b23ddd5daa787cb99aefe3d0d5a SHA512 89437d67fb83052737ee4f720a135178c301faa93d556f4389fedefb281e9dee5a385ea7dcb4a8237fa4f794feb8cec35988e07975a0bc6d1457cba4ff4919e4 WHIRLPOOL df891878402af49b6fa1367f18bcde00e50594763206505c8d96d3ecf4c1ac7eecd42e78ddb87e7a05de3948ca05a81482dbeeea440bd60af2779a44249aebeb
-MISC ChangeLog 9209 SHA256 48e6f651a518012612818d104fcca389816303f9d75f348eed1cad71cf43d7f1 SHA512 7a096b04d3cdc87e6aeef274666738a46a59f5ba6d611f2fab228d43bbcbd0f0e28c2361211adf5380813ef105305321ca85d5f03299745fc042ab86a2d05770 WHIRLPOOL 09a260699559cb03d4afab77181dbb17d00773c31a5140d6d02053079181feb94c6a61ceeddd1ab2b49b5ba2439f818c55d8a2d88247fd2fb3317dd09978ebc7
+EBUILD gnome-shell-3.8.3-r1.ebuild 7495 SHA256 273bb41e5e94b5c7d4aa60479f4e7ab7bd879a8a2c8dd8df81ead908f2ebe791 SHA512 7ba5100b00703cac02b8250475af9fff39ce26544b068ad35dc7e068fb02b899dc904bcb6eaadee917183f421ec5d74eb9dfa7c6b5a5be33d30cee8635a9dd35 WHIRLPOOL 92af13771f371a3c46512446490d3c7ac0ba94b98ab4233927dd554da86d8e07a18b5810e6ca68c515421962d4af1b7e2afbf8aa1c70407dcfdbdef9a3658b8b
+MISC ChangeLog 9369 SHA256 2502a0c3fe071b844d488ec85793f7c325f2e8cd7d65a1f61e32d1bb6b82eb98 SHA512 894e35df64997027d037a5e31d7d410fd4e8c627069409fb483598a67587b4c0c5990fe51e986619ec8ead6e3c537bde10a137b8f546b5771d1a762dfbb7c807 WHIRLPOOL de89074fc60fd5a85d6ef45d511bb9156cdfd38ab1bf3f1bc48171215981d4b51723cdccc74b0204390b10820b11a32f1826b6e543e5a73a3cdccb6de95e5a0a
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG3ArIACgkQCaWpQKGI+9RgkQCdEMe7fcp9DqmLzzYKlFJ8RHt6
-hLYAn1FQpaoM6w0qJ6h3MjOppG5IqIzh
-=a36S
+iEYEAREIAAYFAlG7Z5gACgkQCaWpQKGI+9Q1RgCeLVdv3Ls9V7J1qk1iL+H1O5Qs
+V1UAni4dDef64KKfLzJVyboZ/KXWQH+I
+=rQm2
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild
index e7e3c1e3025c..cc5255502819 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.3-r1.ebuild,v 1.1 2013/06/11 10:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.3-r1.ebuild,v 1.2 2013/06/14 18:57:27 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -130,6 +130,8 @@ src_prepare() {
 	# Re-lock the screen if we're restarted from a previously crashed shell (from 'master')
 	epatch "${FILESDIR}/${PN}-3.8.3-relock-screen.patch"
 
+	epatch_user
+
 	eautoreconf
 	gnome2_src_prepare
 }
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.3.ebuild
deleted file mode 100644
index 89f37dc31937..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.8.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2013 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.8.3.ebuild,v 1.1 2013/06/09 19:27:42 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit autotools eutils gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# TODO: gstreamer support is currently automagical:
-# gstreamer? ( >=media-libs/gstreamer-0.11.92 )
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-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.35:2
-	>=dev-libs/gjs-1.35.8
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.7.9:3[introspection]
-	>=media-libs/clutter-1.13.4:1.0[introspection]
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.7.4
-	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-3.5.3:3[introspection]
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-3.5.3:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/mutter-3.8.3[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] )
-	networkmanager? ( >=net-misc/networkmanager-0.9.6[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 7. IBus is needed for i18n integration
-# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	|| ( sys-auth/consolekit >=sys-apps/systemd-31 )
-	i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] )
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.7.90-bluetooth-flag.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.8.3-networkmanager-flag.patch"
-
-	# Revert suspend break, upstream bug #693162 (from Debian)
-	epatch "${FILESDIR}/${PN}-3.8.0-suspend.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		--disable-jhbuild-wrapper-script \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# 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"
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"
-	fi
-	# 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"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
-		ewarn "fallback mode, or switch to open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if has_version "media-libs/mesa[video_cards_intel]" ||
-	   has_version "media-libs/mesa[video_cards_i915]" ||
-	   has_version "media-libs/mesa[video_cards_i965]"; then
-		elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
-		elog "Make sure that classic architecture for i915 and i965 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[classic]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=classic."
-		fi
-	fi
-}