Version bumped. Closes 39025

4 files changed, 142 insertions, 8 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index e076b1cc8634..eb1c84d838a2 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.62 2003/12/15 09:00:40 coronalvr Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.63 2004/01/22 21:43:03 mholzer Exp $
+
+*wine-20040121 (22 Jan 2004)
+
+  22 Jan 2004; Martin Holzer <mholzer@gentoo.org> wine-20040121.ebuild:
+  Version bumped. Closes 39025
 
 *wine-20031212 (15 Dec 2003)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 6278738a1e4a..25af1eb1f81c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,10 +1,12 @@
-MD5 876f02ad3c4f03281fcb66855ca497d0 wine-20031016.ebuild 3320
+MD5 3c9c21514ed5873c17d8857dfa122491 wine-20040121.ebuild 3265
 MD5 c6c6cec8c96c05d2933e62f1772772a8 wine-20031212.ebuild 3265
-MD5 dfb90e5e211bca76f4770a8e1c8f0415 wine-20031118-r1.ebuild 3398
-MD5 c8611ae4805a255ed67e1dc1f2ee700a ChangeLog 11320
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
+MD5 876f02ad3c4f03281fcb66855ca497d0 wine-20031016.ebuild 3320
+MD5 dfb90e5e211bca76f4770a8e1c8f0415 wine-20031118-r1.ebuild 3398
+MD5 5d9d8d7c9e697774201b0b9db7d3a14d ChangeLog 11454
 MD5 b5307649654483532930907b0485eaf0 files/wine-alsa.patch 86359
-MD5 f4c2e1af9760b436e551775c823b6bed files/digest-wine-20031118-r1 285
+MD5 c3a36c7c0db543408287272b6058c7cf files/digest-wine-20031212 211
+MD5 52cb259a2838a89b23a6f00ef4b98bd0 files/digest-wine-20040121 211
 MD5 babcff559a797fab676479737edee307 files/digest-wine-20031016 282
-MD5 70f57f0783539581a5444df64b0784c4 files/digest-wine-20031212 211
+MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
+MD5 f4c2e1af9760b436e551775c823b6bed files/digest-wine-20031118-r1 285
diff --git a/app-emulation/wine/files/digest-wine-20040121 b/app-emulation/wine/files/digest-wine-20040121
new file mode 100644
index 000000000000..014867cc0702
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20040121
@@ -0,0 +1,3 @@
+MD5 33cf9c11e5208175bad540c0e822183e Wine-20040121.tar.gz 9865181
+MD5 af8da46a0e51578ff1e18e399141d628 wine-20040121-fake_windows.tar.bz2 500
+MD5 674d52c1985297ae269ff0af8df8e62b wine-20040121-misc.tar.bz2 5154
diff --git a/app-emulation/wine/wine-20040121.ebuild b/app-emulation/wine/wine-20040121.ebuild
new file mode 100644
index 000000000000..1ec9819f22b6
--- /dev/null
+++ b/app-emulation/wine/wine-20040121.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20040121.ebuild,v 1.1 2004/01/22 21:43:03 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 -ppc -sparc"
+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 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."
+}