From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C3174138010 for ; Sun, 28 Oct 2012 17:29:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E850E0675; Sun, 28 Oct 2012 17:29:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E09DE0662 for ; Sun, 28 Oct 2012 17:29:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B176233D937 for ; Sun, 28 Oct 2012 17:29:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C012E5447 for ; Sun, 28 Oct 2012 17:29:12 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1351445337.076d4beb76e46e1648c98cbf5bda3a4569f2cc18.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 076d4beb76e46e1648c98cbf5bda3a4569f2cc18 X-VCS-Branch: master Date: Sun, 28 Oct 2012 17:29:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a75e094-6542-4475-9970-9d64b539bce9 X-Archives-Hash: e40c7dee53384727cff0f1da52051f15 commit: 076d4beb76e46e1648c98cbf5bda3a4569f2cc18 Author: Sobhan Mohammadpour yahoo fr> AuthorDate: Sun Oct 28 16:27:24 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Oct 28 17:28:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=076d4beb gnome-base/gnome-shell: 3.6.0 → 3.6.1 [GD] Drop sed, it is handled by eclass. Signed-off-by: Gilles Dartiguelongue gentoo.org> --- ...shell-3.6.0.ebuild => gnome-shell-3.6.1.ebuild} | 14 +++++--------- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) 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 96% 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..a8612d2 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild @@ -116,6 +116,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 +131,7 @@ 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" @@ -139,11 +140,6 @@ src_prepare() { [[ ${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() { diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 60c1640..a8612d2 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -116,6 +116,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 +131,7 @@ 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" @@ -139,11 +140,6 @@ src_prepare() { [[ ${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() {