diff options
author | Pacho Ramos <pacho@gentoo.org> | 2011-07-08 10:02:59 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2011-07-08 10:02:59 +0000 |
commit | a96aa1b85ac565cfd0453cd9df759e64300b110e (patch) | |
tree | ad4aa69cf81b176939f948c2c5f4a360036e1d1d /dev-util | |
parent | Convert from "hasq" to "has". (diff) | |
download | gentoo-2-a96aa1b85ac565cfd0453cd9df759e64300b110e.tar.gz gentoo-2-a96aa1b85ac565cfd0453cd9df759e64300b110e.tar.bz2 gentoo-2-a96aa1b85ac565cfd0453cd9df759e64300b110e.zip |
Remove old.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/mono-tools/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch | 117 | ||||
-rw-r--r-- | dev-util/mono-tools/mono-tools-2.8.ebuild | 63 |
3 files changed, 5 insertions, 181 deletions
diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog index edf537e8de62..fea3ecf2013a 100644 --- a/dev-util/mono-tools/ChangeLog +++ b/dev-util/mono-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/mono-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.83 2011/05/11 19:30:27 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.84 2011/07/08 10:02:58 pacho Exp $ + + 08 Jul 2011; Pacho Ramos <pacho@gentoo.org> + -files/mono-tools-2.4-html-renderer-fixes.patch, -mono-tools-2.8.ebuild: + Remove old. 11 May 2011; Christoph Mende <angelos@gentoo.org> mono-tools-2.10.ebuild: Stable on amd64 wrt bug #359651 diff --git a/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch b/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch deleted file mode 100644 index cb420dccc687..000000000000 --- a/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -NrU5 mono-tools-2.4.2.orig/configure.in mono-tools-2.4.2/configure.in ---- mono-tools-2.4.2.orig/configure.in 2009-09-02 13:49:47.000000000 +0200 -+++ mono-tools-2.4.2/configure.in 2009-09-02 14:14:04.000000000 +0200 -@@ -43,54 +43,84 @@ - - PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0) - #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp) - AC_SUBST(GTK_SHARP_LIBS) - --PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) --if test "x$enable_gtkhtml" = "xyes"; then --CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14" --else --PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no) --CSHARP_FLAGS= -+AC_ARG_ENABLE(gtkhtml, -+ AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),, -+ enable_gtkhtml=yes) -+ -+if test "x$enable_gtkhtml" = "xyes" ; then -+ PKG_CHECK_MODULES([GTKHTML_SHARP], -+ [gtkhtml-sharp-3.14], -+ [CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"], -+ [ -+ PKG_CHECK_MODULES([GTKHTML_SHARP], -+ [gtkhtml-sharp-2.0], -+ [CSHARP_FLAGS=""], -+ []) -+ ] -+ ) -+ AC_SUBST(GTKHTML_SHARP_LIBS) -+ AC_SUBST(CSHARP_FLAGS) - fi --AC_SUBST(GTKHTML_SHARP_LIBS) --AC_SUBST(CSHARP_FLAGS) -+ - AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") - --PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no) --AC_SUBST(GECKO_SHARP_LIBS) -+AC_ARG_ENABLE(gecko, -+ AC_HELP_STRING([--enable-gecko], [Use Gecko / Xulrunner-1.8 browser libs]),, -+ enable_gecko=yes) -+ -+if test "x$enable_gecko" = "xyes" ; then -+ PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0) -+ -+ AC_SUBST(GECKO_SHARP_LIBS) -+ -+ # get the mozilla home directory -+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" -+ AC_SUBST(MOZILLA_HOME) -+fi -+ - AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") - --if test "x$enable_gecko" = "xyes"; then -- # get the mozilla home directory -- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" -- AC_SUBST(MOZILLA_HOME) -+AC_ARG_ENABLE(webkit, -+ AC_HELP_STRING([--enable-webkit], [Use Webkit browser]),, -+ enable_webkit=yes) -+ -+if test "x$enable_webkit" = "xyes" ; then -+ PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0) -+ AC_SUBST(WEBKIT_SHARP_LIBS) - fi - --PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) --AC_SUBST(WEBKIT_SHARP_LIBS) - AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes") - - # PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no) - # AC_SUBST(MONOWEBBROWSER_LIBS) - --AC_MSG_CHECKING([for Mono.WebBrowser]) --if test "x$GACUTIL" = "xno" --then -- AC_MSG_RESULT([no]) -- if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi --else -- if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" -+AC_ARG_ENABLE(monowebbrowser, -+ AC_HELP_STRING([--enable-monowebbrowser], [Use Mono.Webbrowser]),, -+ enable_monowebbrowser=yes) -+ -+if test "x$enable_monowebbrowser" = "xyes" ; then -+ AC_MSG_CHECKING([for Mono.WebBrowser]) -+ if test "x$GACUTIL" = "xno" - then -- AC_MSG_RESULT([yes]) -- enable_monowebbrowser=yes -+ AC_MSG_RESULT([no]) -+ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi - else -- AC_MSG_RESULT([no]) -- enable_monowebbrowser=no -- fi -+ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" -+ then -+ AC_MSG_RESULT([yes]) -+ enable_monowebbrowser=yes -+ MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser -+ else -+ AC_MSG_RESULT([no]) -+ enable_monowebbrowser=no -+ fi -+ fi - fi --MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser -+ - AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes") - - if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then - AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser]) - fi diff --git a/dev-util/mono-tools/mono-tools-2.8.ebuild b/dev-util/mono-tools/mono-tools-2.8.ebuild deleted file mode 100644 index 9ec42d0c3d62..000000000000 --- a/dev-util/mono-tools/mono-tools-2.8.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.8.ebuild,v 1.4 2011/01/29 17:06:44 hwoarang Exp $ - -EAPI=2 - -inherit go-mono mono autotools - -DESCRIPTION="Set of useful Mono related utilities" -HOMEPAGE="http://www.mono-project.com/" - -LICENSE="GPL-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="webkit gtkhtml +xulrunner" - -RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}* - >=dev-dotnet/gtk-sharp-2.12.6 - >=dev-dotnet/glade-sharp-2.12.6 - >=dev-dotnet/gconf-sharp-2 - gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 ) - webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) - xulrunner? ( >=dev-dotnet/gluezilla-2.6 ) - " -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.19" - -PATCHES=( "${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch" ) - -#Fails parallel make. -MAKEOPTS="${MAKEOPTS} -j1" - -pkg_setup() { - if ! use webkit && ! use gtkhtml && ! use xulrunner - then - die "You must USE either webkit, gtkhtml or xulrunner" - fi -} - -src_prepare() { - go-mono_src_prepare - - # Stop getting ACLOCAL_FLAGS command not found problem like bug #298813 - sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am - - eautoreconf -} - -src_configure() { - econf --disable-dependency-tracking \ - --disable-gecko \ - $(use_enable gtkhtml) \ - $(use_enable webkit) \ - $(use_enable xulrunner monowebbrowser) \ - || die "configure failed" -} - -src_install() { - go-mono_src_install - # Defunct .desktop file, see bug 266694 - find "${D}" -type f -name 'mprof-heap-viewer.desktop' -exec rm -f '{}' '+' || die "removal of mprof-heap-viewer.desktop failed" -} |