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 B9FEE13827E for ; Thu, 12 Dec 2013 08:18:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C56A4E0ACF; Thu, 12 Dec 2013 08:18:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EDF6E0AC4 for ; Thu, 12 Dec 2013 08:18:15 +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 37DAE33F217 for ; Thu, 12 Dec 2013 08:18:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D8D0519002B for ; Thu, 12 Dec 2013 08:18: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: <1386836262.84abbb01baa19f2935ee46b2bd063e80e9238e94.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild gnome-base/gnome-menus/gnome-menus-9999.ebuild X-VCS-Directories: gnome-base/gnome-menus/ gnome-base/gnome-menus/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 84abbb01baa19f2935ee46b2bd063e80e9238e94 X-VCS-Branch: master Date: Thu, 12 Dec 2013 08:18: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: 44895c14-9b4c-4037-9769-f48c2421688c X-Archives-Hash: c551d22c4263b047ffa361d5b4d58187 commit: 84abbb01baa19f2935ee46b2bd063e80e9238e94 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Dec 12 08:01:35 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Dec 12 08:17:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84abbb01 gnome-base/gnome-menus: 3.8.1 → 3.10.1 --- gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 | 6 -- ... gnome-menus-3.8.0-ignore_kde_standalone.patch} | 29 ++++-- gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild | 51 ++++++++++ gnome-base/gnome-menus/gnome-menus-9999.ebuild | 103 +++++---------------- 4 files changed, 95 insertions(+), 94 deletions(-) diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 deleted file mode 100644 index 4bbf863..0000000 --- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; } -then - export XDG_MENU_PREFIX=gnome- -fi diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch similarity index 56% rename from gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch rename to gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch index 5f5f8b2..ab6cb92 100644 --- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch +++ b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch @@ -1,9 +1,21 @@ ---- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300 -+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300 -@@ -146,6 +146,19 @@ +From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Mon, 25 Feb 2013 16:36:44 +0330 +Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone + +--- + layout/gnome-applications.menu | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu +index 9242eff..94ea6d4 100644 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu +@@ -277,7 +277,19 @@ + Core Screensaver - X-GNOME-Settings-Panel +- + X-KDE-settings-accessibility + X-KDE-settings-components + X-KDE-settings-desktop @@ -17,6 +29,9 @@ + X-KDE-settings-sound + X-KDE-settings-system + X-KDE-information - - - + + gnome-eog.desktop + gnome-file-roller.desktop +-- +1.8.1.2 + diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild new file mode 100644 index 0000000..805f71c --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +GCONF_DEBUG="no" + +inherit gnome2 + +DESCRIPTION="Library for the Desktop Menu fd.o specification" +HOMEPAGE="https://git.gnome.org/browse/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="debug +introspection test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) +" +# Older versions of slot 0 install the menu editor and the desktop directories + +RDEPEND="${COMMON_DEPEND} + !=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - python? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] )" +" # Older versions of slot 0 install the menu editor and the desktop directories + RDEPEND="${COMMON_DEPEND} - ! /dev/null || die - "$@" - popd > /dev/null + gnome2_src_configure \ + $(usex debug --enable-debug=yes --enable-debug=minimum) \ + $(use_enable introspection) \ + --disable-static }