unsetting ldflags. closes 58836

15 files changed, 23 insertions, 539 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4f38a0624104..a6b6f2611e31 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.76 2004/07/19 08:46:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.77 2004/08/03 15:44:30 mholzer Exp $
+
+  03 Aug 2004; Martin Holzer <mholzer@gentoo.org> wine-20040121.ebuild,
+  wine-20040213.ebuild, wine-20040309.ebuild, wine-20040408-r1.ebuild,
+  wine-20040408.ebuild, wine-20040505.ebuild, wine-20040615-r1.ebuild,
+  wine-20040615.ebuild, wine-20040716.ebuild:
+  unsetting ldflags. closes 58836
 
 *wine-20040716 (19 Jul 2004)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index a359573f5287..9af782ac3db8 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,24 +1,16 @@
-MD5 44e535935efed5038a68bf8e8a91d86d wine-20040408.ebuild 3268
-MD5 d1628478184ac7018efb0820452f9d1d wine-20040408-r1.ebuild 3269
-MD5 24e0c9d978568399d08b5110fc9f37b5 wine-20040121.ebuild 3267
-MD5 ff6783dcc9a7d16bb365acff0c81dec4 wine-20040615-r1.ebuild 3463
-MD5 0c5e08e32b01d33dcb2d317d40e141d1 wine-20040615.ebuild 3399
+MD5 7de6068b2fa67e8430ce2ac29961149d wine-20040408-r1.ebuild 3277
+MD5 e9ad34610fcd2d127c14e64950c95497 wine-20040121.ebuild 3275
+MD5 f8b49bdd501268de9f2ee7aa642b5300 wine-20040615-r1.ebuild 3471
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 ba30e4e9a414d79f787b4ad2ca55d012 wine-20040505.ebuild 3317
-MD5 684f07277fc6e7b8022cb6f286e2b8fc wine-20040213.ebuild 3268
-MD5 84883dd22452b4b9cfd3ad99553ac518 ChangeLog 13207
-MD5 705a3efbcf18da7f70888b8de9ceacdb wine-20040716.ebuild 3437
-MD5 613e3e8d4ffd83b28198b385eb4401be wine-20040309.ebuild 3268
+MD5 808e305f9c8d65c78dbf90400b1d7572 wine-20040505.ebuild 3325
+MD5 6111a85d7f14dd97627c303240caa276 ChangeLog 13502
+MD5 186919f09f97fe5158908ba472ba25df wine-20040716.ebuild 3445
 MD5 b5307649654483532930907b0485eaf0 files/wine-alsa.patch 86359
 MD5 b1893ef0ed5c38dabcbea9fcc3d35f59 files/digest-wine-20040716 212
 MD5 4312d9c1f7af214bd5cd25fe5f7d4521 files/digest-wine-20040615-r1 212
 MD5 b31b2888ece1838bb246d5d66818c152 files/digest-wine-20040408-r1 215
 MD5 73c3f4c41391cb7ba033bf8d34f54029 files/digest-wine-20040505 212
