diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2015-08-23 01:44:11 +0100 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2015-08-23 01:59:38 +0100 |
| commit | 4ef6927a0a6964ff3ea3fb3df864bb9b356687fb (patch) | |
| tree | b43556bbd59a00c74eba99274f7f49b04dbd7eb2 /dev-util/bless | |
| parent | dev-util/ninja: Copy changes from live ebuild and restore ia64 keyword (diff) | |
| download | gentoo-4ef6927a0a6964ff3ea3fb3df864bb9b356687fb.tar.gz gentoo-4ef6927a0a6964ff3ea3fb3df864bb9b356687fb.tar.bz2 gentoo-4ef6927a0a6964ff3ea3fb3df864bb9b356687fb.zip | |
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 <ikelos@gentoo.org>
Diffstat (limited to 'dev-util/bless')
| -rw-r--r-- | dev-util/bless/bless-0.6.0-r2.ebuild | 6 | ||||
| -rw-r--r-- | 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 47e922021f26..3f0a08736ddd 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 000000000000..92b1100cf0e7 --- /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 |