summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-11-23 16:52:37 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-11-23 16:52:37 +0000
commit84c747640b373cd950a5b3a89106cd8fd45e834e (patch)
tree57aa9f9cec0f11d9f7bb6dc37f5ab90b8f744ad9 /dev-lang/mono
parentVersion bump (diff)
downloadgentoo-2-84c747640b373cd950a5b3a89106cd8fd45e834e.tar.gz
gentoo-2-84c747640b373cd950a5b3a89106cd8fd45e834e.tar.bz2
gentoo-2-84c747640b373cd950a5b3a89106cd8fd45e834e.zip
Drop libdir patches, lib64 isn't really needed for platform independent code.
(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)
Diffstat (limited to 'dev-lang/mono')
-rw-r--r--dev-lang/mono/ChangeLog6
-rw-r--r--dev-lang/mono/mono-2.0.1.ebuild28
2 files changed, 7 insertions, 27 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 17add4eaa77d..890f6de92e24 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/mono
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.145 2008/11/19 22:34:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.146 2008/11/23 16:52:37 loki_val Exp $
+
+ 23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> mono-2.0.1.ebuild:
+ Drop libdir patches, lib64 isn't really needed for platform independent
+ code.
*mono-2.0.1 (19 Nov 2008)
diff --git a/dev-lang/mono/mono-2.0.1.ebuild b/dev-lang/mono/mono-2.0.1.ebuild
index aa6721bcff33..f845c1a3ab7b 100644
--- a/dev-lang/mono/mono-2.0.1.ebuild
+++ b/dev-lang/mono/mono-2.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1.ebuild,v 1.1 2008/11/19 22:34:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1.ebuild,v 1.2 2008/11/23 16:52:37 loki_val Exp $
inherit base eutils flag-o-matic multilib autotools
@@ -35,29 +35,6 @@ function get-memory-total() {
cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
}
-src_unpack() {
- base_src_unpack
- cd "${S}"
-
- # Fix the install path, install into $(libdir)
- sed -i -e 's:$(prefix)/lib:$(libdir):' \
- -e 's:$(exec_prefix)/lib:$(libdir):' \
- -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
- "${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in \
- || die "sed failed"
-
- sed -i -e 's:^libdir.*:libdir=@libdir@:' \
- -e 's:${prefix}/lib/:${libdir}/:g' \
- "${S}"/{scripts,}/*.pc.in \
- || die "sed failed"
-
- #For libtool-1 compat
- rm -f lt*.m4 libtool.m4
-
- einfo "Regenerating the build files, this will take some time..."
- eautoreconf
-}
-
src_compile() {
# mono's build system is finiky, strip the flags
strip-flags
@@ -73,8 +50,7 @@ src_compile() {
# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
touch "${S}"/mcs/build/deps/use-monolite
- econf ${myconf} \
- --with-moonlight \
+ econf --without-moonlight \
--with-preview=yes \
--with-glib=system \
--with-gc=included \