Version bump to fix #69554 / #69543 / others and enhancements by Vincent Béron.

4 files changed, 42 insertions, 38 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 59337d20e1c0..8ceb7e317e62 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.80 2004/10/28 01:35:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.81 2004/10/31 01:19:34 vapier Exp $
+
+*wine-20041019-r2 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org> -wine-20041019-r1.ebuild,
+  +wine-20041019-r2.ebuild:
+  Version bump to fix #69554 / #69543 / others and enhancements by Vincent Béron.
 
   27 Oct 2004; Mike Frysinger <vapier@gentoo.org>
   +files/20041019-no-stack.patch, wine-20041019-r1.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2fe7b1dab04e..ac2b1533ac49 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 142299d9b437eab2ec1d405572cc3e46 ChangeLog 14445
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 3b8447ea02976a98d6d64fff0d517ce6 wine-20041019-r1.ebuild 3628
 MD5 56b0990c71158a55583c149383d8b652 wine-20041019.ebuild 3753
+MD5 7af306e45285b1a80a0d98268af8d733 wine-20041019-r2.ebuild 3955
 MD5 0b8a40b373bf8ab6c0368dd5a64f5449 wine-20040716.ebuild 3443
 MD5 9dbf73d557110996f187b6ed6ae4f7ea files/20041019-load-wrappers.patch 1333
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 ae28341f05c0916661c1346a28720230 files/QueryActCtxw_Photoshop7.0.diff 686
-MD5 90d546d818e0470698ca6b743abe9fca files/digest-wine-20041019-r1 212
 MD5 64c9b939319110b4f44ef6f431262181 files/digest-wine-20041019 212
 MD5 b1893ef0ed5c38dabcbea9fcc3d35f59 files/digest-wine-20040716 212
 MD5 db29ae371718f3db0a915e65dc76f6f2 files/20041019-no-stack.patch 286
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhDiGHTu7gpaalycRAnegAJ9SkPG/Gi+WhroPL8xzcFUk6q4YdgCgt4K+
-+iRSVsF9F082xDs41Q/bxo4=
-=XF9x
------END PGP SIGNATURE-----
+MD5 4ccbe6abe9eafe846714dd218bc6d2dd files/digest-wine-20041019-r2 212
diff --git a/app-emulation/wine/files/digest-wine-20041019-r1 b/app-emulation/wine/files/digest-wine-20041019-r2
index d670cd4fc00f..3dc145cb5ad5 100644
--- a/app-emulation/wine/files/digest-wine-20041019-r1
+++ b/app-emulation/wine/files/digest-wine-20041019-r2
@@ -1,3 +1,3 @@
 MD5 412d0e6f2e364c43d8c77b5904c70da9 Wine-20041019.tar.gz 11058180
 MD5 5dfe8a4fcf3c9739592bc6219c3fbbe4 wine-20041027-fake_windows.tar.bz2 498
-MD5 a718ee15e68cb93806c095d95ba268e3 wine-20041027-misc.tar.bz2 2530
+MD5 0a79ba6c3c5f77b0e41a8e1f253318ea wine-20041030-misc.tar.bz2 2569
diff --git a/app-emulation/wine/wine-20041019-r1.ebuild b/app-emulation/wine/wine-20041019-r2.ebuild
index 79bd14b8ca2e..a74a2e1c755b 100644
--- a/app-emulation/wine/wine-20041019-r1.ebuild
+++ b/app-emulation/wine/wine-20041019-r2.ebuild
@@ -1,20 +1,22 @@
 # 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-20041019-r1.ebuild,v 1.5 2004/10/31 00:57:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r2.ebuild,v 1.1 2004/10/31 01:19:34 vapier Exp $
 
 inherit eutils flag-o-matic
 
-STAMP=20041027
+STAMP1=20041027
+STAMP2=20041030
 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/${PN}-${STAMP}-fake_windows.tar.bz2
-	 mirror://gentoo/${PN}-${STAMP}-misc.tar.bz2"
+	mirror://gentoo/${PN}-${STAMP1}-fake_windows.tar.bz2
+	mirror://gentoo/${PN}-${STAMP2}-misc.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${PN}-${STAMP2}-misc.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="X jack alsa arts cups debug nas opengl tcltk ncurses"
+IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses doc"
 
 DEPEND="sys-devel/gcc
 	sys-devel/flex
@@ -22,12 +24,15 @@ DEPEND="sys-devel/gcc
 	>=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	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 )
+	gif? ( media-libs/libungif )
+	jpeg? ( media-libs/jpeg )
+	glut? ( virtual/glut )
+	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
 	>=sys-apps/sed-4"
 
 src_unpack() {
@@ -56,11 +61,15 @@ config_cache() {
 
 src_compile() {
 	export LDCONFIG=/bin/true
-	config_cache jack jack_jack_h
-	config_cache cups cups_cups_h
-	config_cache alsa alsa_asoundlib_h sys_asoundlib_h
-	use arts || export ARTSCCONFIG="/bin/false"
-	config_cache nas audio_audiolib_h
+	config_cache jack header_jack_jack_h
+	config_cache cups header_cups_cups_h
+	config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open
+	config_cache arts path_ARTSCCONFIG
+	config_cache nas header_audio_audiolib_h header_audio_soundlib_h
+	config_cache gif header_gif_lib_h
+	config_cache glut lib_glut_glutMainLoop
+	config_cache jpeg header_jpeglib_h
+	config_cache oss sys_soundcard_h header_machine_soundcard_h header_soundcard_h
 
 	strip-flags
 
@@ -75,22 +84,21 @@ src_compile() {
 
 	emake -j1 depend || die "depend"
 	emake all || die "all"
-	emake -C programs || die "programs"
+	if use doc ; then
+		emake -C documentation doc || die "docs"
+	fi
 }
 
 src_install() {
-	### Install wine to ${D}
-	local WINEMAKEOPTS="
-		prefix=${D}/usr
-		bindir=${D}/usr/bin
-		datadir=${D}/usr/share
-		mandir=${D}/usr/share/man
-		libdir=${D}/usr/lib
-		dlldir=${D}/usr/lib/wine
-		"
-	make ${WINEMAKEOPTS} install || die "install"
-	cd ${S}/programs
-	make ${WINEMAKEOPTS} install || die "install programs"
+	make \
+		prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		datadir=${D}/usr/share \
+		mandir=${D}/usr/share/man \
+		libdir=${D}/usr/lib \
+		dlldir=${D}/usr/lib/wine \
+		install || die
+	use doc && dodoc documentation/*.pdf
 
 	# Needed for later installation
 	dodir /usr/bin