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)

Package-Manager: portage-2.1.2.9

4 files changed, 48 insertions, 21 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/Manifest b/dev-util/monodevelop/Manifest
index 19b783a3c466..816f87418198 100644
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@ -9,10 +9,10 @@ AUX monodevelop-0.14-aspnet-template-fix.patch 527 RMD160 880a6f02daa88c78231bd8
 MD5 7b3d4626af494c519f7f18f138953f2e files/monodevelop-0.14-aspnet-template-fix.patch 527
 RMD160 880a6f02daa88c78231bd82a717fad9cf9a99aa6 files/monodevelop-0.14-aspnet-template-fix.patch 527
 SHA256 699b5aedac949243aa9e6047dc8f04a257d2f5cd21190452a94d88767caeedbb files/monodevelop-0.14-aspnet-template-fix.patch 527
-AUX monodevelop-0.14-configure.patch 3521 RMD160 6166e388966c750fad748938b5f4e24a66306e70 SHA1 1b2aca7ec3781c253a20824535a4504adf164f8b SHA256 a91d0030d3a7df0952f61e0a53e0ec37018e485712e44e04bde69766f35583ce
-MD5 cf142e221eb116f837b1b329d11937ae files/monodevelop-0.14-configure.patch 3521
-RMD160 6166e388966c750fad748938b5f4e24a66306e70 files/monodevelop-0.14-configure.patch 3521
-SHA256 a91d0030d3a7df0952f61e0a53e0ec37018e485712e44e04bde69766f35583ce files/monodevelop-0.14-configure.patch 3521
+AUX monodevelop-0.14-configure.patch 3932 RMD160 ce41b739aeb517612e17f507c0ab82e1a333bbb8 SHA1 493f22f1d722f0161a68c243b2cfe54616d5d1be SHA256 5dc26c649ce1824ccf3f5a51eaa8b1e35d10ac44d95ea8504aeaef2f271cc882
+MD5 e01484d8faedecd7223967e7d934d8b0 files/monodevelop-0.14-configure.patch 3932
+RMD160 ce41b739aeb517612e17f507c0ab82e1a333bbb8 files/monodevelop-0.14-configure.patch 3932
+SHA256 5dc26c649ce1824ccf3f5a51eaa8b1e35d10ac44d95ea8504aeaef2f271cc882 files/monodevelop-0.14-configure.patch 3932
 DIST monodevelop-0.10.tar.gz 2794565 RMD160 9d64943e8af04cfdc48f9b8bfda757eb4df378c8 SHA1 ff26d7864d2478efe6bb93ee917ce5513534bef6 SHA256 0c40c490989eebb2aa08b1b37fbeced9a9f7961d9cfde962255211a90ac77b0b
 DIST monodevelop-0.12.tar.gz 3404805 RMD160 0c18f7001e72a9ae93858e3e003ff693e615186c SHA1 904b7b355297ecb1a4bac75003c8265bfd6aa141 SHA256 d2448f858f90af333c94e86d4a8c7234a9378ff8fde2f5541bdddbdcd7163807
 DIST monodevelop-0.14.tar.bz2 3227627 RMD160 a2b23ed1c3e51659ec4e5a4e5b48932fed90e9ad SHA1 b29762372464ec30301b485deade397919095ea6 SHA256 aa8b5fee3ecab96b64b453aff8b20ec7517d642d762745afe1356e695b3c7b3f
@@ -24,14 +24,14 @@ EBUILD monodevelop-0.12.ebuild 1358 RMD160 33b85c0201c70a50ccbddd11d191abcf9e21a
 MD5 8883e2d59d159b52e3e4e51e9cdc3b56 monodevelop-0.12.ebuild 1358
 RMD160 33b85c0201c70a50ccbddd11d191abcf9e21a3fb monodevelop-0.12.ebuild 1358
 SHA256 fa73f25ba9c7c798e6cc5c37e55bca06223f552b7cde4eba84b56c241a299803 monodevelop-0.12.ebuild 1358
-EBUILD monodevelop-0.14.ebuild 4221 RMD160 92e82b4281c1b24de781665d435f9660736dd38e SHA1 8036ce82c0dd9eeb29c17ec540609716ac144dc4 SHA256 8e2e7f88ccc115c0e9f25dcd7307a38ef93a11a5b3f0e16a263ea7dcadacbd2d
-MD5 9b47f9dadec88cf4c20bdcd40a8372e1 monodevelop-0.14.ebuild 4221
-RMD160 92e82b4281c1b24de781665d435f9660736dd38e monodevelop-0.14.ebuild 4221
-SHA256 8e2e7f88ccc115c0e9f25dcd7307a38ef93a11a5b3f0e16a263ea7dcadacbd2d monodevelop-0.14.ebuild 4221
-MISC ChangeLog 8644 RMD160 8d500707df7b26fce86d4a8cdd05a7e065e92f11 SHA1 510a466996c4bcdd84d937dcd11d84b51853fc56 SHA256 35a6a5ed91dc3bb2e0a9d8ed41cec5a869949bf461ca4c02d464abc0987d31e5
-MD5 902fb9d4e16762d8472b0b5ee9f8037f ChangeLog 8644
-RMD160 8d500707df7b26fce86d4a8cdd05a7e065e92f11 ChangeLog 8644
-SHA256 35a6a5ed91dc3bb2e0a9d8ed41cec5a869949bf461ca4c02d464abc0987d31e5 ChangeLog 8644
+EBUILD monodevelop-0.14.ebuild 4590 RMD160 0416f9e216ad88f7134c6582608220ecc98b9c3e SHA1 e63ccee89764703c959ecf05e755210e4329144d SHA256 9b7b6ffa9dc02c50d28acecd427f141cdeadd054c304b07aac5f233994f49871
+MD5 8b07fa153c5d76b40e45c1ca0f2f20da monodevelop-0.14.ebuild 4590
+RMD160 0416f9e216ad88f7134c6582608220ecc98b9c3e monodevelop-0.14.ebuild 4590
+SHA256 9b7b6ffa9dc02c50d28acecd427f141cdeadd054c304b07aac5f233994f49871 monodevelop-0.14.ebuild 4590
+MISC ChangeLog 9010 RMD160 63ca83fc03f9ba3e4e76e885bb715ce259446d9b SHA1 237875a5de511088dea46506aa27ff210fa4eb3f SHA256 641aedfc90aba837b918d821c692f05d0fcba95a08577c22676c077ae44cf7b5
+MD5 c305d7c83173556e002962f9c3830e4d ChangeLog 9010
+RMD160 63ca83fc03f9ba3e4e76e885bb715ce259446d9b ChangeLog 9010
+SHA256 641aedfc90aba837b918d821c692f05d0fcba95a08577c22676c077ae44cf7b5 ChangeLog 9010
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
@@ -48,7 +48,7 @@ SHA256 99bf358ab3cea324b515f0eec8e99efece1380f9402ba4eec523d7c3e2b0daef files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGh/vryvXkcyXx2ogRAtxYAJ0b6vVglYstAJBdTMF9k4Z1Eaj5HQCeIWyp
-nyhpiF6vFTj9ROrzfZmXtt4=
-=9ob7
+iD8DBQFGiXFFyvXkcyXx2ogRAmQ1AKCNil5s+4XMPpfyTrhE036mS78GRQCggQDC
+1fJxgHDIijIXWT/ULjs06os=
+=wxPK
 -----END PGP SIGNATURE-----
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' \