More clean ups and fixed with a ton of input from Vincent Béron.

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 8ceb7e317e620efefa67b6ceba2772c442859985..52cd3985136f9523e6fa2d39cc93d807616f7131 100644 (file)
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.81 2004/10/31 01:19:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.82 2004/11/01 14:00:01 vapier Exp $
+
+*wine-20041019-r3 (01 Nov 2004)
+
+  01 Nov 2004; Mike Frysinger <vapier@gentoo.org> +wine-20041019-r3.ebuild:
+  More clean ups and fixed with a ton of input from Vincent Béron.
 
 *wine-20041019-r2 (30 Oct 2004)
 

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index f7dd36d957de409cf2ff83b8477a528990983088..e21574008fcc07549b4a91d93076c37f0b89174e 100644 (file)
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e8943ca9d33cdcbfe321e8061b70514b ChangeLog 14665
+MD5 0a1ee9b91537e642fd6cff9ea3c2e01d ChangeLog 14842
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
+MD5 5926203e4ed53edf42d54a38bc407bd8 wine-20041019-r3.ebuild 2721
 MD5 7e2481a2dab7a420547cf06c307bf7b1 wine-20041019.ebuild 3769
 MD5 6477bfb94396c616bd290731eecac4fc wine-20041019-r2.ebuild 4071
 MD5 0b8a40b373bf8ab6c0368dd5a64f5449 wine-20040716.ebuild 3443
 MD5 9dbf73d557110996f187b6ed6ae4f7ea files/20041019-load-wrappers.patch 1333
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 ae28341f05c0916661c1346a28720230 files/QueryActCtxw_Photoshop7.0.diff 686
+MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
 MD5 64c9b939319110b4f44ef6f431262181 files/digest-wine-20041019 212
 MD5 b1893ef0ed5c38dabcbea9fcc3d35f59 files/digest-wine-20040716 212
 MD5 db29ae371718f3db0a915e65dc76f6f2 files/20041019-no-stack.patch 286
@@ -16,7 +18,7 @@ MD5 4ccbe6abe9eafe846714dd218bc6d2dd files/digest-wine-20041019-r2 212
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD4DBQFBhbIKHTu7gpaalycRAutSAKCB38tmCvp6v5Ed9W4VYgFmteJHxQCY1mNX
-3kxhKVQGTisGiBKGfIRHrQ==
-=yV5s
+iD8DBQFBhkGNHTu7gpaalycRAsxNAJ99l776OAhBPppO5vo/njJwV9UGEQCfZos1
+XntpKHqofc7c2AQKaTcs7iU=
+=WIR6
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/wine/files/digest-wine-20041019-r3 b/app-emulation/wine/files/digest-wine-20041019-r3
new file mode 100644 (file)
index 0000000..6269db7
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20041019-r3
@@ -0,0 +1 @@
+MD5 412d0e6f2e364c43d8c77b5904c70da9 Wine-20041019.tar.gz 11058180

diff --git a/app-emulation/wine/wine-20041019-r3.ebuild b/app-emulation/wine/wine-20041019-r3.ebuild
new file mode 100644 (file)
index 0000000..c8239c3
--- /dev/null
+++ b/app-emulation/wine/wine-20041019-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.1 2004/11/01 14:00:01 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot"
+HOMEPAGE="http://www.winehq.com/"
+SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-*"
+IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses doc"
+
+RDEPEND=">=media-libs/freetype-2.0.0
+       ncurses? ( >=sys-libs/ncurses-5.2 )
+       jack? ( media-sound/jack-audio-connection-kit )
+       X? ( virtual/x11 )
+       arts? ( kde-base/arts )
+       alsa? ( media-libs/alsa-lib )
+       nas? ( media-libs/nas )
+       cups? ( net-print/cups )
+       opengl? ( virtual/opengl )
+       gif? ( media-libs/libungif )
+       jpeg? ( media-libs/jpeg )
+       glut? ( virtual/glut )"
+DEPEND="${RDEPEND}
+       >=sys-apps/sed-4
+       sys-devel/bison
+       sys-devel/gcc
+       doc? ( app-text/docbook-sgml-utils app-text/jadetex )
+       sys-devel/flex"
+
+src_unpack() {
+       unpack Wine-${PV}.tar.gz
+
+       cd ${S}
+       epatch ${FILESDIR}/winearts-kdecvs-fix.patch
+       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
+
+       test_flag -fstack-protector && epatch ${FILESDIR}/${PV}-no-stack.patch #66002
+}
+
+config_cache() {
+       local h ans="no"
+       use ${1} && ans="yes"
+       shift
+       for h in "$@" ; do
+               export ac_cv_${h}=${ans}
+       done
+}
+
+src_compile() {
+       export LDCONFIG=/bin/true
+       config_cache jack header_jack_jack_h
+       config_cache cups header_cups_cups_h
+       config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open
+       config_cache arts path_ARTSCCONFIG
+       config_cache nas header_audio_audiolib_h header_audio_soundlib_h
+       config_cache gif header_gif_lib_h
+       config_cache glut lib_glut_glutMainLoop
+       config_cache jpeg header_jpeglib_h
+       config_cache oss sys_soundcard_h header_machine_soundcard_h header_soundcard_h
+
+       strip-flags
+
+       #       $(use_enable amd64 win64)
+       econf \
+               --sysconfdir=/etc/wine \
+               $(use_with ncurses curses) \
+               $(use_with opengl) \
+               $(use_with X x) \
+               $(use_enable debug trace) \
+               $(use_enable debug) \
+               || die "configure failed"
+
+       emake -j1 depend || die "depend"
+       emake all || die "all"
+       if use doc ; then
+               emake -C documentation doc || die "docs"
+       fi
+}
+
+src_install() {
+       make \
+               prefix=${D}/usr \
+               bindir=${D}/usr/bin \
+               datadir=${D}/usr/share \
+               includedir=${D}/usr/include/wine \
+               sysconfdir=${D}/etc/wine \
+               mandir=${D}/usr/share/man \
+               libdir=${D}/usr/lib \
+               dlldir=${D}/usr/lib/wine \
+               install || die
+       use doc && dodoc documentation/*.pdf
+
+       insinto /usr/share/wine
+       doins documentation/samples/config || die "doins config"
+
+       dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README
+}