From 4ae3829a394b7cd3c80b1404ffbad3ee57250877 Mon Sep 17 00:00:00 2001 From: Tilman Klar Date: Tue, 15 Oct 2002 14:55:37 +0000 Subject: [PATCH] Major rewrite of wine-20021007.ebuild - check the ChangeLog. --- app-emulation/wine/ChangeLog | 20 +- app-emulation/wine/files/wine-20021007-config | 299 ------------------ .../files/wine-20021007-fake_windows.tar.bz2 | Bin 0 -> 500 bytes .../wine/files/wine-20021007-misc.tar.bz2 | Bin 0 -> 4544 bytes .../wine/files/wine-20021007-regedit | 20 -- app-emulation/wine/files/wine-20021007-wine | 48 --- app-emulation/wine/wine-20021007.ebuild | 57 ++-- 7 files changed, 50 insertions(+), 394 deletions(-) delete mode 100644 app-emulation/wine/files/wine-20021007-config create mode 100644 app-emulation/wine/files/wine-20021007-fake_windows.tar.bz2 create mode 100644 app-emulation/wine/files/wine-20021007-misc.tar.bz2 delete mode 100644 app-emulation/wine/files/wine-20021007-regedit delete mode 100644 app-emulation/wine/files/wine-20021007-wine diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index aa0429af68bf..00fe9dc5449e 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,10 +1,24 @@ # 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.20 2002/10/12 13:12:23 phoenix Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.21 2002/10/15 14:55:37 phoenix Exp $ -*wine-20020904-r1 (12 Oct 2002) +*wine-20021007 (12 Oct 2002) - 12 Oct 2002; phoen][x wine-20020 .ebuild, ChangeLog : + 15 Oct 2002; phoen][x wine-20021007.ebuild, ChangeLog, + files/wine-20021007-fake_windows.tar.bz2, files/wine-20021007-misc.tar.bz2 : + + Major rewrite: + - config, regedit-wine and wine are now in a tarball called ${P}-misc.tar.bz2 + - the fake_windows tarball ( ${P}-fake_windows.tar.bz2 ) goes to ${FILESDIR} now + - regedit-wine uses the new bin/regedit instead of bin/regapi ( see bug #9001 ) + - the default config is useful now ( running stuff outta the box should work ) + - the wine wrapper ( /usr/bin/wine ) uses /usr/bin/regedit for the initial + import of winedefault.reg + - using do{ins,bin} over mv/cp + - fixed permissions in /usr/lib/wine/.data + - added lots of comments + + 12 Oct 2002; phoen][x wine-20021007.ebuild, ChangeLog : Bumped to new version. diff --git a/app-emulation/wine/files/wine-20021007-config b/app-emulation/wine/files/wine-20021007-config deleted file mode 100644 index 05616fe8d54f..000000000000 --- a/app-emulation/wine/files/wine-20021007-config +++ /dev/null @@ -1,299 +0,0 @@ -WINE REGISTRY Version 2 -;; All keys relative to \\Machine\\Software\\Wine\\Wine\\Config - -;; If you think it is necessary to show others your complete config for a -;; bug report, filter out empty lines and comments with -;; grep -v "^;" ~/.wine/config | grep '.' -;; -;; MS-DOS drives configuration -;; -;; Each section has the following format: -;; [Drive X] -;; "Path"="xxx" (Unix path for drive root) -;; "Type"="xxx" (supported types are 'floppy', 'hd', 'cdrom' and 'network') -;; "Label"="xxx" (drive label, at most 11 characters) -;; "Serial"="xxx" (serial number, 8 characters hexadecimal number) -;; "Filesystem"="xxx" (supported types are 'msdos'/'dos'/'fat', 'win95'/'vfat', 'unix') -;; This is the FS Wine is supposed to emulate on a certain -;; directory structure. -;; Recommended: -;; - "win95" for ext2fs, VFAT and FAT32 -;; - "msdos" for FAT16 (ugly, upgrading to VFAT driver strongly recommended) -;; DON'T use "unix" unless you intend to port programs using Winelib ! -;; "Device"="/dev/xx" (only if you want to allow raw device access) -;; -[Drive A] -"Path" = "/mnt/fd0" -"Type" = "floppy" -"Label" = "Floppy" -"Filesystem" = "win95" -"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" -; Wine doesn't pass directory symlinks to Windows programs by default. -; Enabling this may crash some programs that do recursive lookups of a whole -; subdir tree in case of a symlink pointing back to itself. -;"ShowDirSymlinks" = "1" -"ShellLinker" = "wineshelllink" - -# - -[Version] -; Windows version to imitate (win95,win98,winme,nt351,nt40,win2k,winxp,win20,win30,win31)" }, -;"Windows" = "win98" -; DOS version to imitate -;"DOS" = "6.22" - -; Be careful here, wrong DllOverrides settings have the potential -; to pretty much kill your setup. -[DllOverrides] -"rpcrt4" = "builtin, native" -"oleaut32" = "builtin, native" -"ole32" = "builtin, native" -"commdlg" = "builtin, native" -"comdlg32" = "builtin, native" -"ver" = "builtin, native" -"version" = "builtin, native" -"shell" = "builtin, native" -"shell32" = "builtin, native" -"shfolder" = "builtin, native" -"shlwapi" = "builtin, native" -"shdocvw" = "builtin, native" -"lzexpand" = "builtin, native" -"lz32" = "builtin, native" -"comctl32" = "builtin, native" -"commctrl" = "builtin, native" -"advapi32" = "builtin, native" -"crtdll" = "builtin, native" -"mpr" = "builtin, native" -"winspool.drv" = "builtin, native" -"ddraw" = "builtin, native" -"dinput" = "builtin, native" -"dsound" = "builtin, native" -"opengl32" = "builtin, native" -"msvcrt" = "native, builtin" -"msvideo" = "builtin, native" -"msvfw32" = "builtin, native" -"mcicda.drv" = "builtin, native" -"mciseq.drv" = "builtin, native" -"mciwave.drv" = "builtin, native" -"mciavi.drv" = "native, builtin" -"mcianim.drv" = "native, builtin" -"msacm.drv" = "builtin, native" -"msacm" = "builtin, native" -"msacm32" = "builtin, native" -"midimap.drv" = "builtin, native" -; you can specify applications too -"notepad.exe" = "native, builtin" -; default for all other dlls -"*" = "native, 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" = "Y" -; Use a desktop window of 640x480 for Wine -;"Desktop" = "640x480" -; Use XFree86 DGA extension if present -; (make sure /dev/mem is accessible by you !) -"UseDGA" = "Y" -; Use XShm extension if present -"UseXShm" = "Y" -; Use XVidMode extension if present -"UseXVidMode" = "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 finds). -;; "XVideoPort" = "43" -; Run in synchronous mode (useful for debugging X11 problems) -;;"Synchronous" = "Y" - -[fonts] -;Read the Fonts topic in the Wine User Guide before adding aliases -;See a couple of examples for russian users below -"Resolution" = "96" -"Default" = "-adobe-helvetica-" -"DefaultFixed" = "fixed" -"DefaultSerif" = "-adobe-times-" -"DefaultSansSerif" = "-adobe-helvetica-" - -;; default TrueType fonts with russian koi8-r encoding -;"Default" = "-monotype-arial-*-*-*--*-*-*-*-*-*-koi8-r" -;"DefaultFixed" = "-monotype-courier new-*-*-*--*-*-*-*-*-*-koi8-r" -;"DefaultSerif" = "-monotype-times new roman-*-*-*--*-*-*-*-*-*-koi8-r" -;"DefaultSansSerif" = "-monotype-arial-*-*-*--*-*-*-*-*-*-koi8-r" -;; default cyrillic bitmap X fonts -;"Default" = "-cronyx-helvetica-" -;"DefaultFixed" = "fixed" -;"DefaultSerif" = "-cronyx-times-" -;"DefaultSansSerif" = "-cronyx-helvetica-" - -; the TrueType font dirs you want to make accessible to wine -[FontDirs] -;"dir1" = "/usr/X11R6/lib/X11/fonts/TrueType" -;"dir2" = "/usr/share/fonts/truetype" -;"dir3" = "/usr/X11R6/lib/X11/fonts/TT" -;"dir4" = "/usr/share/fonts/TT" - -[serialports] -"Com1" = "/dev/ttyS0" -"Com2" = "/dev/ttyS1" -"Com3" = "/dev/ttyS2" -"Com4" = "/dev/modem" - -[parallelports] -"Lpt1" = "/dev/lp0" - -[ppdev] -;; key: io-base of the emulated port -;; value : parport-device{,timeout} -;; timeout for auto closing an open device ( not yet implemented) -;"378" = "/dev/parport0" -;"278" = "/dev/parport1" -;"3bc" = "/dev/parport2" - -[spooler] -"FILE:" = "tmp.ps" -"LPT1:" = "|lpr" -"LPT2:" = "|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q -" -"LPT3:" = "/dev/lp3" - -[ports] -;"read" = "0x779,0x379,0x280-0x2a0" -;"write" = "0x779,0x379,0x280-0x2a0" - -[Debug] -;"RelayExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection" -;"RelayInclude" = "user32.CreateWindowA" -;"SnoopExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection" -;"SpyExclude" = "WM_SIZE;WM_TIMER;" - -[registry] -;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" -; Registry periodic save timeout in seconds -; "PeriodicSave" = "600" -; Save only modified keys -"SaveOnlyUpdatedKeys" = "Y" - -[Tweak.Layout] -;; supported styles are 'Win31'(default), 'Win95', 'Win98' -;; this has *nothing* to do with the windows version Wine returns: -;; set the "Windows" value in the [Version] section if you want that. -"WineLook" = "Win95" - -[Console] -;"Drivers" = "tty" -;"XtermProg" = "nxterm" -;"InitialRows" = "25" -;"InitialColumns" = "80" -;"TerminalType" = "nxterm" - -[Clipboard] -"ClearAllSelections" = "0" -"PersistentSelection" = "1" - -; List of all directories directly contain .AFM files -[afmdirs] -"1" = "/usr/share/ghostscript/fonts" -"2" = "/usr/share/a2ps/afm" -"3" = "/usr/share/enscript" -"4" = "/usr/X11R6/lib/X11/fonts/Type1" - -[WinMM] -"Drivers" = "wineoss.drv" -#"Drivers" = "winearts.drv" -"WaveMapper" = "msacm.drv" -"MidiMapper" = "midimap.drv" - -[dsound] -;; HEL only: Number of waveOut fragments ahead to mix in new buffers. -;"HELmargin" = "5" -;; HEL only: Number of waveOut fragments ahead to queue to driver. -;"HELqueue" = "5" -;; Max number of fragments to prebuffer -;"SndQueueMax" = "28" -;; Min number of fragments to prebuffer -;"SndQueueMin" = "12" - -;; sample AppDefaults entries -;[AppDefaults\\iexplore.exe\\DllOverrides] -;"shlwapi" = "native" -;"rpcrt4" = "native" -;"ole32" = "native" -;"shdocvw" = "native" -;"wininet" = "native" -;"shfolder" = "native" -;"shell32" = "native" -;"shell" = "native" -;"comctl32" = "native" -; -;[AppDefaults\\setup.exe\\x11drv] -;"Desktop" = "800x600" -; -;[AppDefaults\\sol.exe\\Version] -;"Windows" = "nt40" -; -;; Some games (Quake 2, UT) refuse to accept emulated dsound devices. -;; You can add an AppDefault entry like this for such cases. -;[AppDefaults\\pickygame.exe\\dsound] -;"EmulDriver" = "N" - -# diff --git a/app-emulation/wine/files/wine-20021007-fake_windows.tar.bz2 b/app-emulation/wine/files/wine-20021007-fake_windows.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..d60f11e08ee36f73406826ae410d885bb798b455 GIT binary patch literal 500 zcmV@T4*^jL0KkKSpl`&umA)t|AfGR0sue}|BdepSb*>E-{1fN5C}j5cTpe! z!$Uv-0B8UJ00AbcG!$si00xgJ0002PLqGrkXaE2J0Tdw;o~M-dk^mb>01TT*^wjz! zJup@ZBvsPRF;!7iSK1K%1S26(3fU0fcI`ATc&Nl<6_H{^EGdOmRaI41Y?c(hh4)gm zrE6(JIU!OecOeAaDFQ7DK%|Oxib$tn#AkAvZtjV`C@L)zYfxeUxInIIYTLJRq~&Ru zMJr(-DMA5h6w~Fy-NS`-bwUU%N%UWCu1G52ALp(n5`r2n@WGTB{ z7vY8WmIzrOfqDgmK>$cFO=2??fUyh_lnUj1v25}#DNPDfc&8&OEGcW)K!YOoQlmWV zDVmisdDN-Gn4w9|)G4avQkhI(hZ7htg5}|rCQ?W+Q>wDIRAL1o0IP$%h7Cj$BN7Ba zFXU21KSG=bq*usX;sSPxeTY)$aHm=K9F+HpU%Dft=gkvP{Y5sNeen=5K#(D!pr;W| z#WtLZHxLp6NDi_Gkfvj-(C;|_m{YGfk4UDmPVuAsI25oN#XD%%ys9dMD1c7@rHB;f qV0sPWoIr!1_7*Nc>p2Q@6xwqX&;-;etmqMc;_gVN3K9S|yOsbhp~*4; literal 0 HcmV?d00001 diff --git a/app-emulation/wine/files/wine-20021007-misc.tar.bz2 b/app-emulation/wine/files/wine-20021007-misc.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..09c2b719ffa315451dcde12234c111be3b512198 GIT binary patch literal 4544 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�K532fiIDGEHA zmO7+t^=s&C8w1gFwGs=kzVmpbx<^^Qfnj-e0Ch>nJ(Ly;7TzCADTXmc1Yx#?MkvV> ziLhP=dv6ZyyScOFiKWY4GaYoxoucpaZRHz=u^6H#F%3906RIgadF{y!vz3-3!zoH^D(AQ&Mxf;03X6GhMykR^dt9-|S9zaz?iNU9AO5M_Tk5$ZvOG%({f zX{m5~-ZIFiDXK`9wRha!{T@QO$OMV`SKCs=H}$91zG&DOCN z8f9SF+6F z2+<2WDsNroAPLhbk{rU%zV|veUF1bzCc(A`0|2F^ln&Im2rXjiXl^S-B`&b>?<%&1 z2B){f(-OppCz34H3geSUxgRFWx6EC{l;O`zTV*ajEl3>K+l__t34yR?#Msz~hOJ^P zJri35ivr6r^u$8~i=9U|E&R{NeYT^9oLsJ1VlQ)(8wrtV_Xoh}8)A&nEucDCB2zHg z6XTi{UbsorjE*l80{_d_8cZFA7UEIHR~bcIi9`tIX&wGJdoPA#N*fMPNbp{A-|V*2E)`e}K-))(zc4g{IIK%(AnihIQ@k$_~Y zjX_Vp;g1v13b($qyB!y=$!>SRUa-1W8(CYTm{K??T&&fYGAcucLo}|15@qxEL@!7R z6$1{T&v(x+1?mKqK_tnUf=92&F4UffQwY}M0$F-)F`q#E--Cp8z9Y~c7?(n0$3?mV zj$-n&Gm7}|41Io}ImX5|n!#auhmC5Oaw@gP?@^kcLAWx=2hkAG13{b;Kvjv8aHutL z@J{0tl*tUEfpA$KSKrGUt2qko*u+2sUWRjC5@6)cYVc5WRoTT##N#HoIC-xeMg`~; zR#GLe5c88Y?}Y$}kt0PRtqbS2A_Q9++(2gMF8tg{Ruux)N+KQs>*Iqhr4Bl(qS)Rt zOq?rJwq>nn};47N6_({RObe4PfOA>s=?VZ3?}DV zE`%v;FpfsnS`hCN$E0@d?8h8&S+%fP=Jtw z4RoY|K1#uX4+Vp#8Ad3r6qIlRqVV4#12&+DD#|BUR4BbhMiVA|xR?d6CgCQ-RFU;N z(?$2x%ot4iI@XmE3hWr-WQ~~;aKIBjV0L4_$mg0@F(O8hQ@Ig&#I!Amvc{&#TR9}w zV-}4N5TaP%ENY=#`???45Be=W3+rLn{j5kfSBE2+2!=1! zA&kpDor9mdk0zMsV0A!xB}qP)5=_OmE}shjB?XxxqvoeN4aYVXc03S_H)cZH5=U9i z=bWU5p+qDW433w5n~|C(EY=)W+jy%dE+zCO0S$dpa^*6>xaPt~vH62AGw6wBK2aIN z@%+YEPhjQ(MCxk2#+-**=!X154njt%*Twq<5Pn5kdw+^WInS*$LLZAl8F*;!LC@gB zmAP69Iw7fw!mwcF<0lMd5^H7=j6hi=8-JpG=jd)|Rqj-17&drdt5JZ>7n2{=d{_0M eSiD&4G2^CPl=kLNM}$Cs;_gVN3K9XU@7@47#DFXS literal 0 HcmV?d00001 diff --git a/app-emulation/wine/files/wine-20021007-regedit b/app-emulation/wine/files/wine-20021007-regedit deleted file mode 100644 index 129bba0ab047..000000000000 --- a/app-emulation/wine/files/wine-20021007-regedit +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# The wine regapi wrapper - -export INSTALLDIR="/usr/lib/wine" - -export WINEPREFIX="$HOME/.wine" - -export LD_LIBRARY_PATH="$INSTALLDIR/lib/wine:$INSTALLDIR/lib:$LD_LIBRARY_PATH" -export WINEDLLPATH="$LD_LIBRARY_PATH" - -export WINE_LOADER=wine - -export RUNWINE="$INSTALLDIR/bin/wine" -export REGAPI="$INSTALLDIR/bin/regapi" - -if([ -z ${1} ]) then - echo "Usage: regedit foo.reg" -else - "$REGAPI" setValue < ${1} &> /dev/null -fi diff --git a/app-emulation/wine/files/wine-20021007-wine b/app-emulation/wine/files/wine-20021007-wine deleted file mode 100644 index 19b32fac8c21..000000000000 --- a/app-emulation/wine/files/wine-20021007-wine +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# The wine wrapper - -# Kindly distributed by Martin Schlemmer -# Modified by phoen][x - -export INSTALLDIR="/usr/lib/wine" - -export WINEPREFIX="$HOME/.wine" - -export LD_LIBRARY_PATH="$INSTALLDIR/lib/wine:$INSTALLDIR/lib:$LD_LIBRARY_PATH" -export WINEDLLPATH="$LD_LIBRARY_PATH" - -export WINE_LOADER=wine - -export RUNWINE="$INSTALLDIR/bin/wine" -export REGAPI="$INSTALLDIR/bin/regapi" - -if [ ! -f $WINEPREFIX/config ] -then - echo "!! ~/.wine/config misses" - echo "!! Setting up a config file" - - mkdir -p $WINEPREFIX/fake_windows - - # First copy in the new config file. - cp "$INSTALLDIR/.data/config" "$WINEPREFIX/config" - - echo "!! Setting up ~/.wine/fake_windows/" - cp -R $INSTALLDIR/.data/fake_windows/* $WINEPREFIX/fake_windows - - echo "!! Setting up default registry." - "$REGAPI" setValue < "$INSTALLDIR/.data/winedefault.reg" &> /dev/null - - echo "!! Installation complete." - echo "!! Set the correct path for drive D and E in ~/.wine/config and uncomment the sections, please" - exit -fi - -# Force the use of the more memory-efficient MSVC 5 allocator with -# any programs that use MSVCRT. This reduces memory consumption -# significantly. -export __MSVCRT_HEAP_SELECT=__GLOBAL_HEAP_SELECTED,2 - - -PATH="$INSTALLDIR/bin:$PATH" - -"$RUNWINE" --debugmsg -all "$@" diff --git a/app-emulation/wine/wine-20021007.ebuild b/app-emulation/wine/wine-20021007.ebuild index 57f81eb9c3f7..043b810a9d93 100644 --- a/app-emulation/wine/wine-20021007.ebuild +++ b/app-emulation/wine/wine-20021007.ebuild @@ -1,17 +1,15 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021007.ebuild,v 1.1 2002/10/12 13:12:23 phoenix Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021007.ebuild,v 1.2 2002/10/15 14:55:37 phoenix Exp $ IUSE="nas arts cups opengl alsa" -DESCRIPTION="Wine is a free implementation of Windows on Unix." +DESCRIPTION="Wine is a free implementation of Windows(tm) on Unix." SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz" HOMEPAGE="http://www.winehq.com/" - SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 -ppc -sparc -sparc64" - DEPEND="virtual/x11 sys-devel/gcc sys-devel/flex @@ -47,41 +45,56 @@ src_compile() { 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} cd ${S} make ${WINEMAKEOPTS} install || die cd ${S}/programs make ${WINEMAKEOPTS} install || die - # Creates /usr/lib/wine/.data with fake_windows in it - # This is needed for our wine wrapper script + # Needed for later installation + mkdir -p ${D}/usr/bin + + ### Creation of /usr/lib/wine/.data + # Setting up fake_windows mkdir ${D}/usr/lib/wine/.data - cp -R ${WORKDIR}/fake_windows ${D}/usr/lib/wine/.data - cp ${FILESDIR}/${P}-config ${D}/usr/lib/wine/.data/config - cp ${WORKDIR}/${P}/winedefault.reg ${D}/usr/lib/wine/.data/winedefault.reg + cd ${D}/usr/lib/wine/.data + tar jxvf ${FILESDIR}/${P}-fake_windows.tar.bz2 + chown root:root fake_windows/ -R - # Install the wrapper script - mkdir ${D}/usr/bin - cp ${FILESDIR}/${P}-wine ${D}/usr/bin/wine - cp ${FILESDIR}/${P}-regedit ${D}/usr/bin/regedit-wine + # Unpacking the miscellaneous files + tar jxvf ${FILESDIR}/${P}-misc.tar.bz2 + chown root:root config - # Take care of the documentation - cd ${S} - dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README + # 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 @@ -100,9 +113,5 @@ pkg_postinst() { einfo "* wine registry. *" einfo "* If you have further questions, enhancements or patches *" einfo "* send an email to phoenix@gentoo.org *" - einfo "* *" - einfo "* Manpage has been installed to the system. *" - einfo "* \"man wine\" should show it. *" einfo "**********************************************************************" -} - +} \ No newline at end of file -- 2.26.2