From 38f5e6dc01f29ecd812ea6c898b008eed3a19287 Mon Sep 17 00:00:00 2001 From: Jurek Bartuszek Date: Thu, 26 Jul 2007 13:05:23 +0000 Subject: dev-dotnet/monodevelop-0.14 - fixes in configure.in (bug #183956) Package-Manager: portage-2.1.2.9 --- dev-util/monodevelop/ChangeLog | 9 +- dev-util/monodevelop/Manifest | 30 +-- .../files/monodevelop-0.14-configure.patch | 241 +++++++++++++-------- dev-util/monodevelop/monodevelop-0.14.ebuild | 4 +- 4 files changed, 173 insertions(+), 111 deletions(-) (limited to 'dev-util/monodevelop') diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog index 1779a2d191d3..7d8b2cc87b6c 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.47 2007/07/02 21:42:24 jurek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.48 2007/07/26 13:05:23 jurek Exp $ + + 26 Jul 2007; Jurek Bartuszek + files/monodevelop-0.14-configure.patch, monodevelop-0.14.ebuild: + Fixes in configure.in (bug #183956) + + 18 Jul 2007; Jurek Bartuszek monodevelop-0.14.ebuild: + Added ~amd64 and ~ppc keywords 02 Jul 2007; Jurek Bartuszek files/monodevelop-0.14-configure.patch, monodevelop-0.14.ebuild: diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest index 816f87418198..f47b0c328038 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 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 +AUX monodevelop-0.14-configure.patch 4605 RMD160 93feaf8a96de0effea606a4fdfca0f556971ef36 SHA1 a5d7318d0a661267ac08e49b451e42ebbb325b4d SHA256 fa14fc110d7fac8361a200080bfaa720d4561d0888f1fb6f8c78e10047e2da6a +MD5 b34064f109bf65730b1174b8803269ff files/monodevelop-0.14-configure.patch 4605 +RMD160 93feaf8a96de0effea606a4fdfca0f556971ef36 files/monodevelop-0.14-configure.patch 4605 +SHA256 fa14fc110d7fac8361a200080bfaa720d4561d0888f1fb6f8c78e10047e2da6a files/monodevelop-0.14-configure.patch 4605 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 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 +EBUILD monodevelop-0.14.ebuild 4602 RMD160 d58e98e60f4ea4561b9d4a9b088c8549864f753b SHA1 6e38af8118caa6a272fd55c7ec14491797438374 SHA256 d288fcd9c37fdd95019393a3a6e1309347211a9692c8a8ad54273e72cfbefa04 +MD5 acda839d8171dbc84dac8b092c35f296 monodevelop-0.14.ebuild 4602 +RMD160 d58e98e60f4ea4561b9d4a9b088c8549864f753b monodevelop-0.14.ebuild 4602 +SHA256 d288fcd9c37fdd95019393a3a6e1309347211a9692c8a8ad54273e72cfbefa04 monodevelop-0.14.ebuild 4602 +MISC ChangeLog 9275 RMD160 5655bc97508a862faef2c6c220aa28d91912f392 SHA1 f24a3ba1818c380612e6939a55cc0cde7dacb86a SHA256 6d91fce6a873fac4ae185849e4a4647fc46a0a3685f7fde55dbd211811339568 +MD5 2d5af4bca653f53b6ed71c6bc7a9ce2c ChangeLog 9275 +RMD160 5655bc97508a862faef2c6c220aa28d91912f392 ChangeLog 9275 +SHA256 6d91fce6a873fac4ae185849e4a4647fc46a0a3685f7fde55dbd211811339568 ChangeLog 9275 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) -iD8DBQFGiXFFyvXkcyXx2ogRAmQ1AKCNil5s+4XMPpfyTrhE036mS78GRQCggQDC -1fJxgHDIijIXWT/ULjs06os= -=wxPK +iD8DBQFGqJwZyvXkcyXx2ogRAtF7AJ40ucf5KP6eeV15tZkZ11otrjpRzgCdG/SK +3WqmupPaEVNJ9BOsWnpxT/A= +=kwkL -----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 9af686801b9f..cb8f7f2eb199 100644 --- a/dev-util/monodevelop/files/monodevelop-0.14-configure.patch +++ b/dev-util/monodevelop/files/monodevelop-0.14-configure.patch @@ -1,93 +1,148 @@ ---- 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], - [enable support for Java via ikvm [default=no]]), -- [PKG_CHECK_MODULES(IKVM, ikvm >= $IKVM_REQUIRED_VERSION, enable_java=yes, enable_java=no)], -+ [PKG_CHECK_MODULES(IKVM, ikvm >= $IKVM_REQUIRED_VERSION, , enable_java=no)], - enable_java=no) - AM_CONDITIONAL(ENABLE_JAVA, test x$enable_java = xyes) - -@@ -135,30 +135,30 @@ - AC_ARG_ENABLE(boo, - AC_HELP_STRING([--enable-boo], - [enable support for boo [default=no]]), -- [PKG_CHECK_MODULES(BOO, boo >= $BOO_REQUIRED_VERSION, enable_boo=yes, enable_boo=no)], -- enable_boo=no) -- --AM_CONDITIONAL(ENABLE_BOO, test x$enable_boo = xyes) --AC_SUBST(BOO_LIBS) -+ , enable_boo=no) - - if test "x$enable_boo" = "xyes" ; then -+ PKG_CHECK_MODULES(BOO, boo >= $BOO_REQUIRED_VERSION) - AC_PATH_PROG(BOOC, booc) - fi - -+AM_CONDITIONAL(ENABLE_BOO, test x$enable_boo = xyes) -+AC_SUBST(BOO_LIBS) -+ - NEMERLE_REQUIRED_VERSION=0.9.3.99 - AC_ARG_ENABLE(nemerle, - AC_HELP_STRING([--enable-nemerle], - [enable support for Nemerle [default=no]]), -- [PKG_CHECK_MODULES(NEMERLE, nemerle >= $NEMERLE_REQUIRED_VERSION, enable_nemerle=yes, enable_nemerle=no)], -- enable_nemerle=no) -- --AM_CONDITIONAL(ENABLE_NEMERLE, test x$enable_nemerle = xyes) --AC_SUBST(NEMERLE_LIBS) -+ , enable_nemerle=no) - - if test "x$enable_nemerle" = "xyes" ; then -+ PKG_CHECK_MODULES(NEMERLE, nemerle >= $NEMERLE_REQUIRED_VERSION) - AC_PATH_PROG(NCC, ncc) - fi - -+AM_CONDITIONAL(ENABLE_NEMERLE, test x$enable_nemerle = xyes) -+AC_SUBST(NEMERLE_LIBS) -+ - AC_ARG_ENABLE(monoextensions, - AC_HELP_STRING([--enable-monoextensions], - [enable extensions for Mono development [default=yes]]), -@@ -295,7 +295,7 @@ - AC_ARG_ENABLE(aspnet, - AC_HELP_STRING([--enable-aspnet], - [enable ASP.NET project support [default=no]]), -- enable_aspnet=yes, enable_aspnet=no) -+ , enable_aspnet=no) - - if test "x$enable_aspnet" = "xyes"; then - PKG_CHECK_MODULES(XSP, xsp >= $XSP_VERSION xsp-2 >= $XSP2_VERSION) -@@ -323,10 +323,10 @@ - MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) - elif [ $(which mozilla 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then - MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2 | cut -d '=' -f 2 ) -- elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then -- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2 | cut -d '=' -f 2 ) - elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_LIBDIR= "$(which firefox)" > /dev/null ; then -- MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '"' -f 2 | cut -d '=' -f 2) -+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '"' -f 2 | cut -d '=' -f 2 ) -+ elif [ $(which seamonkey 2>/dev/null) ] && grep MOZILLA_LIBDIR= "$(which seamonkey)" > /dev/null ; then -+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which seamonkey) | cut -d '"' -f 2 | cut -d '=' -f 2) - else - if test "x$enable_aspnetedit" = "xyes"; then - AC_MSG_ERROR([Cannot detect Mozilla library directory. AspNetEdit addin cannot be built.]) -@@ -342,7 +342,7 @@ - AC_ARG_ENABLE(aspnetedit, - AC_HELP_STRING([--enable-aspnetedit], - [enable ASP.NET visual designer support [default=no]]), -- enable_aspnetedit=yes, enable_aspnetedit=no) -+ , enable_aspnetedit=no) - - 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) - +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/files/monodevelop-0.14-configure.patch,v 1.3 2007/07/26 13:05:23 jurek Exp $ + +inherit autotools eutils fdo-mime mono multilib + +DESCRIPTION="Integrated Development Environemnt for .NET" +HOMEPAGE="http://www.monodevelop.com/" +SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="aspnet aspnetedit boo firefox java seamonkey subversion" + +RDEPEND=">=dev-lang/mono-1.1.10 + >=dev-util/monodoc-1.0 + >=dev-dotnet/gtk-sharp-2.8.0 + >=dev-dotnet/gconf-sharp-2.4 + >=dev-dotnet/glade-sharp-2.4 + >=dev-dotnet/gnome-sharp-2.4 + >=dev-dotnet/gecko-sharp-0.10 + >=dev-dotnet/gtkhtml-sharp-2.4 + >=dev-dotnet/gnomevfs-sharp-2.4 + >=dev-dotnet/gtksourceview-sharp-0.10 + aspnet? ( >=dev-dotnet/xsp-1.2.1 ) + aspnetedit? ( dev-dotnet/jscall-sharp ) + boo? ( >=dev-lang/boo-0.7.6 ) + firefox? ( || ( www-client/mozilla-firefox www-client/mozilla-firefox-bin ) ) + java? ( || ( >=dev-dotnet/ikvm-0.14.0.1-r1 >=dev-dotnet/ikvm-bin-0.14.0.1 ) ) + seamonkey? ( || ( www-client/seamonkey www-client/seamonkey-bin ) ) + subversion? ( dev-util/subversion )" + + # Removed due to nemerle compatibility issues (bugs #158241, #168208) + # nemerle? ( >=dev-lang/nemerle-0.9.3.99 <=dev-lang/nemerle-0.9.3.99.6855 ) + +DEPEND="${RDEPEND} + x11-misc/shared-mime-info + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.19" + +pkg_setup() { + if use aspnetedit && ! use aspnet; then + eerror + 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 +} + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-configure.patch + epatch ${FILESDIR}/${P}-aspnet-template-fix.patch + + # Bundled jscall version is messed up + if use aspnetedit; then + ebegin "Fixing bundled jscall" + jscalldir=Extras/AspNetEdit/libs/ + rm ${jscalldir}/jscall.dll + ln -s /usr/$(get_libdir)/jscall-sharp/JSCall.js ${jscalldir} \ + || die "ln failed" + ln -s /usr/$(get_libdir)/jscall-sharp/jscall.dll ${jscalldir} \ + || die "ln failed" + + # 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' \ + Extras/AspNetEdit/chrome/aspdesigner.manifest.in \ + || die "sed failed" + eend + fi + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + econf --disable-update-mimedb \ + --disable-update-desktopdb \ + --enable-monoextensions \ + --enable-versioncontrol \ + --enable-monoquery \ + --disable-nemerle \ + $(use_enable aspnet) \ + $(use_enable aspnetedit) \ + $(use_enable boo) \ + $(use_enable java) \ + $(use_enable subversion) \ + || die "configure failed" + + emake -j1 || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + + # We handle installation of aspdesigner.jar by ourselves + if use aspnetedit; then + if use firefox; then + insinto /usr/$(get_libdir)/mozilla-firefox/chrome + doins Extras/AspNetEdit/chrome/aspdesigner.{manifest,jar} + fi + if use seamonkey; then + insinto /usr/$(get_libdir)/seamonkey/chrome + doins Extras/AspNetEdit/chrome/aspdesigner.{manifest,jar} + fi + fi + + dodoc ChangeLog README || die "dodoc failed" +} + +pkg_postinst() { + fdo-mime_mime_database_update + fdo-mime_desktop_database_update + + elog + elog "Nemerle support has been explicitly dropped in this release of" + elog "monodevelop. This happened mostly because of uncertain status of" + elog "bundled nemerle addin. To learn more visit:" + elog "http://bugs.gentoo.org/show_bug.cgi?id=168208#c31" + elog + + if use aspnetedit; then + ewarn + ewarn "The ASP.NET visual designer bundled with MonoDevelop is still" + ewarn "under heavy development, so it may contain numerous bugs. In case" + ewarn "you encounter problems using it, before filing a bug please visit" + ewarn "http://bugzilla.ximian.com and check if someone has already" + ewarn "reported a similar issue" + ewarn + fi +} diff --git a/dev-util/monodevelop/monodevelop-0.14.ebuild b/dev-util/monodevelop/monodevelop-0.14.ebuild index 0e5d9e731727..7531584603ff 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.2 2007/07/02 21:42:24 jurek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.14.ebuild,v 1.3 2007/07/26 13:05:23 jurek Exp $ inherit autotools eutils fdo-mime mono multilib @@ -10,7 +10,7 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="aspnet aspnetedit boo firefox java seamonkey subversion" RDEPEND=">=dev-lang/mono-1.1.10 -- cgit v1.2.3-65-gdbad