From f9ed07493b27fe89543a7d04716f6ea13d0fcf34 Mon Sep 17 00:00:00 2001 From: Sobhan Mohammadpour Date: Wed, 24 Oct 2012 19:52:16 +0330 Subject: [PATCH] gnome-base/gnome-shell: 3.6.0 -> 3.6.1 --- gnome-base/gnome-shell/Manifest | 4 ++-- ...shell-3.6.0.ebuild => gnome-shell-3.6.1.ebuild} | 26 +++++++++------------- 2 files changed, 12 insertions(+), 18 deletions(-) rename gnome-base/gnome-shell/{gnome-shell-3.6.0.ebuild => gnome-shell-3.6.1.ebuild} (95%) diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index bbadd8c..b3613c8 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,5 +1,5 @@ AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df17f8d0fcd4b6fe75fed709c8c97a55bf401970e SHA512 37e4d252d62abfe264c639e47906afa5cd17d159101072ff4ed5ddb5dfc62b4563d80c4632d50bf20c1c62cbc1bdc2a6dc2b34f4e5cc9387095dc3f5606917d8 WHIRLPOOL 6db0c6907947fc86b932f7e391f465712fce5fcd731c6be11da61678c6452e93686c818491b914155a2793ff7ff73ded540de77059ecc498ddadf81a7382714f AUX gnome-shell-3.6.0-networkmanager-flag.patch 8352 SHA256 90f971920a04d9d1a828008ca3230c4e215a0d5370ffdf9ab6bf740829f5e85d SHA512 ea85a20a3416da2a0cdd9ea20b5f868ab69f3a1326142da89d259c5e0d67e3f7b4a722ff0a6be29ba2cb224f72a998edec89eda5ee905342c4c5cadfa3964ee4 WHIRLPOOL 2a75f3b9d897aa5d368f124832e476b3b971c6794256a32e150157cd7a8055d62ae1076a3d0ddac16796535e5b0598df22ea267b6d0c2c58f9c1a0d61ed3e35b -DIST gnome-shell-3.6.0.tar.xz 1398568 SHA256 032ad32a4fa6c1f92010635e3076031323ac690f78c610184438c085c355e07b SHA512 65fc6c60903780aaf66882ae6ff60929be5018fd570e17404a715334c6b5ae6e17055d6269c51fee63ee3eb458a5cf06cb0bbed3554be108ded89e5b7af75dc3 WHIRLPOOL 7aa6761f6267aaa6aa6310b4ea3122a7925ae411fb3723dc58b00b7fa1bf0e60c2689d53585a35bd88593797151d82d9a61d40aa6c22442781c087c709b8ea15 -EBUILD gnome-shell-3.6.0.ebuild 6989 SHA256 0ad589c0088b686d8054b9d135a0ba9a746821c58df910a371d7b013ff229e0e SHA512 1566ed7c706bc463c69dbf08bd5ece55321f79f1f45dd0ff665d6a23e5786d2a739656f7ee10ed795e95069e798717d05bb1233816b588ab5279a6cd5aa104b8 WHIRLPOOL 3901fd06b597290718469529259717659aff9ca053c12976e10a25eaa2ca8c69c2b9b94b96ad4606a829c41b47d27d1e6715a4572a5aa254158363182f8df723 +DIST gnome-shell-3.6.1.tar.xz 1398784 SHA256 566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7 SHA512 80968025ca36e05fb761730b1ad4d97cd37d259949f73409c6d81df482ce73700e371a8310a2a0537c289f25ec922a3bfb63a418473c8b1125bafa74000dca8c WHIRLPOOL 4716a55af449971875a52f130ccd1b67890c955971db2bd8b59663d12c3150209718cad39a6b11e262a65c053d6ac8439e24e36a13acaf1ed9df0162a332f94c +EBUILD gnome-shell-3.6.1.ebuild 6986 SHA256 1e9f37342ad6668effbe22488ec9aa444a51c2c1df957260c6a5302df402270a SHA512 31945715533069ef8ff80fb4fa99a4ca3e663b7a2c685eb004cb3b5067681f6f375179211b50e7bb4e3be7e440004bb3af976e9540ff033dc4cef20a9309754e WHIRLPOOL 492ae4535dfc0336ef0689faa420732aada6f35d384f650cad832ede5764050964db85a49fdd3dca926e520e634b96cc4db07215c4083083bc39e8fe6c26e860 EBUILD gnome-shell-9999.ebuild 6989 SHA256 0ad589c0088b686d8054b9d135a0ba9a746821c58df910a371d7b013ff229e0e SHA512 1566ed7c706bc463c69dbf08bd5ece55321f79f1f45dd0ff665d6a23e5786d2a739656f7ee10ed795e95069e798717d05bb1233816b588ab5279a6cd5aa104b8 WHIRLPOOL 3901fd06b597290718469529259717659aff9ca053c12976e10a25eaa2ca8c69c2b9b94b96ad4606a829c41b47d27d1e6715a4572a5aa254158363182f8df723 diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild similarity index 95% rename from gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild index 60c1640..4058278 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild @@ -45,22 +45,16 @@ COMMON_DEPEND=" >=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] + >=net-libs/telepathy-glib-0.17.5e[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] + 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] ) @@ -116,6 +110,11 @@ DEPEND="${COMMON_DEPEND} # 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} @@ -126,11 +125,6 @@ pkg_setup() { $(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" -- 1.7.12.4