Drop the DESTDIR patch since it isnt correct.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 154 insertions, 17 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0841f2955655..d78e38c6cf6b 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.128 2006/02/16 02:26:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.129 2006/02/18 05:25:04 vapier Exp $
+
+*wine-0.9.8-r1 (18 Feb 2006)
+
+  18 Feb 2006; Mike Frysinger <vapier@gentoo.org> +wine-0.9.8-r1.ebuild:
+  Drop the DESTDIR patch since it isnt correct.
 
 *wine-0.9.8 (16 Feb 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3e320aa27527..e09750e02005 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0ae00b029fbe01a0983d477e2b716c68 ChangeLog 24113
-RMD160 19e2bddaf7da3fcb6add9c325cdb40b633803e87 ChangeLog 24113
-SHA256 c5c3dde94077aaaf5be5c1e822da5d225d6bed95e91be950df74a70fb6948319 ChangeLog 24113
+MD5 825a23140ad0dba79dbef8c09c42b41b ChangeLog 24265
+RMD160 2e8cb070baa00292ae85a5bd91b0aa3baf35ab24 ChangeLog 24265
+SHA256 0457f9237916ee0bceb6884c783503ace38a2c6377f2696eb42b476e2da719d4 ChangeLog 24265
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 RMD160 e2e2e9e410345effc5472930c8dff010b8cb1116 files/digest-wine-0.9 63
 SHA256 05a0841e1f0afa0af868b58819bc9a64e00cab9e6817034a5c93dc4c273b161d files/digest-wine-0.9 63
@@ -28,9 +28,9 @@ SHA256 413259251d678d4dec9f99bee93de87e9b63a55bc260e8b512f8d5f054e7f357 files/di
 MD5 f225f2fb4b4bd38c3ba3adbfb8b3722a files/digest-wine-0.9.7 241
 RMD160 aa22a386845edd2abc017df9cbdaf883befe085c files/digest-wine-0.9.7 241
 SHA256 c1626c8942754681b410c25448ce360d88367f32df21026ed3b70c77a353204b files/digest-wine-0.9.7 241
-MD5 247af1df538f8160d6dc0fd4eb7750fe files/digest-wine-0.9.8 241
-RMD160 26966042cc74b1f9d1d3d9a3becfa47694c6e9fb files/digest-wine-0.9.8 241
-SHA256 af1bfaee4da7103871e27f5507ece027aba6f27d1db4a1fbb36255e00c1664ef files/digest-wine-0.9.8 241
+MD5 247af1df538f8160d6dc0fd4eb7750fe files/digest-wine-0.9.8-r1 241
+RMD160 26966042cc74b1f9d1d3d9a3becfa47694c6e9fb files/digest-wine-0.9.8-r1 241
+SHA256 af1bfaee4da7103871e27f5507ece027aba6f27d1db4a1fbb36255e00c1664ef files/digest-wine-0.9.8-r1 241
 MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
 RMD160 4261a416bb000c27f06b919180a35b0710cd7565 files/digest-wine-20041019-r3 67
 SHA256 9c38f9888c6857456ab61e321a958b7bd6884864e2b8bfb67a7a74478473b5ea files/digest-wine-20041019-r3 67
@@ -70,9 +70,6 @@ SHA256 1de54bb6eb8cc3c3f15ea42f916605fa151a5c33ef8c0cdb3412c0d81bbf9dab files/wi
 MD5 125d70d60f356673616cf1effa73d5d1 files/wine-0.9.6-force-ddraw-gamma.patch 862
 RMD160 b3b31b54251bbd45a910ab0ab135ce3b013cdeda files/wine-0.9.6-force-ddraw-gamma.patch 862
 SHA256 02455f96d853283e0b69799e246c17afd396ffa9d4b91fb3a96abaf6ae7d59e7 files/wine-0.9.6-force-ddraw-gamma.patch 862
-MD5 44b917b42a95043e40c6ed24d33af192 files/wine-0.9.8-destdir.patch 548
-RMD160 3d4e5846f187c426a00d0caa0435bae141e4fe7a files/wine-0.9.8-destdir.patch 548
-SHA256 ca713fbdf22ceead77d8f124e6087a9f5ab71601dc919f029a7eb45d0a154209 files/wine-0.9.8-destdir.patch 548
 MD5 138d22e6669e8997cdf4dc6292db748d files/wine-20041019-alsa-headers.patch 448
 RMD160 9a8c6fee2f6b25f3e1181af52fc4282275f08b46 files/wine-20041019-alsa-headers.patch 448
 SHA256 5e13950d88746b9b73eaba1b631be97311ecb3982d10fa4fede00f85791bd468 files/wine-20041019-alsa-headers.patch 448
@@ -142,9 +139,9 @@ SHA256 cd7effa7c27f44bb94e16d79dc8f5f9025d5ff438212b3f5e270885d1546a6e3 wine-0.9
 MD5 7e39349c2b06e475cc7e019c3fd9a701 wine-0.9.7.ebuild 3760
 RMD160 05d77e2472e697e0cc6f70f62bdca37a55d3327f wine-0.9.7.ebuild 3760
 SHA256 5b3cf85c81018f0b8a007ccee564dd3c882d40196f7501d0047375c768a25df8 wine-0.9.7.ebuild 3760
-MD5 5723547f74e9d61c3e197b7c96d21aa4 wine-0.9.8.ebuild 3570
-RMD160 8579f7d76f67a53a0748f12baf36154c2979a8b3 wine-0.9.8.ebuild 3570
-SHA256 5df38ad2f10b3dc560c25b744511d9badd877cd549fe7f1b386247f3399a3ecd wine-0.9.8.ebuild 3570
+MD5 19556867fd85cd1da36dd48e6afd4f92 wine-0.9.8-r1.ebuild 3536
+RMD160 f0e844a4d2269fa0b93a0b7fba8e090f57656300 wine-0.9.8-r1.ebuild 3536
+SHA256 1224754b20383f3a7c64c92107c4f3dee7f861568d0c6f19c1871cec25a85ca6 wine-0.9.8-r1.ebuild 3536
 MD5 1cf19e432ad168a882560c21744498a8 wine-0.9.ebuild 4141
 RMD160 c0bd4dd3dba1b333240682479982deab4ce4d743 wine-0.9.ebuild 4141
 SHA256 00c8d90cc43ecb7be21562f9b0628f31b84dcadae4235ba882866102d1e79733 wine-0.9.ebuild 4141
@@ -182,9 +179,9 @@ MD5 3497f88f2945e1696bcc78d45607a6e4 wine-9999.ebuild 3505
 RMD160 4fd4f8a49a5f430468f7d22271574028118b19b4 wine-9999.ebuild 3505
 SHA256 3c59733857447827122179ce0cbad4471e0141d9b62ffa53d5fadd2165b7b666 wine-9999.ebuild 3505
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD8+Lp2+ySkm8kpY0RAvAdAKDEy2lDDhDAMREnHb8EBqfYPwRw9wCghJzN
-NSmJQmBW8mW61tjGNp6yY20=
-=Fa39
+iD8DBQFD9q+/2+ySkm8kpY0RAihNAJ9HfL0IjHjXnK4CLp/r4ffUpThhZgCgof2Q
+pHBIKdBevvBAhJAmqeRPpb8=
+=E322
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/digest-wine-0.9.8-r1 b/app-emulation/wine/files/digest-wine-0.9.8-r1
new file mode 100644
index 000000000000..d84b4eaca9c0
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-0.9.8-r1
@@ -0,0 +1,3 @@
+MD5 a3b3914c9e34df910045384d64baee87 wine-0.9.8.tar.bz2 10563571
+RMD160 54b44b3733cb1628189830e3e8295efa848af6f1 wine-0.9.8.tar.bz2 10563571
+SHA256 6e6442aec2a889f04897ad739b863abec05c320a6f43c12198914cf7f830ee48 wine-0.9.8.tar.bz2 10563571
diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..6d45f7644355
--- /dev/null
+++ b/app-emulation/wine/wine-0.9.8-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.1 2006/02/18 05:25:04 vapier Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.com/"
+SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+RESTRICT="test" #72375
+
+RDEPEND=">=media-libs/freetype-2.0.0
+	media-fonts/corefonts
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	X? ( || ( ( x11-libs/libXrandr
+				x11-libs/libXi
+				x11-libs/libXmu
+				x11-libs/libXxf86dga
+				x11-libs/libXxf86vm
+			)
+			virtual/x11
+		)
+	)
+	arts? ( kde-base/arts )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
+	glut? ( virtual/glut )
+	lcms? ( media-libs/lcms )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	truetype? ( media-libs/freetype )
+	scanner? ( media-gfx/sane-backends )
+	amd64? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
+		>=sys-kernel/linux-headers-2.6
+	)"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/inputproto
+				x11-proto/xextproto
+				x11-proto/xf86dgaproto
+				x11-proto/xf86vidmodeproto
+			)
+			virtual/x11
+		)
+	)
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	use amd64 && has_multilib_profile && export ABI=x86
+}
+
+src_unpack() {
+	unpack wine-${PV}.tar.bz2
+	cd "${S}"
+
+	epatch "${FILESDIR}"/wine-0.9.6-force-ddraw-gamma.patch #119931
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
+	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+config_cache() {
+	local h ans="no"
+	use $1 && ans="yes"
+	shift
+	for h in "$@" ; do
+		[[ ${h} == *.h ]] \
+			&& h=header_${h} \
+			|| h=lib_${h}
+		export ac_cv_${h//[:\/.]/_}=${ans}
+	done
+}
+
+src_compile() {
+	export LDCONFIG=/bin/true
+#	use arts    || export ARTSCCONFIG=""
+#	use esd     || export ESDCONFIG=""
+#	use scanner || export sane_devel="no"
+#	config_cache jack jack/jack.h
+#	config_cache cups cups/cups.h
+#	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
+#	config_cache nas audio/audiolib.h audio/soundlib.h
+#	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+#	config_cache ldap ldap.h lber.h
+#	config_cache gif gif_lib.h
+#	config_cache glut glut:glutMainLoop
+#	config_cache jpeg jpeglib.h
+#	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
+#	config_cache lcms lcms.h
+	use x86 && config_cache truetype freetype:FT_Init_FreeType
+
+	strip-flags
+#	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
+
+	#	$(use_enable amd64 win64)
+	econf \
+		CC=$(tc-getCC) \
+		--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"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS ChangeLog DEVELOPERS-HINTS README
+die
+}
+
+pkg_postinst() {
+	einfo "~/.wine/config is now deprecated.  For configuration either use"
+	einfo "winecfg or regedit HKCU\\Software\\Wine"
+}