New versio and cleanup

(Portage version: 2.0.51.22-r1)

13 files changed, 37 insertions, 193 deletions

diff --git a/dev-util/xmingw-gcc/ChangeLog b/dev-util/xmingw-gcc/ChangeLog
index 75a7b6f49592..5082372e9cb2 100644
--- a/dev-util/xmingw-gcc/ChangeLog
+++ b/dev-util/xmingw-gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xmingw-gcc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.10 2005/02/09 12:57:22 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.11 2005/05/27 17:33:38 cretin Exp $
+
+*xmingw-gcc-3.4.2-r1 (27 May 2005)
+
+  27 May 2005; Stefan Jones <cretin@gentoo.org> xmingw-gcc-3.4.2-r1.ebuild:
+  Use newer runtime and w32api, nocxx and env.d file
 
   09 Feb 2005; Simon Stelling <blubb@gentoo.org> xmingw-gcc-3.4.2.ebuild:
   added ~amd64
diff --git a/dev-util/xmingw-gcc/Manifest b/dev-util/xmingw-gcc/Manifest
index 4397cbf6c171..a69439f0d39f 100644
--- a/dev-util/xmingw-gcc/Manifest
+++ b/dev-util/xmingw-gcc/Manifest
@@ -1,11 +1,7 @@
-MD5 0fddecc71406bbefa55ad4aa42a89bd8 ChangeLog 1050
-MD5 28cdb8a32a42f10f631aa45392bce266 xmingw-gcc-3.3.1.ebuild 1979
-MD5 3938b7b1c8351fc9d3317a3123b6cac3 xmingw-gcc-3.4.1.ebuild 1905
-MD5 2f60999f4d1159a2160d9f8e5d23f02c xmingw-gcc-3.4.1-r1.ebuild 2296
-MD5 c6cf5afb48d08f09e0e68215c4d01629 xmingw-gcc-3.4.2.ebuild 2300
-MD5 fe157877214b1306a195eec777847350 files/digest-xmingw-gcc-3.3.1 279
-MD5 f15585878583770a2d6c7d0ce5014264 files/gcc-3.3.1-includefix.diff 798
-MD5 d94869dc65ae2aec7ac12e6527d74d17 files/digest-xmingw-gcc-3.4.1 279
+MD5 1d2a70dbed481faceec947ea73c384ff xmingw-gcc-3.4.2-r1.ebuild 2365
+MD5 1d4e914cda0b6c985b2f8d382db16d72 xmingw-gcc-3.4.2.ebuild 2298
+MD5 885c801072c9ba6ff4957603f4f64bd6 ChangeLog 1216
 MD5 8f19d88fb59c78e728862642831634ab files/gcc-3.4.1-includefix.diff 682
-MD5 d94869dc65ae2aec7ac12e6527d74d17 files/digest-xmingw-gcc-3.4.1-r1 279
 MD5 b78de3c2650dcbee69d9197a2c518e01 files/digest-xmingw-gcc-3.4.2 281