-MD5 8eb0a0c62fa1579183fab16d341cbcdd files/digest-wine-20040309 212
-MD5 5aab2a3ecd0a2d07663439a38ccc0d19 files/digest-wine-20040213 211
-MD5 4312d9c1f7af214bd5cd25fe5f7d4521 files/digest-wine-20040615 212
 MD5 f4a143ff88d5e04d456aed38b376ddb3 files/scrollbars.diff 3102
 MD5 52cb259a2838a89b23a6f00ef4b98bd0 files/digest-wine-20040121 211
 MD5 ae28341f05c0916661c1346a28720230 files/QueryActCtxw_Photoshop7.0.diff 686
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
-MD5 5ccb19e0bd3c46b8c0deb2999dd32557 files/digest-wine-20040408 212
diff --git a/app-emulation/wine/files/digest-wine-20040213 b/app-emulation/wine/files/digest-wine-20040213
deleted file mode 100644
index 4cfdc58e6ae8..000000000000
--- a/app-emulation/wine/files/digest-wine-20040213
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 074fb9771a600a32538cf15dc1cfcf6a Wine-20040213.tar.gz 9933262
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20040213-fake_windows.tar.bz2 500
-MD5 674d52c1985297ae269ff0af8df8e62b wine-20040213-misc.tar.bz2 5154
diff --git a/app-emulation/wine/files/digest-wine-20040309 b/app-emulation/wine/files/digest-wine-20040309
deleted file mode 100644
index 135af8523654..000000000000
--- a/app-emulation/wine/files/digest-wine-20040309
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d0a23943481e703a7d3538269f788e0 Wine-20040309.tar.gz 10060696
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20040309-fake_windows.tar.bz2 500
-MD5 674d52c1985297ae269ff0af8df8e62b wine-20040309-misc.tar.bz2 5154
diff --git a/app-emulation/wine/files/digest-wine-20040408 b/app-emulation/wine/files/digest-wine-20040408
deleted file mode 100644
index aa3b485d0cbc..000000000000
--- a/app-emulation/wine/files/digest-wine-20040408
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af9268ee2f20d517cef844134212088e Wine-20040408.tar.gz 10354583
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20040408-fake_windows.tar.bz2 500
-MD5 674d52c1985297ae269ff0af8df8e62b wine-20040408-misc.tar.bz2 5154
diff --git a/app-emulation/wine/files/digest-wine-20040615 b/app-emulation/wine/files/digest-wine-20040615
deleted file mode 100644
index d343067f1b07..000000000000
--- a/app-emulation/wine/files/digest-wine-20040615
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cfec5a33b596a08eefd2f8a44ccd205 Wine-20040615.tar.gz 10582792
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20040615-fake_windows.tar.bz2 500
-MD5 e85afd5661bfc1b6dffc05db480b52a8 wine-20040615-misc.tar.bz2 5300
diff --git a/app-emulation/wine/wine-20040121.ebuild b/app-emulation/wine/wine-20040121.ebuild
index 706146466c4e..0474e8e1cb45 100644
--- a/app-emulation/wine/wine-20040121.ebuild
+++ b/app-emulation/wine/wine-20040121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040121.ebuild,v 1.6 2004/07/08 14:33:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040121.ebuild,v 1.7 2004/08/03 15:44:30 mholzer Exp $
 
 inherit eutils base
 
