New version

4 files changed, 99 insertions, 2 deletions

diff --git a/dev-util/xmingw-gcc/ChangeLog b/dev-util/xmingw-gcc/ChangeLog
index 9e98fa5c27ca..b0b7cbe78465 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.8 2004/09/22 18:06:10 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.9 2004/10/14 17:24:05 cretin Exp $
+
+*xmingw-gcc-3.4.2 (14 Oct 2004)
+
+  14 Oct 2004; Stefan Jones <cretin@gentoo.org>:
+  New version
 
 *xmingw-gcc-3.4.1-r1 (22 Sep 2004)
 
diff --git a/dev-util/xmingw-gcc/Manifest b/dev-util/xmingw-gcc/Manifest
index d4c9b2091076..fcfb02e25b64 100644
--- a/dev-util/xmingw-gcc/Manifest
+++ b/dev-util/xmingw-gcc/Manifest
@@ -1,9 +1,12 @@
 MD5 a3ca5ca6a98c29d21bb43fa4dd8a0d51 xmingw-gcc-3.4.1.ebuild 1906
 MD5 b79b78961a2a081810f9b965ead3f45b xmingw-gcc-3.4.1-r1.ebuild 2288
+MD5 cd906d69d44a3ff3e5e8069aab64483f xmingw-gcc-3.4.2.ebuild 3026
 MD5 3b27429dd2bb01904e721249b521a121 xmingw-gcc-3.3.1.ebuild 1982
-MD5 207bb4026c43637ab41046e7942a4bd2 ChangeLog 863
+MD5 3376acd00152afe07e5c820900ce63ae ChangeLog 998
 MD5 8f19d88fb59c78e728862642831634ab files/gcc-3.4.1-includefix.diff 682
 MD5 fe157877214b1306a195eec777847350 files/digest-xmingw-gcc-3.3.1 279
 MD5 d94869dc65ae2aec7ac12e6527d74d17 files/digest-xmingw-gcc-3.4.1 279
+MD5 b78de3c2650dcbee69d9197a2c518e01 files/digest-xmingw-gcc-3.4.2 281
 MD5 d94869dc65ae2aec7ac12e6527d74d17 files/digest-xmingw-gcc-3.4.1-r1 279
+MD5 3db3b3eece8d33f38f08cccbcceb23f5 files/i386-mingw32msvc.envd 550
 MD5 f15585878583770a2d6c7d0ce5014264 files/gcc-3.3.1-includefix.diff 798
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2
new file mode 100644
index 000000000000..7aed9f8f7cfc
--- /dev/null
+++ b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.2
@@ -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 cfa1e37c0e6e3243f82044687c859caa mingw-runtime-3.5-src.tar.gz 281598
+MD5 3a23cb1f26f22e1307f0605b72983ae5 w32api-3.1-src.tar.gz 1075675
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild
new file mode 100644
index 000000000000..a744d8e44a1f
--- /dev/null
+++ b/dev-util/xmingw-gcc/xmingw-gcc-3.4.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 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.1 2004/10/14 17:24:05 cretin Exp $
+
+MY_P=${P/xmingw-/}
+S=${WORKDIR}/${MY_P}
+MINGW_PATCH=gcc-3.4.2-20040916-1-src.diff.gz
+RUNTIME=mingw-runtime-3.5
+W32API=w32api-3.1
+
+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="f77 gcj debug"
+
+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
+	myconf=""
+	if has_version dev-util/xmingw-runtime \
+	&& has_version dev-util/xmingw-w32api
+	then
+		lang=c,c++
+		use f77 && lang="${lang},f77"
+
+		if use gcj; then
+			lang=${lang},java
+			myconf="${myconf} --enable-libgcj --disable-libgcj-debug --disable-java-awt \
+				--enable-java-gc=boehm --enable-interpreter --enable-hash-sychronization"
+		fi
+	else
+		lang=c
+	fi
+
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	else
+		myconf="${myconf} --disable-debug"
+	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 \
+		${myconf} \
+			|| 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"
+}