summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurek Bartuszek <jurek@gentoo.org>2007-07-02 21:42:24 +0000
committerJurek Bartuszek <jurek@gentoo.org>2007-07-02 21:42:24 +0000
commit6b72212584de4db2af1a1c333548829f185bd632 (patch)
tree8199783bf333e98b0c53f04b305428df67274758 /dev-util
parentVersion bump (diff)
downloadgentoo-2-6b72212584de4db2af1a1c333548829f185bd632.tar.gz
gentoo-2-6b72212584de4db2af1a1c333548829f185bd632.tar.bz2
gentoo-2-6b72212584de4db2af1a1c333548829f185bd632.zip
dev-util/monodevelop: aspnetedit use flag now requires either firefox or seamonkey use flag to be enabled (bug #183968), fixed typo in configure.in which prevented the --disable-update-desktopdb option from being honored by configure script (bug #183956)
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/monodevelop/ChangeLog9
-rw-r--r--dev-util/monodevelop/files/monodevelop-0.14-configure.patch13
-rw-r--r--dev-util/monodevelop/monodevelop-0.14.ebuild17
3 files changed, 33 insertions, 6 deletions
diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index 7a04828df95b..1779a2d191d3 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/monodevelop
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.46 2007/07/01 19:09:25 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.47 2007/07/02 21:42:24 jurek Exp $
+
+ 02 Jul 2007; Jurek Bartuszek <jurek@gentoo.org>
+ files/monodevelop-0.14-configure.patch, monodevelop-0.14.ebuild:
+ - aspnetedit use flag now requires either firefox or seamonkey use flag to be
+ enabled (bug #183968)
+ - fixed typo in configure.in which prevented the --disable-update-desktopdb
+ option from being honored by configure script (bug #183956)
*monodevelop-0.14 (01 Jul 2007)
diff --git a/dev-util/monodevelop/files/monodevelop-0.14-configure.patch b/dev-util/monodevelop/files/monodevelop-0.14-configure.patch
index 4067dc104308..9af686801b9f 100644
--- a/dev-util/monodevelop/files/monodevelop-0.14-configure.patch
+++ b/dev-util/monodevelop/files/monodevelop-0.14-configure.patch
@@ -1,5 +1,5 @@
---- configure.in.old 2007-06-28 07:50:48.000000000 +0200
-+++ configure.in 2007-06-28 07:58:56.000000000 +0200
+--- configure.in.old 2007-07-02 22:59:22.000000000 +0200
++++ configure.in 2007-07-02 22:59:44.000000000 +0200
@@ -127,7 +127,7 @@
AC_ARG_ENABLE(java,
AC_HELP_STRING([--enable-java],
@@ -82,3 +82,12 @@
if test "x$enable_aspnet" = "xno"; then
enable_aspnetedit=no
+@@ -383,7 +383,7 @@
+
+ AC_ARG_ENABLE(update-desktopdb,
+ AC_HELP_STRING([--disable-update-desktopdb],
+- [disable the update-desktop-database after install [default=np]]),,
++ [disable the update-desktop-database after install [default=no]]),,
+ enable_update_desktopdb=yes)
+ AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
+
diff --git a/dev-util/monodevelop/monodevelop-0.14.ebuild b/dev-util/monodevelop/monodevelop-0.14.ebuild
index afeca3d1bbf3..0e5d9e731727 100644
--- a/dev-util/monodevelop/monodevelop-0.14.ebuild
+++ b/dev-util/monodevelop/monodevelop-0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.14.ebuild,v 1.1 2007/07/01 19:09:25 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.14.ebuild,v 1.2 2007/07/02 21:42:24 jurek Exp $
inherit autotools eutils fdo-mime mono multilib
@@ -42,8 +42,18 @@ DEPEND="${RDEPEND}
pkg_setup() {
if use aspnetedit && ! use aspnet; then
eerror
- eerror "You cannot install the ASP.NET visual designer unless you"
- eerror "enable ASP.NET support by enabling the aspnet use flag"
+ eerror "You cannot install the ASP.NET Visual Designer unless you"
+ eerror "add ASP.NET support by enabling the aspnet use flag"
+ eerror
+ die
+ fi
+
+ if use aspnetedit && ! ( use firefox || use seamonkey ); then
+ eerror
+ eerror "You cannot install the ASP.NET Visual Designer unless you"
+ eerror "add support for either Mozilla Firefox or Mozilla Seamonkey"
+ eerror "web browser by enabling the firefox or seamonkey use flag"
+ eerror "respectively"
eerror
die
fi
@@ -68,6 +78,7 @@ src_unpack() {
# We handle installation of aspdesigner.jar by ourselves
sed -i -e 's#old-install-files install-chrome-text$##g' \
+ -e 's#install-files install-manifest$##g' \
Extras/AspNetEdit/chrome/Makefile.am \
|| die "sed failed"
sed -i -e 's#@prefix@/lib/monodevelop/AddIns/AspNetEdit/##g' \