+MD5 a04fdd426a92bfc7c5f621be7c095eca files/digest-xmingw-gcc-3.4.2-r1 281
+MD5 5b2fa879ce2dd3367cbadf3ccca814d1 files/05xmingw 71
diff --git a/dev-util/xmingw-gcc/files/05xmingw b/dev-util/xmingw-gcc/files/05xmingw
new file mode 100644
index 000000000000..9bbb79cc059c
--- /dev/null
+++ b/dev-util/xmingw-gcc/files/05xmingw
@@ -0,0 +1,3 @@
+PATH=/opt/xmingw/bin
+MANPATH=/opt/xmingw/man
+INFOPATH=/opt/xmingw/info
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.3.1 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.3.1
deleted file mode 100644
index 2c829a02380f..000000000000
--- a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.3.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362
-MD5 881d91809e79452b593d12b73130913f gcc-3.3.1-20030804-1-src.diff.gz 73048
-MD5 9fe85d9ca858fe00c907ed1e3052ee4c mingw-runtime-3.2-src.tar.gz 264180
-MD5 931b25da6223bd72ada13e83443cc6ed w32api-2.4-src.tar.gz 946314
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1
deleted file mode 100644
index dc1897121fc4..000000000000
--- a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
-MD5 f99a57c39ca784b3aaededd9f7c384d5 gcc-3.4.1-20040711-1-src.diff.gz 85777
-MD5 21e9970d7c828eabd380132aa806dd41 mingw-runtime-3.3-src.tar.gz 271695
-MD5 395369c2c0c67394e54855f7516de3d3 w32api-2.5-src.tar.gz 980189
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1-r1 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1-r1
deleted file mode 100644
index dc1897121fc4..000000000000
--- a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
-MD5 f99a57c39ca784b3aaededd9f7c384d5 gcc-3.4.1-20040711-1-src.diff.gz 85777
-MD5 21e9970d7c828eabd380132aa806dd41 mingw-runtime-3.3-src.tar.gz 271695
-MD5 395369c2c0c67394e54855f7516de3d3 w32api-2.5-src.tar.gz 980189
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2-r1 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2-r1
new file mode 100644
index 000000000000..d80626209f09
--- /dev/null
+++ b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2-r1
@@ -0,0 +1,4 @@
+MD5 2fada3a3effd2fd791df09df1f1534b3 gcc-3.4.2.tar.bz2 27246826
+MD5 b0a587fc228f5d980eb8ef36692045b7 gcc-3.4.2-20040916-1-src.diff.gz 104532
+MD5 d5bb1d754e3315a768fe69056b3ee8d3 mingw-runtime-3.7-src.tar.gz 287814
+MD5 c9204f46e6b6deeb1c182bc75ad4d88f w32api-3.2-src.tar.gz 1082652
diff --git a/dev-util/xmingw-gcc/files/gcc-3.3.1-includefix.diff b/dev-util/xmingw-gcc/files/gcc-3.3.1-includefix.diff
deleted file mode 100644
index 3a90c8ab5212..000000000000
--- a/dev-util/xmingw-gcc/files/gcc-3.3.1-includefix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Stefan Jones <cretin@gentoo.org>:
-	Some more include dirs are needed in certain places when bootstraping
-	a clean system to make g++
-
---- gcc-3.3.1/gcc/config/i386/t-cygming.jj	2003-10-01 21:26:15.614537232 +0100
-+++ gcc-3.3.1/gcc/config/i386/t-cygming	2003-10-01 21:29:59.550493792 +0100
-@@ -8,7 +8,8 @@
- # If we are building next to winsup, this will let us find the real
- # limits.h when building libgcc2.  Otherwise, winsup must be installed
- # first.
--LIBGCC2_INCLUDES = -I$(srcdir)/../winsup/w32api/include
-+LIBGCC2_INCLUDES = -I$(srcdir)/../winsup/w32api/include \
-+	-I$(srcdir)/../winsup/cygwin/include
- 
- LIB2FUNCS_EXTRA = $(srcdir)/config/i386/w32-shared-ptr.c
- 
-@@ -19,3 +20,4 @@
- STMP_FIXPROTO=
- STMP_FIXINC=stmp-fixinc
- 
-+CRTSTUFF_CFLAGS += -isystem $(srcdir)/../winsup/cygwin/include
diff --git a/dev-util/xmingw-gcc/metadata.xml b/dev-util/xmingw-gcc/metadata.xml
new file mode 100644
index 000000000000..45d7d45c4bed
--- /dev/null
+++ b/dev-util/xmingw-gcc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>cretin@gentoo.org</email>
+<name>Stefan Jones</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.3.1.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.3.1.ebuild
deleted file mode 100644
index 09444226ea82..000000000000
--- a/dev-util/xmingw-gcc/xmingw-gcc-3.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.3.1.ebuild,v 1.7 2005/02/09 12:57:22 blubb Exp $
-
-MY_P=${P/xmingw-/}
-S=${WORKDIR}/${MY_P}
-MINGW_PATCH=gcc-3.3.1-20030804-1-src.diff.gz
-RUNTIME=mingw-runtime-3.2
-W32API=w32api-2.4
-
-DESCRIPTION="The GNU Compiler Collection - i386-mingw32msvc-gcc only"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${MY_P}/${MY_P}.tar.bz2
-		mirror://sourceforge/mingw/${MINGW_PATCH}
-		mirror://sourceforge/mingw/${RUNTIME}-src.tar.gz
-		mirror://sourceforge/mingw/${W32API}-src.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-util/xmingw-binutils"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack ${RUNTIME}-src.tar.gz
-	unpack ${W32API}-src.tar.gz
-	cd ${S}; gzip -dc ${DISTDIR}/${MINGW_PATCH} | patch -p1
-	einfo "The rejects gc.h and win32_threads.c are expected, see bug #44858"
-	patch -p1 < ${FILESDIR}/gcc-3.3.1-includefix.diff
-
-	mkdir -p ${S}/winsup/cygwin ${S}/winsup/w32api
-	cd ${S}/winsup/cygwin;ln -s ${WORKDIR}/${RUNTIME}/include .
-	cd ${S}/winsup/w32api;ln -s ${WORKDIR}/${W32API}/include .
-}
-
-src_compile() {
-	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
-	unset CFLAGS CXXFLAGS
-	if has_version dev-util/xmingw-runtime \
-	&& has_version dev-util/xmingw-w32api
-	then
-		lang=c,c++
-	else
-		lang=c
-	fi
-
-	./configure \
-		--target=i386-mingw32msvc \
-		--prefix=/opt/xmingw \
-		--enable-languages=${lang} \
-		--disable-shared \
-		--disable-nls \
-		--enable-threads \
-		--with-gcc \
-		--with-gnu-ld \
-		--with-gnu-as \
-		--disable-win32-registry \
-		--enable-sjlj-exceptions \
-		--without-x \
-		--without-newlib \
-			|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild
deleted file mode 100644
index 9c7fe466d646..000000000000
--- a/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild,v 1.2 2005/02/09 12:57:22 blubb Exp $
-
-MY_P=${P/xmingw-/}
-S=${WORKDIR}/${MY_P}
-MINGW_PATCH=gcc-3.4.1-20040711-1-src.diff.gz
-RUNTIME=mingw-runtime-3.3
-W32API=w32api-2.5
-
-DESCRIPTION="The GNU Compiler Collection - i386-mingw32msvc-gcc only"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${MY_P}/${MY_P}.tar.bz2
-		mirror://sourceforge/mingw/${MINGW_PATCH}
-		mirror://sourceforge/mingw/${RUNTIME}-src.tar.gz
-		mirror://sourceforge/mingw/${W32API}-src.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-util/xmingw-binutils"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack ${RUNTIME}-src.tar.gz
-	unpack ${W32API}-src.tar.gz
-	cd ${S}; gzip -dc ${DISTDIR}/${MINGW_PATCH} | patch -p1
-	patch -p1 < ${FILESDIR}/gcc-3.4.1-includefix.diff
-
-	mkdir -p ${S}/winsup/cygwin ${S}/winsup/w32api
-	cd ${S}/winsup/cygwin;ln -s ${WORKDIR}/${RUNTIME}/include .
-	cd ${S}/winsup/w32api;ln -s ${WORKDIR}/${W32API}/include .
-}
-
-src_compile() {
-	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
-	unset CFLAGS CXXFLAGS
-	if has_version dev-util/xmingw-runtime \
-	&& has_version dev-util/xmingw-w32api
-	then
-		lang=c,c++
-	else
-		lang=c
-	fi
-
-	./configure \
-		--target=i386-mingw32msvc \
-		--prefix=/opt/xmingw \
-		--enable-languages=${lang} \
-		--disable-shared \
-		--disable-nls \
-		--enable-threads \
-		--with-gcc \
-		--with-gnu-ld \
-		--with-gnu-as \
-		--disable-win32-registry \
-		--enable-sjlj-exceptions \
-		--without-x \
-		--without-newlib \
-			|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.4.1-r1.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2-r1.ebuild
index cc21d623b283..b45c749dd0af 100644
--- a/dev-util/xmingw-gcc/xmingw-gcc-3.4.1-r1.ebuild
+++ b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.1-r1.ebuild,v 1.3 2005/03/08 17:41:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.2-r1.ebuild,v 1.1 2005/05/27 17:33:38 cretin Exp $
 
 MY_P=${P/xmingw-/}
 S=${WORKDIR}/${MY_P}
-MINGW_PATCH=gcc-3.4.1-20040711-1-src.diff.gz
-RUNTIME=mingw-runtime-3.3
-W32API=w32api-2.5
+MINGW_PATCH=gcc-3.4.2-20040916-1-src.diff.gz
+RUNTIME=mingw-runtime-3.7
+W32API=w32api-3.2
 
 DESCRIPTION="The GNU Compiler Collection - i386-mingw32msvc-gcc only"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
@@ -17,8 +17,8 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${MY_P}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="fortran gcj debug"
+KEYWORDS="~x86 ~amd64"
+IUSE="fortran gcj debug nocxx"
 
 DEPEND="dev-util/xmingw-binutils"
 
@@ -41,7 +41,8 @@ src_compile() {
 	if has_version dev-util/xmingw-runtime \
 	&& has_version dev-util/xmingw-w32api
 	then
-		lang=c,c++
+		lang=c
+		use nocxx || lang="${lang},c++"
 		use fortran && lang="${lang},f77"
 
 		if use gcj; then
@@ -82,4 +83,5 @@ src_compile() {
 src_install() {
 	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
 	make DESTDIR="${D}" install || die "make install failed"
+	doenvd ${FILESDIR}/05xmingw
 }
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild
index dc798d7dfd38..1b4762ddfa0a 100644
--- a/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild
+++ b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild,v 1.3 2005/03/08 17:41:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild,v 1.4 2005/05/27 17:33:38 cretin Exp $
 
 MY_P=${P/xmingw-/}
 S=${WORKDIR}/${MY_P}
@@ -17,7 +17,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${MY_P}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="fortran gcj debug"
 
 DEPEND="dev-util/xmingw-binutils"