clean up things and change glibc to libc

8 files changed, 78 insertions, 102 deletions

diff --git a/dev-dotnet/mono/mono-0.28.ebuild b/dev-dotnet/mono/mono-0.28.ebuild
index 4da692ba5286..e3b4703727c2 100644
--- a/dev-dotnet/mono/mono-0.28.ebuild
+++ b/dev-dotnet/mono/mono-0.28.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.28.ebuild,v 1.4 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.28.ebuild,v 1.5 2004/06/29 14:37:57 vapier Exp $
 
 inherit mono
 
 MCS_P="mcs-${PV}"
 MCS_S=${WORKDIR}/${MCS_P}
 
-IUSE=""
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
-HOMEPAGE="http://www.go-mono.com/"
 
 LICENSE="GPL-2 LGPL-2 X11"
 SLOT="0"
-
 KEYWORDS="x86 -ppc"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	!dev-dotnet/pnet"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2
@@ -37,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	econf || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 
 	ln -s ../runtime ${WORKDIR}/${P}/runtime/lib
 	cd ${MCS_S}
@@ -50,11 +48,10 @@ src_compile() {
 	echo "prefix=/usr" >> build/config.make
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
@@ -68,7 +65,7 @@ src_install () {
 	doins MonoIcon.png ScalableMonoIcon.svg
 
 	docinto mcs
-	dodoc AUTHORS COPYING README* ChangeLog INSTALL.txt
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
 	docinto mcs/docs
 	dodoc docs/*.txt
 
diff --git a/dev-dotnet/mono/mono-0.30.1.ebuild b/dev-dotnet/mono/mono-0.30.1.ebuild
index 504e2da5f82c..ad26fbac8b68 100644
--- a/dev-dotnet/mono/mono-0.30.1.ebuild
+++ b/dev-dotnet/mono/mono-0.30.1.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.1.ebuild,v 1.2 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.1.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
 
 inherit mono flag-o-matic
 
-strip-flags
-
 MCS_P="mcs-${PV}"
 MCS_S=${WORKDIR}/${MCS_P}
 
-IUSE=""
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
-HOMEPAGE="http://www.go-mono.com/"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
-
 KEYWORDS="~x86 -ppc"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6
 	!dev-dotnet/pnet"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
@@ -44,8 +40,10 @@ src_unpack() {
 }
 
 src_compile() {
+	strip-flags
+
 	econf || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 
 	ln -s ../runtime ${WORKDIR}/${P}/runtime/lib
 	cd ${MCS_S}
@@ -60,11 +58,10 @@ src_compile() {
 	echo "prefix=/usr" >> build/config.make
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
@@ -78,7 +75,7 @@ src_install () {
 	doins MonoIcon.png ScalableMonoIcon.svg
 
 	docinto mcs
-	dodoc AUTHORS COPYING README* ChangeLog INSTALL.txt
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
 	docinto mcs/docs
 	dodoc docs/*.txt
 
diff --git a/dev-dotnet/mono/mono-0.30.ebuild b/dev-dotnet/mono/mono-0.30.ebuild
index 3e835e1841b3..311293a816d2 100644
--- a/dev-dotnet/mono/mono-0.30.ebuild
+++ b/dev-dotnet/mono/mono-0.30.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.ebuild,v 1.2 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
 
 inherit mono flag-o-matic
 
-strip-flags
-
 MCS_P="mcs-${PV}"
 MCS_S=${WORKDIR}/${MCS_P}
 
-IUSE=""
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
-HOMEPAGE="http://www.go-mono.com/"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
-
 KEYWORDS="~x86 -ppc"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6
 	!dev-dotnet/pnet"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
@@ -44,8 +40,10 @@ src_unpack() {
 }
 
 src_compile() {
+	strip-flags
+
 	econf || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 
 	ln -s ../runtime ${WORKDIR}/${P}/runtime/lib
 	cd ${MCS_S}
@@ -60,11 +58,10 @@ src_compile() {
 	echo "prefix=/usr" >> build/config.make
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
@@ -78,7 +75,7 @@ src_install () {
 	doins MonoIcon.png ScalableMonoIcon.svg
 
 	docinto mcs
-	dodoc AUTHORS COPYING README* ChangeLog INSTALL.txt
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
 	docinto mcs/docs
 	dodoc docs/*.txt
 
diff --git a/dev-dotnet/mono/mono-0.31.ebuild b/dev-dotnet/mono/mono-0.31.ebuild
index b50e895f3bf6..8586a6d09d47 100644
--- a/dev-dotnet/mono/mono-0.31.ebuild
+++ b/dev-dotnet/mono/mono-0.31.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.31.ebuild,v 1.5 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.31.ebuild,v 1.6 2004/06/29 14:37:57 vapier Exp $
 
 inherit eutils mono flag-o-matic
 
-strip-flags
-
 MCS_P="mcs-${PV}"
 MCS_S=${WORKDIR}/${MCS_P}
 
-IUSE="nptl"
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
-HOMEPAGE="http://www.go-mono.com/"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
-
 KEYWORDS="~x86 -ppc"
+IUSE="nptl"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6
 	!dev-dotnet/pnet"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
@@ -44,6 +40,8 @@ src_unpack() {
 }
 
 src_compile() {
+	strip-flags
+
 	local myconf=""
 	if use nptl && have_NPTL
 	then
@@ -53,7 +51,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 
 	ln -s ../runtime ${WORKDIR}/${P}/runtime/lib
 	cd ${MCS_S}
@@ -68,11 +66,10 @@ src_compile() {
 	echo "prefix=/usr" >> build/config.make
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
@@ -86,7 +83,7 @@ src_install () {
 	doins MonoIcon.png ScalableMonoIcon.svg
 
 	docinto mcs
-	dodoc AUTHORS COPYING README* ChangeLog INSTALL.txt
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
 	docinto mcs/docs
 	dodoc docs/*.txt
 
diff --git a/dev-dotnet/mono/mono-0.91.ebuild b/dev-dotnet/mono/mono-0.91.ebuild
index e20f5966a876..9c2d29393971 100644
--- a/dev-dotnet/mono/mono-0.91.ebuild
+++ b/dev-dotnet/mono/mono-0.91.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.91.ebuild,v 1.6 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.91.ebuild,v 1.7 2004/06/29 14:37:57 vapier Exp $
 
 inherit eutils mono flag-o-matic
 
-strip-flags
-
 MCS_P="mcs-${PV}"
 MCS_S=${WORKDIR}/${MCS_P}
 
-IUSE="nptl"
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-SRC_URI="http://www.go-mono.com/archive/beta1/${P}.tar.gz"
 HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/archive/beta1/${P}.tar.gz"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
-
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nptl"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6.1
 	!dev-dotnet/pnet
 	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
 	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
 src_compile() {
+	strip-flags
+
 	local myconf=""
 	if use nptl && have_NPTL
 	then
@@ -40,14 +38,13 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
@@ -57,7 +54,7 @@ src_install () {
 	doins MonoIcon.png ScalableMonoIcon.svg
 
 	docinto mcs
-	dodoc AUTHORS COPYING README* ChangeLog INSTALL.txt
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
 	docinto mcs/docs
 	dodoc docs/*.txt
 
diff --git a/dev-dotnet/mono/mono-0.95.ebuild b/dev-dotnet/mono/mono-0.95.ebuild
index c1a8e3e154ab..13cb5affa7dc 100644
--- a/dev-dotnet/mono/mono-0.95.ebuild
+++ b/dev-dotnet/mono/mono-0.95.ebuild
@@ -1,33 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.95.ebuild,v 1.5 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.95.ebuild,v 1.6 2004/06/29 14:37:57 vapier Exp $
 
 inherit eutils mono flag-o-matic
 
-strip-flags
-
-IUSE="nptl"
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-SRC_URI="http://www.go-mono.com/archive/beta2/${P}.tar.gz"
 HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/archive/beta2/${P}.tar.gz"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nptl"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6.1
 	!dev-dotnet/pnet
 	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
 	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
 src_compile() {
+	strip-flags
+
 	local myconf=""
 	if use nptl && have_NPTL
 	then
@@ -37,15 +35,14 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	make DESTDIR=${D} install || die
 	# einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
diff --git a/dev-dotnet/mono/mono-0.96.ebuild b/dev-dotnet/mono/mono-0.96.ebuild
index 9b733532eb7c..00e692494433 100644
--- a/dev-dotnet/mono/mono-0.96.ebuild
+++ b/dev-dotnet/mono/mono-0.96.ebuild
@@ -1,33 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.96.ebuild,v 1.2 2004/06/24 22:04:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.96.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
 
 inherit eutils mono flag-o-matic
 
-strip-flags
-
-IUSE="nptl"
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-SRC_URI="http://www.go-mono.com/archive/beta3/${P}.tar.gz"
 HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/archive/beta3/${P}.tar.gz"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nptl"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6.1
 	!dev-dotnet/pnet
 	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
 	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
 src_compile() {
+	strip-flags
+
 	local myconf=""
 	if use nptl && have_NPTL
 	then
@@ -37,15 +35,14 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	make DESTDIR=${D} install || die
 	# einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*
 
diff --git a/dev-dotnet/mono/mono-0.97.ebuild b/dev-dotnet/mono/mono-0.97.ebuild
index 3c2af5787dd4..43f66783fa82 100644
--- a/dev-dotnet/mono/mono-0.97.ebuild
+++ b/dev-dotnet/mono/mono-0.97.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.97.ebuild,v 1.2 2004/06/28 16:05:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.97.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
 
 inherit eutils mono flag-o-matic
 
-strip-flags
-
-IUSE="nptl"
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-SRC_URI="http://www.go-mono.com/archive/rc/${P}.tar.gz"
 HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/archive/rc/${P}.tar.gz"
 
 LICENSE="GPL-2 | LGPL-2 | X11"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nptl"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
 	>=dev-libs/icu-2.6.1
 	!dev-dotnet/pnet
 	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
 	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-
 RDEPEND="${DEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxml2"
@@ -36,6 +32,8 @@ src_unpack() {
 }
 
 src_compile() {
+	strip-flags
+
 	local myconf=""
 	if use nptl && have_NPTL
 	then
@@ -45,15 +43,14 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "MONO compilation failure"
+	emake -j1 || die "MONO compilation failure"
 }
 
-src_install () {
-	cd ${S}
+src_install() {
 	make DESTDIR=${D} install || die
 	# einstall || die
 
-	dodoc AUTHORS ChangeLog COPYING.LIB NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	docinto docs
 	dodoc docs/*