@@ -37,7 +37,7 @@ src_unpack() {
 src_compile() {
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 
-	unset CFLAGS CXXFLAGS
+	unset CFLAGS CXXFLAGS LDFLAGS
 
 	ac_cv_header_jack_jack_h=no \
 	ac_cv_lib_soname_jack= \
diff --git a/app-emulation/wine/wine-20040213.ebuild b/app-emulation/wine/wine-20040213.ebuild
deleted file mode 100644
index 586b276b3f13..000000000000
--- a/app-emulation/wine/wine-20040213.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040213.ebuild,v 1.5 2004/07/08 14:33:53 mholzer Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz
-	 mirror://gentoo/${P}-fake_windows.tar.bz2
-	 mirror://gentoo/${PF}-misc.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="X alsa arts cups debug nas nptl opengl tcltk"
-
-DEPEND="sys-devel/gcc
-	sys-devel/flex
-	>=sys-libs/ncurses-5.2
-	>=media-libs/freetype-2.0.0
-	X? ( virtual/x11 )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
-	opengl? ( virtual/opengl )
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack Wine-${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
-}
-
-src_compile() {
-	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-
-	unset CFLAGS CXXFLAGS
-
-	ac_cv_header_jack_jack_h=no \
-	ac_cv_lib_soname_jack= \
-	./configure \
-		--prefix=/usr/lib/wine \
-		--sysconfdir=/etc/wine \
-		--host=${CHOST} \
-		--enable-curses \
-		`use_enable opengl` \
-		`use_with nptl` \
-		`use_enable debug trace` \
-		`use_enable debug` \
-		|| die "configure failed"
-
-	cd ${S}/programs/winetest
-	sed -i 's:wine.pm:include/wine.pm:' Makefile
-
-	# No parallel make
-	cd ${S}
-	make depend all || die
-	cd programs && emake || die
-}
-
-src_install() {
-	local WINEMAKEOPTS="prefix=${D}/usr/lib/wine"
-
-	### Install wine to ${D}
-	make ${WINEMAKEOPTS} install || die
-	cd ${S}/programs
-	make ${WINEMAKEOPTS} install || die
-
-	# Needed for later installation
-	dodir /usr/bin
-
-	### Creation of /usr/lib/wine/.data
-	# Setting up fake_windows
-	dodir /usr/lib/wine/.data
-	cd ${D}/usr/lib/wine/.data
-	tar jxvf ${DISTDIR}/${P}-fake_windows.tar.bz2
-	chown root:root fake_windows/ -R
-
-	# Unpacking the miscellaneous files
-	tar jxvf ${DISTDIR}/${PF}-misc.tar.bz2
-	chown root:root config
-
-	# moving the wrappers to bin/
-	insinto /usr/bin
-	dobin regedit-wine wine winedbg
-	rm regedit-wine wine winedbg
-
-	# copying the winedefault.reg into .data
-	insinto /usr/lib/wine/.data
-	doins ${WORKDIR}/${P}/winedefault.reg
-
-	# Set up this dynamic data
-	cd ${S}
-	insinto /usr/lib/wine/.data/fake_windows/Windows
-	doins documentation/samples/system.ini
-	doins documentation/samples/generic.ppd
-	## Setup of .data complete
-
-	### Misc tasks
-	# Take care of the documentation
-	cd ${S}
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
-
-	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-	rm ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-
-	# Remove the executable flag from those libraries.
-	cd ${D}/usr/lib/wine/lib/wine
-	chmod a-x *.so
-}
-
-pkg_postinst() {
-	einfo "Use /usr/bin/wine to start wine. This is a wrapper-script"
-	einfo "which will take care of everything else."
-	einfo ""
-	einfo "Use /usr/bin/regedit-wine to import registry files into the"
-	einfo "wine registry."
-}
diff --git a/app-emulation/wine/wine-20040309.ebuild b/app-emulation/wine/wine-20040309.ebuild
deleted file mode 100644
index c47bf0de6892..000000000000
--- a/app-emulation/wine/wine-20040309.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040309.ebuild,v 1.5 2004/07/08 14:33:53 mholzer Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz
-	 mirror://gentoo/${P}-fake_windows.tar.bz2
-	 mirror://gentoo/${PF}-misc.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="X alsa arts cups debug nas nptl opengl tcltk"
-
-DEPEND="sys-devel/gcc
-	sys-devel/flex
-	>=sys-libs/ncurses-5.2
-	>=media-libs/freetype-2.0.0
-	X? ( virtual/x11 )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
-	opengl? ( virtual/opengl )
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack Wine-${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
-}
-
-src_compile() {
-	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-
-	unset CFLAGS CXXFLAGS
-
-	ac_cv_header_jack_jack_h=no \
-	ac_cv_lib_soname_jack= \
-	./configure \
-		--prefix=/usr/lib/wine \
-		--sysconfdir=/etc/wine \
-		--host=${CHOST} \
-		--enable-curses \
-		`use_enable opengl` \
-		`use_with nptl` \
-		`use_enable debug trace` \
-		`use_enable debug` \
-		|| die "configure failed"
-
-	cd ${S}/programs/winetest
-	sed -i 's:wine.pm:include/wine.pm:' Makefile
-
-	# No parallel make
-	cd ${S}
-	make depend all || die
-	cd programs && emake || die
-}
-
-src_install() {
-	local WINEMAKEOPTS="prefix=${D}/usr/lib/wine"
-
-	### Install wine to ${D}
-	make ${WINEMAKEOPTS} install || die
-	cd ${S}/programs
-	make ${WINEMAKEOPTS} install || die
-
-	# Needed for later installation
-	dodir /usr/bin
-
-	### Creation of /usr/lib/wine/.data
-	# Setting up fake_windows
-	dodir /usr/lib/wine/.data
-	cd ${D}/usr/lib/wine/.data
-	tar jxvf ${DISTDIR}/${P}-fake_windows.tar.bz2
-	chown root:root fake_windows/ -R
-
-	# Unpacking the miscellaneous files
-	tar jxvf ${DISTDIR}/${PF}-misc.tar.bz2
-	chown root:root config
-
-	# moving the wrappers to bin/
-	insinto /usr/bin
-	dobin regedit-wine wine winedbg
-	rm regedit-wine wine winedbg
-
-	# copying the winedefault.reg into .data
-	insinto /usr/lib/wine/.data
-	doins ${WORKDIR}/${P}/winedefault.reg
-
-	# Set up this dynamic data
-	cd ${S}
-	insinto /usr/lib/wine/.data/fake_windows/Windows
-	doins documentation/samples/system.ini
-	doins documentation/samples/generic.ppd
-	## Setup of .data complete
-
-	### Misc tasks
-	# Take care of the documentation
-	cd ${S}
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
-
-	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-	rm ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-
-	# Remove the executable flag from those libraries.
-	cd ${D}/usr/lib/wine/lib/wine
-	chmod a-x *.so
-}
-
-pkg_postinst() {
-	einfo "Use /usr/bin/wine to start wine. This is a wrapper-script"
-	einfo "which will take care of everything else."
-	einfo ""
-	einfo "Use /usr/bin/regedit-wine to import registry files into the"
-	einfo "wine registry."
-}
diff --git a/app-emulation/wine/wine-20040408-r1.ebuild b/app-emulation/wine/wine-20040408-r1.ebuild
index 8fc4af47fc50..0e9b3a865a93 100644
--- a/app-emulation/wine/wine-20040408-r1.ebuild
+++ b/app-emulation/wine/wine-20040408-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040408-r1.ebuild,v 1.5 2004/07/18 20:16:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040408-r1.ebuild,v 1.6 2004/08/03 15:44:30 mholzer Exp $
 
 inherit eutils base
 
@@ -37,7 +37,7 @@ src_unpack() {
 src_compile() {
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 
-	unset CFLAGS CXXFLAGS
+	unset CFLAGS CXXFLAGS LDFLAGS
 
 	ac_cv_header_jack_jack_h=no \
 	ac_cv_lib_soname_jack= \
diff --git a/app-emulation/wine/wine-20040408.ebuild b/app-emulation/wine/wine-20040408.ebuild
deleted file mode 100644
index 4b88e692e1c7..000000000000
--- a/app-emulation/wine/wine-20040408.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040408.ebuild,v 1.5 2004/07/08 14:33:53 mholzer Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz
-	 mirror://gentoo/${P}-fake_windows.tar.bz2
-	 mirror://gentoo/${PF}-misc.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="X alsa arts cups debug nas nptl opengl tcltk"
-
-DEPEND="sys-devel/gcc
-	sys-devel/flex
-	>=sys-libs/ncurses-5.2
-	>=media-libs/freetype-2.0.0
-	X? ( virtual/x11 )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
-	opengl? ( virtual/opengl )
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack Wine-${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
-}
-
-src_compile() {
-	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-
-	unset CFLAGS CXXFLAGS
-
-	ac_cv_header_jack_jack_h=no \
-	ac_cv_lib_soname_jack= \
-	./configure \
-		--prefix=/usr/lib/wine \
-		--sysconfdir=/etc/wine \
-		--host=${CHOST} \
-		--enable-curses \
-		`use_enable opengl` \
-		`use_with nptl` \
-		`use_enable debug trace` \
-		`use_enable debug` \
-		|| die "configure failed"
-
-	cd ${S}/programs/winetest
-	sed -i 's:wine.pm:include/wine.pm:' Makefile
-
-	# No parallel make
-	cd ${S}
-	make depend all || die
-	cd programs && emake || die
-}
-
-src_install() {
-	local WINEMAKEOPTS="prefix=${D}/usr/lib/wine"
-
-	### Install wine to ${D}
-	make ${WINEMAKEOPTS} install || die
-	cd ${S}/programs
-	make ${WINEMAKEOPTS} install || die
-
-	# Needed for later installation
-	dodir /usr/bin
-
-	### Creation of /usr/lib/wine/.data
-	# Setting up fake_windows
-	dodir /usr/lib/wine/.data
-	cd ${D}/usr/lib/wine/.data
-	tar jxvf ${DISTDIR}/${P}-fake_windows.tar.bz2
-	chown root:root fake_windows/ -R
-
-	# Unpacking the miscellaneous files
-	tar jxvf ${DISTDIR}/${PF}-misc.tar.bz2
-	chown root:root config
-
-	# moving the wrappers to bin/
-	insinto /usr/bin
-	dobin regedit-wine wine winedbg
-	rm regedit-wine wine winedbg
-
-	# copying the winedefault.reg into .data
-	insinto /usr/lib/wine/.data
-	doins ${WORKDIR}/${P}/winedefault.reg
-
-	# Set up this dynamic data
-	cd ${S}
-	insinto /usr/lib/wine/.data/fake_windows/Windows
-	doins documentation/samples/system.ini
-	doins documentation/samples/generic.ppd
-	## Setup of .data complete
-
-	### Misc tasks
-	# Take care of the documentation
-	cd ${S}
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
-
-	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-	rm ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-
-	# Remove the executable flag from those libraries.
-	cd ${D}/usr/lib/wine/lib/wine
-	chmod a-x *.so
-}
-
-pkg_postinst() {
-	einfo "Use /usr/bin/wine to start wine. This is a wrapper-script"
-	einfo "which will take care of everything else."
-	einfo ""
-	einfo "Use /usr/bin/regedit-wine to import registry files into the"
-	einfo "wine registry."
-}
diff --git a/app-emulation/wine/wine-20040505.ebuild b/app-emulation/wine/wine-20040505.ebuild
index efed15a47ced..78b8ff3efcb0 100644
--- a/app-emulation/wine/wine-20040505.ebuild
+++ b/app-emulation/wine/wine-20040505.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040505.ebuild,v 1.3 2004/07/08 14:33:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040505.ebuild,v 1.4 2004/08/03 15:44:30 mholzer Exp $
 
 inherit eutils base
 
@@ -38,7 +38,7 @@ src_unpack() {
 src_compile() {
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 
-	unset CFLAGS CXXFLAGS
+	unset CFLAGS CXXFLAGS LDFLAGS
 
 	ac_cv_header_jack_jack_h=no \
 	ac_cv_lib_soname_jack= \
diff --git a/app-emulation/wine/wine-20040615-r1.ebuild b/app-emulation/wine/wine-20040615-r1.ebuild
index eec1b888754f..45c9ddacba43 100644
--- a/app-emulation/wine/wine-20040615-r1.ebuild
+++ b/app-emulation/wine/wine-20040615-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040615-r1.ebuild,v 1.2 2004/07/18 19:39:55 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040615-r1.ebuild,v 1.3 2004/08/03 15:44:30 mholzer Exp $
 
 inherit eutils base
 
@@ -39,7 +39,7 @@ src_unpack() {
 src_compile() {
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 
-	unset CFLAGS CXXFLAGS
+	unset CFLAGS CXXFLAGS LDFLAGS
 
 	ac_cv_header_jack_jack_h=no \
 	ac_cv_lib_soname_jack= \
diff --git a/app-emulation/wine/wine-20040615.ebuild b/app-emulation/wine/wine-20040615.ebuild
deleted file mode 100644
index 7416446bc458..000000000000
--- a/app-emulation/wine/wine-20040615.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040615.ebuild,v 1.2 2004/07/08 14:33:53 mholzer Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz
-	 mirror://gentoo/${P}-fake_windows.tar.bz2
-	 mirror://gentoo/${P}-misc.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE="X alsa arts cups debug nas nptl opengl tcltk"
-
-DEPEND="sys-devel/gcc
-	sys-devel/flex
-	>=sys-libs/ncurses-5.2
-	>=media-libs/freetype-2.0.0
-	X? ( virtual/x11 )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups )
-	opengl? ( virtual/opengl )
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack Wine-${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/winearts-kdecvs-fix.patch
-	epatch ${FILESDIR}/QueryActCtxw_Photoshop7.0.diff
-}
-
-src_compile() {
-	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-
-	unset CFLAGS CXXFLAGS
-
-	ac_cv_header_jack_jack_h=no \
-	ac_cv_lib_soname_jack= \
-	./configure \
-		--prefix=/usr/lib/wine \
-		--sysconfdir=/etc/wine \
-		--host=${CHOST} \
-		--enable-curses \
-		`use_enable opengl` \
-		`use_with nptl` \
-		`use_enable debug trace` \
-		`use_enable debug` \
-		|| die "configure failed"
-
-	cd ${S}/programs/winetest
-	sed -i 's:wine.pm:include/wine.pm:' Makefile
-
-	# No parallel make
-	cd ${S}
-	make depend all || die
-	cd programs && emake || die
-}
-
-src_install() {
-	local WINEMAKEOPTS="prefix=${D}/usr/lib/wine"
-
-	### Install wine to ${D}
-	make ${WINEMAKEOPTS} install || die
-	cd ${S}/programs
-	make ${WINEMAKEOPTS} install || die
-
-	# Needed for later installation
-	dodir /usr/bin
-
-	### Creation of /usr/lib/wine/.data
-	# Setting up fake_windows
-	dodir /usr/lib/wine/.data
-	cd ${D}/usr/lib/wine/.data
-	tar jxvf ${DISTDIR}/${P}-fake_windows.tar.bz2
-	chown root:root fake_windows/ -R
-
-	# Unpacking the miscellaneous files
-	tar jxvf ${DISTDIR}/${PF}-misc.tar.bz2
-	chown root:root config
-
-	# moving the wrappers to bin/
-	insinto /usr/bin
-	dobin regedit-wine wine winedbg
-	rm regedit-wine wine winedbg
-
-	# copying the wine.inf into .data (used to be winedefault.reg)
-	cd ${S}
-	dodir /usr/lib/wine/.data
-	insinto /usr/lib/wine/.data
-	doins tools/wine.inf
-	insinto /usr/lib/wine/.data/fake_windows/Windows/System
-	doins tools/wine.inf
-	insinto /usr/lib/wine/.data/fake_windows/Windows/Inf
-	doins tools/wine.inf
-
-	### Misc tasks
-	# Take care of the documentation
-	cd ${S}
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
-
-	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-	rm ${D}/usr/lib/${PN}/man/man5/wine.conf.5
-
-	# Remove the executable flag from those libraries.
-	cd ${D}/usr/lib/wine/lib/wine
-	chmod a-x *.so
-}
-
-pkg_postinst() {
-	einfo "Use /usr/bin/wine to start wine. This is a wrapper-script"
-	einfo "which will take care of everything else."
-	einfo ""
-	einfo "if you have problems with nptl, use wine-pthread to start wine"
-	einfo ""
-	einfo "Use /usr/bin/regedit-wine to import registry files into the"
-	einfo "wine registry."
-}
diff --git a/app-emulation/wine/wine-20040716.ebuild b/app-emulation/wine/wine-20040716.ebuild
index c193337512b1..ed708e6b9bb1 100644
--- a/app-emulation/wine/wine-20040716.ebuild
+++ b/app-emulation/wine/wine-20040716.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040716.ebuild,v 1.1 2004/07/19 08:46:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040716.ebuild,v 1.2 2004/08/03 15:44:30 mholzer Exp $
 
 inherit eutils base
 
@@ -38,7 +38,7 @@ src_unpack() {
 src_compile() {
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 
-	unset CFLAGS CXXFLAGS
+	unset CFLAGS CXXFLAGS LDFLAGS
 
 	ac_cv_header_jack_jack_h=no \
 	ac_cv_lib_soname_jack= \