committing new version (now unmasked), removing all old ones. fixed all known problems, including

install -> /usr.

16 files changed, 13 insertions, 479 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 8267e06b5569..2dca4c1953bb 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.1 2002/02/01 21:53:01 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.2 2002/03/05 20:39:21 danarmak Exp $
+
+*wine-20020228 (5 Mar 2002)
+
+  5 Mar 2002; Dan Armak <danarmak@gentoo.org> Changelog:
+  
+  This is the latest snapshot. I've rewritten the ebuild, fixing all known issues,
+  including the compilation failures.
+  
+  Among the fixes are: install into /usr not /opt/wine, compile and install the manpages,
+  handle the onfig file correctly (there'll be a winesetuptk ebuild sometime soon), and more.
 
 *wine-20011004-r1 (1 Feb 2002)
 
diff --git a/app-emulation/wine/files/digest-wine-20010326 b/app-emulation/wine/files/digest-wine-20010326
deleted file mode 100644
index 8d979bd08b8d..000000000000
--- a/app-emulation/wine/files/digest-wine-20010326
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b8037c1aee32de2e725907901a6f3b2 Wine-20010326.tar.gz 5971881
diff --git a/app-emulation/wine/files/digest-wine-20010418 b/app-emulation/wine/files/digest-wine-20010418
deleted file mode 100644
index 5368e64e4a7f..000000000000
--- a/app-emulation/wine/files/digest-wine-20010418
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d773c35c57579ac78f8926c5a7f9a1ec Wine-20010418.tar.gz 6022943
-MD5 6fc1bce5da60f7fe8b96d8cac4845505 winesetuptk-0.5.1b.tar.gz 126639
diff --git a/app-emulation/wine/files/digest-wine-20010824 b/app-emulation/wine/files/digest-wine-20010824
deleted file mode 100644
index 2cf0f6da2e70..000000000000
--- a/app-emulation/wine/files/digest-wine-20010824
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95692d6539a756162a8bccb782ed4e14 Wine-20010824.tar.gz 6351974
diff --git a/app-emulation/wine/files/digest-wine-20011004 b/app-emulation/wine/files/digest-wine-20011004
deleted file mode 100644
index 78911691a269..000000000000
--- a/app-emulation/wine/files/digest-wine-20011004
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a23a634b7eff17a1631571f7be25421 Wine-20011004.tar.gz 6465884
diff --git a/app-emulation/wine/files/digest-wine-20011004-r1 b/app-emulation/wine/files/digest-wine-20011004-r1
deleted file mode 100644
index 78911691a269..000000000000
--- a/app-emulation/wine/files/digest-wine-20011004-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a23a634b7eff17a1631571f7be25421 Wine-20011004.tar.gz 6465884
diff --git a/app-emulation/wine/files/digest-wine-20020122 b/app-emulation/wine/files/digest-wine-20020122
deleted file mode 100644
index 1292f0f23851..000000000000
--- a/app-emulation/wine/files/digest-wine-20020122
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80d6f68330cd52b99789397aaa9b33b4 Wine-20020122.tar.gz 6844614
diff --git a/app-emulation/wine/files/digest-wine-20020228 b/app-emulation/wine/files/digest-wine-20020228
new file mode 100644
index 000000000000..5c4048d97624
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20020228
@@ -0,0 +1 @@
+MD5 022d1a35104331d4ebfc2bbca6d20efe Wine-20020228.tar.gz 6970746
diff --git a/app-emulation/wine/files/wine.conf b/app-emulation/wine/files/wine.conf
deleted file mode 100644
index 79dbbd1824a0..000000000000
--- a/app-emulation/wine/files/wine.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-[Drive A]
-Path=/mnt/fd0
-Type=floppy
-Label=Floppy
-Serial=87654321
-Device=/dev/fd0
-
-[Drive C]
-Path=/c
-Type=hd
-Label=MS-DOS
-Filesystem=win95
-
-[Drive D]
-Path=/cdrom
-Type=cdrom
-Label=CD-Rom
-Filesystem=win95
-; make sure that device is correct and has proper permissions !
-Device=/dev/cdrom
-
-[Drive E]
-Path=/tmp
-Type=hd
-Label=Tmp Drive
-Filesystem=win95
-
-[Drive F]
-Path=${HOME}
-Type=network
-Label=Home
-Filesystem=win95
-
-[wine]
-Windows=c:\windows
-System=c:\windows\system
-Temp=e:\
-Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
-Profile=c:\windows\Profiles\Administrator
-GraphicsDriver=x11drv
-
-# <wineconf>
-[DllDefaults]
-EXTRA_LD_LIBRARY_PATH=${HOME}/wine/cvs/lib
-DefaultLoadOrder = native, builtin, elfdll, so
-
-[DllOverrides]
-kernel32, gdi32, user32 = builtin
-krnl386, gdi, user      = builtin
-toolhelp                = builtin
-comdlg32, commdlg       = elfdll, builtin, native
-version, ver            = elfdll, builtin, native
-shell32, shell          = builtin, native
-lz32, lzexpand          = builtin, native
-commctrl, comctl32      = builtin, native
-wsock32, winsock        = builtin
-advapi32, crtdll, ntdll = builtin, native
-mpr, winspool.drv       = builtin, native
-ddraw, dinput, dsound   = builtin, native
-winmm, mmsystem         = builtin
-msvideo, msvfw32        = builtin, native
-mcicda.drv, mciseq.drv  = builtin, native
-mciwave.drv             = builtin, native
-mciavi.drv, mcianim.drv = native, builtin
-msacm.drv, midimap.drv  = builtin, native
-w32skrnl                = builtin
-wnaspi32, wow32         = builtin
-system, display, wprocs = builtin
-wineps                  = builtin
-icmp                    = builtin
-
-[x11drv]
-; Number of colors to allocate from the system palette
-AllocSystemColors = 100
-; Use a private color map
-PrivateColorMap = N
-; Favor correctness over speed in some graphics operations
-PerfectGraphics = N
-; Color depth to use on multi-depth screens
-;;ScreenDepth = 16
-; Name of X11 display to use
-;;Display = :0.0
-; Allow the window manager to manage created windows
-Managed = N
-; Use XFree86 DGA extension if present
-UseDGA = Y
-; Use XShm extension if present
-UseXShm = Y
-; Enable DirectX mouse grab
-DXGrab = N
-; Create the desktop window with a double-buffered visual
-; (useful to play OpenGL games)
-DesktopDoubleBuffered = N
-; Code page used for captions in managed mode
-; 0 means default ANSI code page (CP_ACP == 0)
-TextCP=0
-; Use this if you have more than one port for video on your setup 
-; (Wine uses for now the first 'input image' it founds).
-;; XVideoPort = 43
-
-[fonts]
-;Read documentation/fonts before adding aliases
-Resolution = 96
-Default = -adobe-times-
-[serialports]
-Com1=/dev/ttyS0
-Com2=/dev/ttyS1
-Com3=/dev/modem,38400
-Com4=/dev/modem
-
-[parallelports]
-Lpt1=/dev/lp0
-
-[spooler]
-LPT1:=|lpr
-LPT2:=|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q -
-LPT3:=/dev/lp3
-
-[ports]
-;read=0x779,0x379,0x280-0x2a0
-;write=0x779,0x379,0x280-0x2a0
-
-[spy]
-Exclude=WM_SIZE;WM_TIMER;
-
-[registry]
-; Paths must be given in /dir/dir/file.reg format.
-; Wine will not understand dos file names here...
-;These are all booleans.  Y/y/T/t/1 are true, N/n/F/f/0 are false.
-;Defaults are read all, write to Home
-; Global registries (stored in /etc)
-LoadGlobalRegistryFiles=Y
-; Home registries (stored in ~user/.wine/)
-LoadHomeRegistryFiles=Y
-; Load Windows registries from the Windows directory
-LoadWindowsRegistryFiles=Y
-; TRY to write all changes to home registries
-WritetoHomeRegistryFiles=Y
-; Use new file format
-UseNewFormat=Y
-; Registry periodic save timeout in seconds
-; PeriodicSave=600
-; Save only modified keys
-SaveOnlyUpdatedKeys=Y
-
-[Tweak.Layout]
-;; WineLook=xxx  (supported styles are 'Win31'(default), 'Win95','Win98')
-WineLook=Win95
-
-[programs]
-Default=
-Startup=
-
-[Console]
-;Drivers=tty
-;XtermProg=nxterm
-;InitialRows=25
-;InitialColumns=80
-;TerminalType=nxterm
-
-[Clipboard]
-ClearAllSelections=0
-PersistentSelection=1
-
-# </wineconf>
diff --git a/app-emulation/wine/files/wine.env b/app-emulation/wine/files/wine.env
deleted file mode 100644
index 8710e8042d27..000000000000
--- a/app-emulation/wine/files/wine.env
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH=/opt/wine/bin
-ROOTPATH=/opt/wine/bin
-MANPATH=/opt/wine/man
-INFODIR=/opt/wine/info
-LDPATH=/opt/wine/lib
diff --git a/app-emulation/wine/wine-20010326.ebuild b/app-emulation/wine/wine-20010326.ebuild
deleted file mode 100644
index fc988f44982f..000000000000
--- a/app-emulation/wine/wine-20010326.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20010326.ebuild,v 1.4 2001/11/10 02:58:37 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Wine is a free implementation of Windows on Unix."
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
-HOMEPAGE="http://www.winehq.com"
-
-DEPEND="virtual/glibc
-        virtual/x11
-         >=sys-libs/ncurses-5.2
-         opengl? ( virtual/opengl )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use opengl`" ]
-    then
-        myconf="--enable-opengl"
-    else
-        myconf="--disable-opengl"
-    fi
-    try ./configure --prefix=/usr --libdir=/usr/lib/wine --sysconfdir=/etc/wine \
-	--host=${CHOST} ${myconf}
-
-    try make depend
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr libdir=${D}/usr/lib/wine mandir=${D}/usr/share/man install
-    insinto /etc/wine
-    doins ${FILESDIR}/wine.conf
-    dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE
-    dodoc README WARRANTY
-
-}
-
diff --git a/app-emulation/wine/wine-20010418.ebuild b/app-emulation/wine/wine-20010418.ebuild
deleted file mode 100644
index b2749f88b29b..000000000000
--- a/app-emulation/wine/wine-20010418.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20010418.ebuild,v 1.6 2002/01/15 00:32:54 gbevin Exp $
-
-WSV=0.5.1b
-S=${WORKDIR}/${P}
-DESCRIPTION="Wine is a free implementation of Windows on Unix."
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz
-	 http://twine.codeweavers.com/~mpilka/winesetuptk/winesetuptk-${WSV}.tar.gz"
-HOMEPAGE="http://www.winehq.com/
-	  http://wine.codeweavers.com/winesetuptk.shtml"
-
-DEPEND="virtual/glibc
-        virtual/x11
-        >=sys-libs/ncurses-5.2
-        opengl? ( virtual/opengl )"
-
-RDEPEND="${DEPEND}
-	 >=dev-lang/tk-8.4.2
-	 >=dev-tcltk/itcl-3.2"
-
-src_compile() {
-    
-    cd ${S}
-    local myconf
-    if [ "`use opengl`" ]
-    then
-        myconf="--enable-opengl"
-    else
-        myconf="--disable-opengl"
-    fi
-    try ./configure --prefix=/opt/wine --sysconfdir=/etc/opt/wine \
-	--host=${CHOST} ${myconf}
-
-    try make depend
-    try make
-    
-    cd ${WORKDIR}/winesetuptk-${WSV}
-    ./configure --prefix=/opt/wine --with-launcher=/opt/wine/bin \
-	--with-data=/opt/wine/share/winesetuptk --with-doc=/opt/wine/share/doc/winesetuptk
-}
-
-src_install () {
-    
-    try make prefix=${D}/opt/wine install
-    insinto /etc/opt/wine
-    doins ${FILESDIR}/wine.conf
-    dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE
-    dodoc README WARRANTY
-    
-    cd ${WORKDIR}/winesetuptk-${WSV}
-    make PREFIX_BIN=${D}/opt/wine/bin \
-	 PREFIX_SRC=${D}/opt/wine/share/winesetuptk \
-	 PREFIX_DOC=${D}/opt/wine/share/doc/winesetuptk \
-	 cw-install install
-    cd doc ; docinto winesetuptk-${WSV}
-    dodoc CHANGELOG.TXT LICENSE.TXT README.TXT
-    cd development_doc ; docinto winesetuptk-${WSV}/development_doc
-    dodoc CHANGELOG.TXT global_cfg_db_members.txt
-    
-    dosym ../share/winesetuptk /opt/wine/bin/winesetuptk
-    
-    insinto /etc/env.d
-    newins ${FILESDIR}/wine.env 90wine
-}
-
diff --git a/app-emulation/wine/wine-20010824.ebuild b/app-emulation/wine/wine-20010824.ebuild
deleted file mode 100644
index a0354a6748f9..000000000000
--- a/app-emulation/wine/wine-20010824.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20010824.ebuild,v 1.2 2001/11/10 02:58:38 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Wine is a free implementation of Windows on Unix."
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
-	 #http://twine.codeweavers.com/~mpilka/winesetuptk/winesetuptk-${WSV}.tar.gz"
-HOMEPAGE="http://www.winehq.com/"
-	  #http://wine.codeweavers.com/winesetuptk.shtml"
-
-# need to add: db2html, db2ps, db2pdf for building the docs
-DEPEND="virtual/glibc
-    virtual/x11
-	sys-devel/gcc
-	sys-devel/flex
-	dev-util/yacc
-    opengl? ( virtual/opengl )
-    >=sys-libs/ncurses-5.2
-	net-print/cups
-	>=media-libs/freetype-2.0.0"
-
-src_compile() {
-    
-    cd ${S}
-    local myconf
-
-    if [ "`use opengl`" ]
-    then
-        myconf="--enable-opengl"
-    else
-        myconf="--disable-opengl"
-    fi
-
-    if [ -z $DEBUG ]
-    then
-	  myconf="$myconf --disable-trace --disable-debug"
-    else
-	  myconf="$myconf --enable-trace --enable-debug"
-    fi
-
-    ./configure --prefix=/opt/wine --sysconfdir=/etc/opt/wine \
-		--infodir=/opt/info --mandir=/opt/man \
-		--host=${CHOST} --enable-curses ${myconf} || die
-		
-    make depend || die
-    make || die
-    
-}
-
-src_install () {
-    
-    make prefix=${D}/opt/wine install || die
-    insinto /etc/opt/wine
-    newins ${FILESDIR}/wine.conf config
-    dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README WARRANTY
-    
-    insinto /etc/env.d
-    newins ${FILESDIR}/wine.env 90wine
-	
-}
-
diff --git a/app-emulation/wine/wine-20011004-r1.ebuild b/app-emulation/wine/wine-20011004-r1.ebuild
deleted file mode 100644
index 43a846ea2e8c..000000000000
--- a/app-emulation/wine/wine-20011004-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20011004-r1.ebuild,v 1.1 2002/01/15 01:27:50 gbevin Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Wine is a free implementation of Windows on Unix."
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
-	 #http://twine.codeweavers.com/~mpilka/winesetuptk/winesetuptk-${WSV}.tar.gz"
-HOMEPAGE="http://www.winehq.com/"
-	  #http://wine.codeweavers.com/winesetuptk.shtml"
-
-# need to add: db2html, db2ps, db2pdf for building the docs
-DEPEND="virtual/glibc
-    virtual/x11
-	sys-devel/gcc
-	sys-devel/flex
-	dev-util/yacc
-    opengl? ( virtual/opengl )
-    >=sys-libs/ncurses-5.2
-	net-print/cups
-	>=media-libs/freetype-2.0.0"
-
-src_compile() {
-    
-    cd ${S}
-    local myconf
-
-    if [ "`use opengl`" ]
-    then
-        myconf="--enable-opengl"
-    else
-        myconf="--disable-opengl"
-    fi
-
-    if [ -z $DEBUG ]
-    then
-	  myconf="$myconf --disable-trace --disable-debug"
-    else
-	  myconf="$myconf --enable-trace --enable-debug"
-    fi
-
-    ./configure --prefix=/opt/wine --sysconfdir=/etc/opt/wine \
-		--infodir=/opt/info --mandir=/opt/man \
-		--host=${CHOST} --enable-curses ${myconf} || die
-		
-    make depend || die
-    make || die
-    
-}
-
-src_install () {
-    
-    make prefix=${D}/opt/wine install || die
-    insinto /etc/opt/wine
-    newins ${FILESDIR}/wine.conf config
-    dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README WARRANTY
-    
-    insinto /etc/env.d
-    newins ${FILESDIR}/wine.env 90wine
-	
-}
-
diff --git a/app-emulation/wine/wine-20011004.ebuild b/app-emulation/wine/wine-20011004.ebuild
deleted file mode 100644
index b745f54e792d..000000000000
--- a/app-emulation/wine/wine-20011004.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20011004.ebuild,v 1.2 2001/11/10 02:58:38 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Wine is a free implementation of Windows on Unix."
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
-	 #http://twine.codeweavers.com/~mpilka/winesetuptk/winesetuptk-${WSV}.tar.gz"
-HOMEPAGE="http://www.winehq.com/"
-	  #http://wine.codeweavers.com/winesetuptk.shtml"
-
-# need to add: db2html, db2ps, db2pdf for building the docs
-DEPEND="virtual/glibc
-    virtual/x11
-	sys-devel/gcc
-	sys-devel/flex
-	dev-util/yacc
-    opengl? ( virtual/opengl )
-    >=sys-libs/ncurses-5.2
-	net-print/cups
-	>=media-libs/freetype-2.0.0"
-
-src_compile() {
-    
-    cd ${S}
-    local myconf
-
-    if [ "`use opengl`" ]
-    then
-        myconf="--enable-opengl"
-    else
-        myconf="--disable-opengl"
-    fi
-
-    if [ -z $DEBUG ]
-    then
-	  myconf="$myconf --disable-trace --disable-debug"
-    else
-	  myconf="$myconf --enable-trace --enable-debug"
-    fi
-
-    ./configure --prefix=/opt/wine --sysconfdir=/etc/opt/wine \
-		--infodir=/opt/info --mandir=/opt/man \
-		--host=${CHOST} --enable-curses ${myconf} || die
-		
-    make depend || die
-    make || die
-    
-}
-
-src_install () {
-    
-    make prefix=${D}/opt/wine install || die
-    insinto /etc/opt/wine
-    newins ${FILESDIR}/wine.conf config
-    dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README WARRANTY
-    
-    insinto /etc/env.d
-    newins ${FILESDIR}/wine.env 90wine
-	
-}
-
diff --git a/app-emulation/wine/wine-20020122.ebuild b/app-emulation/wine/wine-20020228.ebuild
index 63d83425a16a..91b05f3290a0 100644
--- a/app-emulation/wine/wine-20020122.ebuild
+++ b/app-emulation/wine/wine-20020228.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020122.ebuild,v 1.2 2002/03/02 17:00:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020228.ebuild,v 1.1 2002/03/05 20:39:21 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Wine is a free implementation of Windows on Unix."
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
-	 #http://twine.codeweavers.com/~mpilka/winesetuptk/winesetuptk-${WSV}.tar.gz"
 HOMEPAGE="http://www.winehq.com/"
-	  #http://wine.codeweavers.com/winesetuptk.shtml"
 
 DEPEND="virtual/glibc
     virtual/x11