summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-08-01 20:18:34 +0000
committerMike Frysinger <vapier@gentoo.org>2003-08-01 20:18:34 +0000
commit77193c6aec40ef64b609c37dd8bb5bfef2ec1697 (patch)
tree893ba47825b134da7962a187e0f1e28752a22524
parentmarking stable on pcc per upstream request (diff)
downloadhistorical-77193c6aec40ef64b609c37dd8bb5bfef2ec1697.tar.gz
historical-77193c6aec40ef64b609c37dd8bb5bfef2ec1697.tar.bz2
historical-77193c6aec40ef64b609c37dd8bb5bfef2ec1697.zip
touchups
-rw-r--r--app-emulation/wine/files/digest-wine-20030411-r11
-rw-r--r--app-emulation/wine/files/digest-wine-200305084
-rw-r--r--app-emulation/wine/files/digest-wine-200306185
-rw-r--r--app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2bin500 -> 0 bytes
-rw-r--r--app-emulation/wine/files/wine-20030411-misc.tar.bz2bin4591 -> 0 bytes
-rw-r--r--app-emulation/wine/files/wine-20030411-xopenfont.patch45
-rw-r--r--app-emulation/wine/wine-20030411-r1.ebuild124
-rw-r--r--app-emulation/wine/wine-20030508.ebuild131
-rw-r--r--app-emulation/wine/wine-20030618-r1.ebuild28
-rw-r--r--app-emulation/wine/wine-20030618.ebuild135
-rw-r--r--app-emulation/wine/wine-20030709.ebuild25
11 files changed, 23 insertions, 475 deletions
diff --git a/app-emulation/wine/files/digest-wine-20030411-r1 b/app-emulation/wine/files/digest-wine-20030411-r1
deleted file mode 100644
index 389e4f13e451..000000000000
--- a/app-emulation/wine/files/digest-wine-20030411-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 629d3917b551dedbe7a3b9f64a8513e5 wine-20030411.tar.bz2 6853248
diff --git a/app-emulation/wine/files/digest-wine-20030508 b/app-emulation/wine/files/digest-wine-20030508
deleted file mode 100644
index feff6d39a84a..000000000000
--- a/app-emulation/wine/files/digest-wine-20030508
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a92a98e77a724a440e3cf596b6ec43dc wine-20030508.tar.bz2 6814916
-MD5 bb9d5f77ffee8e72cf714aebc874157a wine-20030508-xopenfont.patch 1069
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20030508-fake_windows.tar.bz2 500
-MD5 8052677213b772973d85623012d68e86 wine-20030508-misc.tar.bz2 4591
diff --git a/app-emulation/wine/files/digest-wine-20030618 b/app-emulation/wine/files/digest-wine-20030618
deleted file mode 100644
index 2e5ef81457d0..000000000000
--- a/app-emulation/wine/files/digest-wine-20030618
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 71d1e24efd36dcd9522788e1dedb3c14 wine-20030618.tar.bz2 6976391
-MD5 bb9d5f77ffee8e72cf714aebc874157a wine-20030618-xopenfont.patch 1069
-MD5 af8da46a0e51578ff1e18e399141d628 wine-20030618-fake_windows.tar.bz2 500
-MD5 8052677213b772973d85623012d68e86 wine-20030618-misc.tar.bz2 4591
-MD5 35f5ecf311952d369a24bdf7477c59df wine-nvidia-fix.patch.gz 6124
diff --git a/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2 b/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2
deleted file mode 100644
index d60f11e08ee3..000000000000
--- a/app-emulation/wine/files/wine-20030411-fake_windows.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/app-emulation/wine/files/wine-20030411-misc.tar.bz2 b/app-emulation/wine/files/wine-20030411-misc.tar.bz2
deleted file mode 100644
index 90b963f8896c..000000000000
--- a/app-emulation/wine/files/wine-20030411-misc.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/app-emulation/wine/files/wine-20030411-xopenfont.patch b/app-emulation/wine/files/wine-20030411-xopenfont.patch
deleted file mode 100644
index 7f83e11ba4e9..000000000000
--- a/app-emulation/wine/files/wine-20030411-xopenfont.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- graphics/x11drv/xfont.c.orig 2003-04-06 18:27:44.000000000 +0200
-+++ graphics/x11drv/xfont.c 2003-04-06 18:27:58.000000000 +0200
-@@ -2115,7 +2115,7 @@
- }
- else lpstr = x_pattern[i];
-
-- if( (x_fs = TSXLoadQueryFont(gdi_display, lpstr)) )
-+ if( (x_fs = XFONT_GetFont(lpstr)) )
- {
- XFONT_SetFontMetric( fi, fr, x_fs );
- TSXFreeFont( gdi_display, x_fs );
-@@ -3239,6 +3239,33 @@
- return NULL;
- }
-
-+static int staticXError;
-+
-+static int fonterror_handler(Display *display,
-+ XErrorEvent *error_evt)
-+{
-+ ERR("X error %d\n", error_evt->error_code);
-+ return 0;
-+}
-+
-+static XFontStruct * XFONT_GetFont(char *lpstr)
-+{
-+ XFontStruct* x_fs;
-+ void *ptr;
-+
-+ wine_tsx11_lock();
-+ staticXError = FALSE;
-+ ptr = XSetErrorHandler(fonterror_handler);
-+ x_fs = XLoadQueryFont(gdi_display, lpstr);
-+ XSync(gdi_display, False);
-+ XSetErrorHandler(ptr);
-+ wine_tsx11_unlock();
-+ if (staticXError)
-+ return NULL;
-+ else
-+ return x_fs;
-+}
-+
-
-
- /* X11DRV Interface ****************************************************
diff --git a/app-emulation/wine/wine-20030411-r1.ebuild b/app-emulation/wine/wine-20030411-r1.ebuild
deleted file mode 100644
index 1cc0c657406d..000000000000
--- a/app-emulation/wine/wine-20030411-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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-20030411-r1.ebuild,v 1.3 2003/06/11 21:16:55 utx Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-SRC_URI="mirror://gentoo/wine-${PV}.tar.bz2"
-HOMEPAGE="http://www.winehq.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="nas arts cups opengl alsa tcltk nptl"
-
-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 ${FILESDIR}/${P}-xopenfont.patch
-}
-
-src_compile() {
- cd ${S}
- local myconf
-
- use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl"
- use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl"
-
- [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
- # there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-
- ./configure --prefix=/usr/lib/wine \
- --sysconfdir=/etc/wine \
- --host=${CHOST} \
- --enable-curses \
- ${myconf} || 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}
- cd ${S}
- 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 ${FILESDIR}/${P}-fake_windows.tar.bz2
- chown root:root fake_windows/ -R
-
- # Unpacking the miscellaneous files
- tar jxvf ${FILESDIR}/${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."
- einfo ""
-}
diff --git a/app-emulation/wine/wine-20030508.ebuild b/app-emulation/wine/wine-20030508.ebuild
deleted file mode 100644
index 2544c40b0057..000000000000
--- a/app-emulation/wine/wine-20030508.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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-20030508.ebuild,v 1.5 2003/06/28 11:00:14 coronalvr Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-SRC_URI="mirror://gentoo/wine-${PV}.tar.bz2
- mirror://gentoo/${P}-xopenfont.patch
- mirror://gentoo/${P}-fake_windows.tar.bz2
- mirror://gentoo/${P}-misc.tar.bz2"
-HOMEPAGE="http://www.winehq.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="nas arts cups opengl alsa tcltk nptl"
-
-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
-}
-
-src_compile() {
- cd ${S}
- local myconf
-
- use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl"
- use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl"
-
- [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
- # 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 \
- ${myconf} || 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}
- cd ${S}
- 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."
- einfo ""
-}
diff --git a/app-emulation/wine/wine-20030618-r1.ebuild b/app-emulation/wine/wine-20030618-r1.ebuild
index 27601f9ee9fa..75e409ac04c9 100644
--- a/app-emulation/wine/wine-20030618-r1.ebuild
+++ b/app-emulation/wine/wine-20030618-r1.ebuild
@@ -1,21 +1,21 @@
# 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-20030618-r1.ebuild,v 1.2 2003/07/12 11:02:05 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030618-r1.ebuild,v 1.3 2003/08/01 20:18:34 vapier Exp $
inherit eutils base
DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
+HOMEPAGE="http://www.winehq.com/"
SRC_URI="mirror://gentoo/wine-${PV}.tar.bz2
mirror://gentoo/${P}-xopenfont.patch
mirror://gentoo/${P}-fake_windows.tar.bz2
mirror://gentoo/${P}-misc.tar.bz2
mirror://gentoo/wine-nvidia-fix.patch.gz"
-HOMEPAGE="http://www.winehq.com/"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="x86 -ppc -sparc"
-IUSE="nas arts cups opengl alsa tcltk nptl"
+IUSE="nas arts cups opengl alsa tcltk nptl debug"
DEPEND="sys-devel/gcc
sys-devel/flex
@@ -43,25 +43,22 @@ src_unpack() {
}
src_compile() {
-
- cd ${S}
- local myconf
-
- use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl"
- use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl"
-
- [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
# 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 \
+ ./configure \
+ --prefix=/usr/lib/wine \
--sysconfdir=/etc/wine \
--host=${CHOST} \
--enable-curses \
- ${myconf} || die
+ `use_enable opengl` \
+ `use_with nptl` \
+ `use_enable debug trace` \
+ `use_enable debug` \
+ || die
cd ${S}/programs/winetest
cp Makefile 1
@@ -73,11 +70,10 @@ src_compile() {
cd programs && emake || die
}
-src_install () {
+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
diff --git a/app-emulation/wine/wine-20030618.ebuild b/app-emulation/wine/wine-20030618.ebuild
deleted file mode 100644
index 1d1c4812ba36..000000000000
--- a/app-emulation/wine/wine-20030618.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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-20030618.ebuild,v 1.2 2003/06/28 11:00:14 coronalvr Exp $
-
-inherit eutils base
-
-DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
-SRC_URI="mirror://gentoo/wine-${PV}.tar.bz2
- mirror://gentoo/${P}-xopenfont.patch
- mirror://gentoo/${P}-fake_windows.tar.bz2
- mirror://gentoo/${P}-misc.tar.bz2
- mirror://gentoo/wine-nvidia-fix.patch.gz"
-HOMEPAGE="http://www.winehq.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc"
-IUSE="nas arts cups opengl alsa tcltk nptl"
-
-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
-}
-
-src_compile() {
- cd ${S}/dlls/opengl32
- epatch ${WORKDIR}/wine-nvidia-fix.patch
-
- cd ${S}
- local myconf
-
- use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl"
- use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl"
-
- [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
- # 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 \
- ${myconf} || 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}
- cd ${S}
- 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."
- einfo ""
-}
diff --git a/app-emulation/wine/wine-20030709.ebuild b/app-emulation/wine/wine-20030709.ebuild
index 5ecefb8d4b04..4689fe4545ef 100644
--- a/app-emulation/wine/wine-20030709.ebuild
+++ b/app-emulation/wine/wine-20030709.ebuild
@@ -1,18 +1,18 @@
# 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.2 2003/07/12 11:39:46 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030709.ebuild,v 1.3 2003/08/01 20:18:34 vapier 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"
-HOMEPAGE="http://www.winehq.com/"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="~x86 -ppc -sparc"
IUSE="nas arts cups opengl alsa tcltk nptl"
@@ -39,24 +39,22 @@ src_unpack() {
}
src_compile() {
- cd ${S}
- local myconf
-
- use opengl && myconf="$myconf --enable-opengl" || myconf="$myconf --disable-opengl"
- use nptl && myconf="$myconf --with-nptl" || myconf="$myconf --without-nptl"
-
- [ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
# 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 \
+ ./configure \
+ --prefix=/usr/lib/wine \
--sysconfdir=/etc/wine \
--host=${CHOST} \
--enable-curses \
- ${myconf} || die
+ `use_enable opengl` \
+ `use_with nptl` \
+ `use_enable debug trace` \
+ `use_enable debug` \
+ || die
cd ${S}/programs/winetest
cp Makefile 1
@@ -68,11 +66,10 @@ src_compile() {
cd programs && emake || die
}
-src_install () {
+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