updating wrapper script.

5 files changed, 154 insertions, 7 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 74232efd3283..8b51816facb6 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.69 2004/06/24 22:36:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.70 2004/06/28 19:12:05 mholzer Exp $
+
+*wine-20040408-r1 (28 Jun 2004)
+
+  28 Jun 2004; Martin Holzer <mholzer@gentoo.org> wine-20040408-r1.ebuild:
+  updating wrapper script. many thx to eGore <egore@gmx.de> . closes 47496
 
 *wine-20040408 (10 Apr 2004)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3637c38d9d67..1275bd7f5408 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,12 +1,14 @@
 MD5 ffe1eb3ff0a970fb073b2acd9046e1c8 wine-20040408.ebuild 3246
-MD5 0025633519de058f5688aba9a163a3b7 wine-20040213.ebuild 3246
+MD5 dc9c6c4eddb44d9ef4944be01c7b95a8 wine-20040408-r1.ebuild 3573
 MD5 2c58c20002d2d7d87d4d97f7d47c5c25 wine-20040121.ebuild 3245
-MD5 e5b3cb54d02106c4069c1b99f58fb278 wine-20040309.ebuild 3246
-MD5 5c42dbf8a91b2d4df29164d9d79dce4a ChangeLog 11979
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
+MD5 0025633519de058f5688aba9a163a3b7 wine-20040213.ebuild 3246
+MD5 5c42dbf8a91b2d4df29164d9d79dce4a ChangeLog 11979
+MD5 e5b3cb54d02106c4069c1b99f58fb278 wine-20040309.ebuild 3246
 MD5 b5307649654483532930907b0485eaf0 files/wine-alsa.patch 86359
-MD5 52cb259a2838a89b23a6f00ef4b98bd0 files/digest-wine-20040121 211
-MD5 5aab2a3ecd0a2d07663439a38ccc0d19 files/digest-wine-20040213 211
+MD5 b31b2888ece1838bb246d5d66818c152 files/digest-wine-20040408-r1 215
 MD5 8eb0a0c62fa1579183fab16d341cbcdd files/digest-wine-20040309 212
+MD5 5aab2a3ecd0a2d07663439a38ccc0d19 files/digest-wine-20040213 211
+MD5 52cb259a2838a89b23a6f00ef4b98bd0 files/digest-wine-20040121 211
+MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 5ccb19e0bd3c46b8c0deb2999dd32557 files/digest-wine-20040408 212
diff --git a/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff b/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff
new file mode 100644
index 000000000000..f9daa7a4212c
--- /dev/null
+++ b/app-emulation/wine/files/QueryActCtxw_Photoshop7.0.diff
@@ -0,0 +1,14 @@
+diff -Naur wine-cvs-20040602/dlls/kernel/kernel32.spec wine/dlls/kernel/kernel32.spec
+--- wine-cvs-20040602/dlls/kernel/kernel32.spec	2004-06-01 12:35:52.000000000 +0200
++++ wine/dlls/kernel/kernel32.spec	2004-06-02 12:29:53.000000000 +0200
+@@ -1090,7 +1090,9 @@
+ @ stdcall FindActCtxSectionStringA(long ptr long str ptr)
+ @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr)
+ @ stdcall GetCurrentActCtx(ptr)
+-@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr)
++# 20040602, Gismo / Luca Capello <luca@pca.it>
++# Stops Adobe Photoshop 7.0 working, bug #2017
++#@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr)
+ @ stdcall ReleaseActCtx(ptr)
+ @ stdcall ZombifyActCtx(ptr)
+ 
diff --git a/app-emulation/wine/files/digest-wine-20040408-r1 b/app-emulation/wine/files/digest-wine-20040408-r1
new file mode 100644
index 000000000000..f3905481343b
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20040408-r1
@@ -0,0 +1,3 @@
+MD5 af9268ee2f20d517cef844134212088e Wine-20040408.tar.gz 10354583
+MD5 af8da46a0e51578ff1e18e399141d628 wine-20040408-fake_windows.tar.bz2 500
+MD5 a65c2bb813bda78fa490f4920c4c0415 wine-20040408-r1-misc.tar.bz2 5185
diff --git a/app-emulation/wine/wine-20040408-r1.ebuild b/app-emulation/wine/wine-20040408-r1.ebuild
new file mode 100644
index 000000000000..09b899ce7f00
--- /dev/null
+++ b/app-emulation/wine/wine-20040408-r1.ebuild
@@ -0,0 +1,123 @@
+# 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.1 2004/06/28 19:12:05 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="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -*"
+IUSE="nas arts cups opengl alsa tcltk nptl debug"
+
+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 )"
+
+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 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 "Use /usr/bin/regedit-wine to import registry files into the"
+	einfo "wine registry."
+}