From bcfdd1425cbf03b3f5b3a9b8b38139817fd2d9f6 Mon Sep 17 00:00:00 2001 From: Sobhan Mohammadpour Date: Sun, 28 Oct 2012 19:57:24 +0330 Subject: [PATCH] gnome-base/gnome-shell:3.6.0 -> 3.6.1 --- gnome-base/gnome-shell/Manifest | 2 +- gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild | 206 ------------------------ gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild | 206 ++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 207 deletions(-) delete mode 100644 gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild create mode 100644 gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 2fa6650..4da7607 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1 +1 @@ -DIST gnome-shell-3.6.0.tar.xz 1398568 SHA256 032ad32a4fa6c1f92010635e3076031323ac690f78c610184438c085c355e07b SHA512 65fc6c60903780aaf66882ae6ff60929be5018fd570e17404a715334c6b5ae6e17055d6269c51fee63ee3eb458a5cf06cb0bbed3554be108ded89e5b7af75dc3 WHIRLPOOL 7aa6761f6267aaa6aa6310b4ea3122a7925ae411fb3723dc58b00b7fa1bf0e60c2689d53585a35bd88593797151d82d9a61d40aa6c22442781c087c709b8ea15 +DIST gnome-shell-3.6.1.tar.xz 1398784 SHA256 566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7 SHA512 80968025ca36e05fb761730b1ad4d97cd37d259949f73409c6d81df482ce73700e371a8310a2a0537c289f25ec922a3bfb63a418473c8b1125bafa74000dca8c WHIRLPOOL 4716a55af449971875a52f130ccd1b67890c955971db2bd8b59663d12c3150209718cad39a6b11e262a65c053d6ac8439e24e36a13acaf1ed9df0162a332f94c diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild deleted file mode 100644 index 60c1640..0000000 --- a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" - -inherit autotools eutils gnome2 multilib pax-utils python -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -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 systemd" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -# libXfixes-5.0 needed for pointer barriers -# TODO: gstreamer support is currently automagical: -# gstreamer? ( >=media-libs/gstreamer-0.11.92 ) -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=app-crypt/gcr-3.3.90[introspection] - >=dev-libs/glib-2.31.6:2 - >=dev-libs/gjs-1.33.2 - >=dev-libs/gobject-introspection-0.10.1 - >=x11-libs/gtk+-3.3.9:3[introspection] - >=media-libs/clutter-1.11.11:1.0[introspection] - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.2:0.6 - >=gnome-base/gnome-desktop-3.5.1:3[introspection] - >=gnome-base/gsettings-desktop-schemas-3.5.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/gst-plugins-base-0.10.16:0.10 - >=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-${PV}[introspection] - >=x11-libs/startup-notification-0.11 - - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra - media-libs/mesa - media-sound/pulseaudio - net-libs/libsoup: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.8.999[introspection] ) - systemd? ( >=sys-apps/systemd-31 ) -" -# 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.3 - >=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-2.91 - >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] - - x11-misc/xdg-utils - - media-fonts/dejavu - x11-themes/gnome-icon-theme-symbolic - - i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - - !systemd? ( sys-auth/consolekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - 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 - -pkg_setup() { - DOCS="AUTHORS NEWS README" - # Don't error out on warnings - G2CONF="${G2CONF} - --enable-compile-warnings=maximum - --disable-schemas-compile - --disable-jhbuild-wrapper-script - $(use_with bluetooth) - $(use_enable networkmanager) - $(use_with systemd) - BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" - - # Make networkmanager optional, bug #398593 - epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" - - [[ ${PV} != 9999 ]] && eautoreconf - gnome2_src_prepare - - # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 - # Note: sed Makefile.in because it is generated from several Makefile.ams - sed -e 's/-DG_DISABLE_DEPRECATED//g' \ - -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-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[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \ - ! has_version 'media-plugins/gst-plugins-vp8'; 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-0.10.23" - ewarn "and media-plugins/gst-plugins-vp8, 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 "=media-libs/gstreamer-0.11.92 ) +COMMON_DEPEND=" + >=app-accessibility/at-spi2-atk-2.5.3 + >=app-crypt/gcr-3.3.90[introspection] + >=dev-libs/glib-2.31.6:2 + >=dev-libs/gjs-1.33.2 + >=dev-libs/gobject-introspection-0.10.1 + >=x11-libs/gtk+-3.3.9:3[introspection] + >=media-libs/clutter-1.11.11:1.0[introspection] + >=dev-libs/json-glib-0.13.2 + >=dev-libs/libcroco-0.6.2:0.6 + >=gnome-base/gnome-desktop-3.5.1:3[introspection] + >=gnome-base/gsettings-desktop-schemas-3.5.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/gst-plugins-base-0.10.16:0.10 + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.17.5[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + >=x11-wm/mutter-${PV}[introspection] + >=x11-libs/startup-notification-0.11 + + dev-libs/dbus-glib + dev-libs/libxml2:2 + gnome-base/librsvg + media-libs/libcanberra + media-libs/mesa + media-sound/pulseaudio + net-libs/libsoup: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.8.999[introspection] ) + systemd? ( >=sys-apps/systemd-31 ) +" +# 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.3 + >=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-2.91 + >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] + + x11-misc/xdg-utils + + media-fonts/dejavu + x11-themes/gnome-icon-theme-symbolic + + i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + + !systemd? ( sys-auth/consolekit ) +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17 + >=dev-util/intltool-0.40 + gnome-base/gnome-common + 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 + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + DOCS="AUTHORS NEWS README" + # Don't error out on warnings + G2CONF="${G2CONF} + --enable-compile-warnings=maximum + --disable-schemas-compile + --disable-jhbuild-wrapper-script + $(use_with bluetooth) + $(use_enable networkmanager) + $(use_with systemd) + BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" + + # Make networkmanager optional, bug #398593 + epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" + + [[ ${PV} != 9999 ]] && eautoreconf + gnome2_src_prepare + + # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 + # Note: sed Makefile.in because it is generated from several Makefile.ams + sed -e 's/-DG_DISABLE_DEPRECATED//g' \ + -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" +} + +src_install() { + gnome2_src_install + python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-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[jit]'; then + pax-mark m "${ED}usr/bin/gnome-shell" + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \ + ! has_version 'media-plugins/gst-plugins-vp8'; 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-0.10.23" + ewarn "and media-plugins/gst-plugins-vp8, 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 "