new version and a bump to stable

5 files changed, 146 insertions, 6 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index bd20141ff287..0738be2a68bd 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2003/07/12 11:39:45 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.50 2003/08/15 16:20:47 coronalvr Exp $
+
+*wine-20030813 (15 Aug 2003)
+
+  15 Aug 2003; Alex Veber <coronalvr@gentoo.org> wine-20030709.ebuild,
+  wine-20030813.ebuild:
+  new version + moved wine-20030709 to x86
 
   12 Jul 2003; Alex Veber <coronalvr@gentoo.org> wine-20030709.ebuild:
   removed the kpp patch, the real fix is to use a native dll
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 4d04a386ed96..dc6e8074111c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,6 +1,6 @@
-MD5 142924f9ac31a7abb5660dca93967059 wine-20030709.ebuild 3359
-MD5 142924f9ac31a7abb5660dca93967059 wine-20030813.ebuild 3359
-MD5 a4c6f5ca48430bba949579ef6816fd9f ChangeLog 9493
+MD5 4aa1aa872496b830ab794877a3548bab wine-20030709.ebuild 3361
+MD5 a3b7b61d52dbbff5a9c632cd14eb45b0 wine-20030813.ebuild 3362
+MD5 262d1853eb13ccc65d6a8f875d409071 ChangeLog 9662
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
 MD5 217e14f3956bd6a4407a0d11963b5108 wine-20030618-r1.ebuild 3474
 MD5 bf24bbde88c8128df0743ebe3ee2aa43 files/digest-wine-20030618-r1 351
diff --git a/app-emulation/wine/files/digest-wine-20030813 b/app-emulation/wine/files/digest-wine-20030813
new file mode 100644
index 000000000000..48ed24936786
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20030813
@@ -0,0 +1,4 @@
+MD5 0953ccebc491227411d35e0fbe388547 Wine-20030813.tar.gz 9211634
+MD5 fa4393cbc288ea89f761ad8d9258cc68 wine-20030813-xopenfont.patch 833
+MD5 af8da46a0e51578ff1e18e399141d628 wine-20030813-fake_windows.tar.bz2 500
+MD5 d30dd668ef6e2828364925de371c6f2e wine-20030813-misc.tar.bz2 4918
diff --git a/app-emulation/wine/wine-20030709.ebuild b/app-emulation/wine/wine-20030709.ebuild
index 5610aabab8b2..9154276020f4 100644
--- a/app-emulation/wine/wine-20030709.ebuild
+++ b/app-emulation/wine/wine-20030709.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030709.ebuild,v 1.4 2003/08/01 20:20:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030709.ebuild,v 1.5 2003/08/15 16:20:47 coronalvr Exp $
 
 inherit eutils base
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 -ppc -sparc"
 IUSE="nas arts cups opengl alsa tcltk nptl debug"
 
 DEPEND="sys-devel/gcc
diff --git a/app-emulation/wine/wine-20030813.ebuild b/app-emulation/wine/wine-20030813.ebuild
new file mode 100644
index 000000000000..703bb5e7003b
--- /dev/null
+++ b/app-emulation/wine/wine-20030813.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030813.ebuild,v 1.1 2003/08/15 16:20:47 coronalvr 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}-xopenfont.patch
+	 mirror://gentoo/${P}-fake_windows.tar.bz2
+	 mirror://gentoo/${P}-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
+	dev-util/yacc
+	>=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() {
+	base_src_unpack
+	cd ${S}
+	epatch ${DISTDIR}/${P}-xopenfont.patch
+	
+	#cd ${S}/dlls/oleaut32/
+	#patch -R < ${FILESDIR}/kpp-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
+
+	cd ${S}/programs/winetest
+	cp Makefile 1
+	sed -e 's:wine.pm:include/wine.pm:' 1 > 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}/${P}-misc.tar.bz2
+	chown root:root config
+
+	# moving the wrappers to bin/
+	insinto /usr/bin
+	dobin regedit-wine wine
+	rm regedit-wine wine
+
+	# 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."
+}