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 CE76413988E for ; Sun, 23 Aug 2015 01:00:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C11F8E0886; Sun, 23 Aug 2015 01:00:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A29FE0886 for ; Sun, 23 Aug 2015 01:00:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00588340943 for ; Sun, 23 Aug 2015 01:00:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4330E14B for ; Sun, 23 Aug 2015 01:00:14 +0000 (UTC) From: "Mike Auty" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Auty" Message-ID: <1440291578.4ef6927a0a6964ff3ea3fb3df864bb9b356687fb.ikelos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bless/, dev-util/bless/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bless/bless-0.6.0-r2.ebuild dev-util/bless/files/bless-0.6.0-mono-4.patch X-VCS-Directories: dev-util/bless/ dev-util/bless/files/ X-VCS-Committer: ikelos X-VCS-Committer-Name: Mike Auty X-VCS-Revision: 4ef6927a0a6964ff3ea3fb3df864bb9b356687fb X-VCS-Branch: master Date: Sun, 23 Aug 2015 01:00:14 +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: 53c3eef7-ad26-4893-bebe-4e3970f9724f X-Archives-Hash: ad2f230db9bb8c481ad5ca679dd1b31b commit: 4ef6927a0a6964ff3ea3fb3df864bb9b356687fb Author: Mike Auty gentoo org> AuthorDate: Sun Aug 23 00:44:11 2015 +0000 Commit: Mike Auty gentoo org> CommitDate: Sun Aug 23 00:59:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef6927a dev-util/bless: Update for monolithic gtk-sharp & mono-4 Changed the dependencies to cope with the unannounced monolithic gtk-sharp ebuild which blocks on packages such as bless that need glade-sharp. Also introduced a patch to use mcs rather than the depreacted gmcs. Package-Manager: portage-2.2.20.1 Signed-off-by: Mike Auty gentoo.org> dev-util/bless/bless-0.6.0-r2.ebuild | 6 +++-- dev-util/bless/files/bless-0.6.0-mono-4.patch | 36 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild index 47e9220..3f0a087 100644 --- a/dev-util/bless/bless-0.6.0-r2.ebuild +++ b/dev-util/bless/bless-0.6.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,7 +19,8 @@ IUSE="debug" RDEPEND=" >=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/glade-sharp-2.12 + || ( >=dev-dotnet/gtk-sharp-2.12.21 + >=dev-dotnet/glade-sharp-2.12 ) " DEPEND="${RDEPEND} app-text/scrollkeeper @@ -42,6 +43,7 @@ src_prepare() { ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" epatch "${FILESDIR}/${P}-pixmap.patch" epatch "${FILESDIR}/${P}-docpath.patch" + epatch "${FILESDIR}/${P}-mono-4.patch" eautoreconf gnome2_src_prepare } diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch new file mode 100644 index 0000000..92b1100 --- /dev/null +++ b/dev-util/bless/files/bless-0.6.0-mono-4.patch @@ -0,0 +1,36 @@ +diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs +index 0f62e92..7edb1ab 100644 +--- a/builder/ModuleBuilder.cs ++++ b/builder/ModuleBuilder.cs +@@ -119,7 +119,7 @@ public class ModuleBuilder + //System.Console.WriteLine("gmcs {0}", sb.ToString()); + System.Console.WriteLine(">> Building module {0}...", module.Name); + +- Process buildProcess = Process.Start("gmcs", sb.ToString()); ++ Process buildProcess = Process.Start("mcs", sb.ToString()); + buildProcess.WaitForExit(); + + if (buildProcess.ExitCode == 0) { +@@ -137,4 +137,4 @@ public class ModuleBuilder + } + + +-} +\ No newline at end of file ++} +diff --git a/configure.ac b/configure.ac +index 415cc64..a8e527c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then + fi + + # C# compiler +-AC_PATH_PROG(MCS, gmcs, no) ++AC_PATH_PROG(MCS, mcs, no) + +-CS="gmcs C#" ++CS="mcs C#" + if test "x$MCS" = "xno" ; then + AC_MSG_ERROR([No $CS compiler found]) + fi