Version bump.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 148 insertions, 8 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 62ea00c09dcf..e4f1ca0d700a 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.159 2006/10/28 23:44:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.160 2006/11/11 02:15:17 vapier Exp $
+
+*wine-0.9.25 (11 Nov 2006)
+
+  11 Nov 2006; Mike Frysinger <vapier@gentoo.org> +wine-0.9.25.ebuild:
+  Version bump.
 
 *wine-0.9.24 (28 Oct 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 45796f2f5811..387fc38251ea 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -96,6 +96,7 @@ DIST wine-0.9.21.tar.bz2 11085800 RMD160 db79f5620607ccb0f06e77d520e1019d759cf4b
 DIST wine-0.9.22.tar.bz2 11168542 RMD160 40c026e416aba571761dcaef52f961cec42840d1 SHA256 c356bcf9b841ffd430f2bea0ae4afbafc8dc0af177c6e15550b31dd06288586b
 DIST wine-0.9.23.tar.bz2 11197988 RMD160 3b588b0a5f41db336c976cb82ad538e4cd62dbe9 SHA1 598a6482cedec84ad95910084600bad38e80bfed SHA256 10b2348b0258c467a7d7d80d4812b26eb954d20ebde90794fe94eb3b92e68654
 DIST wine-0.9.24.tar.bz2 11258286 RMD160 4fe83188dd8ec0d8a10f8f248b3121cedbe4ba59 SHA1 401736bf76674b447df688392ff3a53709229eae SHA256 840ed63b7886cac5bbfc4a0d25a3a68b43c9194ae9eb0e7636a50ba324e77209
+DIST wine-0.9.25.tar.bz2 11297723 RMD160 7aa4317cf64f473a44fb7f9093cecf86ba022fd8 SHA1 bdfac6530616d69bee305ed4c5bc6c41f424be7a SHA256 427d12210120cc7a8f297e2f42ee026bebc5931b9d477efd31f5bfc1cb5d5a5a
 DIST wine-0.9.3.tar.bz2 10322660 RMD160 4dc441a8f0ea46300cb4d0b0fe8f239dc6d9f50e SHA256 69461c68caf0140221560865f53cf3e090e1f0c7b72835afaa815ed231f5ccef
 DIST wine-0.9.4.tar.bz2 10369764 RMD160 da94ba6aaa2db6e7608aa8e9ad0bc159b887efee SHA1 085b657b4cb60954279870ce2f5145b7333aeaec SHA256 6c1b168c78bddacfb2575f85ce0c2c60084bbfe9649a757a3fd1c0b8c74e7af7
 DIST wine-0.9.5.tar.bz2 10394362 RMD160 1bcbceeffd8c08b1906c658a548b58514822dd24 SHA1 a1997cd5a12699c2b5e4f45fb88aa30792ce1145 SHA256 fcfef5d713a9eeded1fc307d4f86ef46101bd5cb5433d5169d750326be5fa3c0
@@ -173,6 +174,10 @@ EBUILD wine-0.9.24.ebuild 3327 RMD160 329fc5378f32958209c7bdadc2d10d003d589be0 S
 MD5 e5957acf0a14b010196e075d0287c9f0 wine-0.9.24.ebuild 3327
 RMD160 329fc5378f32958209c7bdadc2d10d003d589be0 wine-0.9.24.ebuild 3327
 SHA256 a5868c690014e145fb3b316c6b90159d4173b95be31a73656c10641fd6e599cc wine-0.9.24.ebuild 3327
+EBUILD wine-0.9.25.ebuild 3327 RMD160 8c0fe29e36c9e63dfcaafbdbdee9950d36dc543a SHA1 6ad8dad24d71ffbc26ec6a5307f4bb77dc5d8021 SHA256 01d70f92804fef6211258ca89f79fc850a429200750d2ec3702b5e08631328af
+MD5 019be9670c3f45310d74674ee4da5fa4 wine-0.9.25.ebuild 3327
+RMD160 8c0fe29e36c9e63dfcaafbdbdee9950d36dc543a wine-0.9.25.ebuild 3327
+SHA256 01d70f92804fef6211258ca89f79fc850a429200750d2ec3702b5e08631328af wine-0.9.25.ebuild 3327
 EBUILD wine-0.9.3.ebuild 4161 RMD160 034335ac75a4d93d3a73ca7ec9dbfd1ebd4c3f09 SHA1 2bfe670af3e3e7ea867e7553ca455df252fa8070 SHA256 e2358c310e979d952712d75fc9511449f687dea41538a77aefc9d9d261affe39
 MD5 6148e3fbd3ab83fd7c8a0cf89a7f1c7e wine-0.9.3.ebuild 4161
 RMD160 034335ac75a4d93d3a73ca7ec9dbfd1ebd4c3f09 wine-0.9.3.ebuild 4161
@@ -249,10 +254,10 @@ EBUILD wine-9999.ebuild 3483 RMD160 89b33201d5c6f1ba81a7e2708d6596ecbe3d2f58 SHA
 MD5 51aefca6c99a963a877bfb7e526b4573 wine-9999.ebuild 3483
 RMD160 89b33201d5c6f1ba81a7e2708d6596ecbe3d2f58 wine-9999.ebuild 3483
 SHA256 87d6a9ea9a92492ae565f6b771c1e596a6893ca311ed27a733d4e175554d0d15 wine-9999.ebuild 3483
-MISC ChangeLog 29158 RMD160 f9548b985127392d0c9eee2fbd0f3fd0dd6046b3 SHA1 f4d018ab541b2aebf6ba134c56802c0ad4e65641 SHA256 5c7a746946051ac5b94a9a37d401153dbf91ac6d052e9aec1f13a8f2be5d608c
-MD5 c3628572122ce0679f7e6f2be880c7b0 ChangeLog 29158
-RMD160 f9548b985127392d0c9eee2fbd0f3fd0dd6046b3 ChangeLog 29158
-SHA256 5c7a746946051ac5b94a9a37d401153dbf91ac6d052e9aec1f13a8f2be5d608c ChangeLog 29158
+MISC ChangeLog 29274 RMD160 d0d193427b9f71329c0850b5c472daaab5c38161 SHA1 67cdf6a4caa167f1e692d39ea7d5c73a2c352bdf SHA256 2dd1f655c22eb5c4567a2194a3054611a39aea1b3801da9557e8e58608e5c1f9
+MD5 3e6bcd486db3c98410a07c43084b3734 ChangeLog 29274
+RMD160 d0d193427b9f71329c0850b5c472daaab5c38161 ChangeLog 29274
+SHA256 2dd1f655c22eb5c4567a2194a3054611a39aea1b3801da9557e8e58608e5c1f9 ChangeLog 29274
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -311,6 +316,9 @@ SHA256 58a13b6b387fc0c19f5cb2d367472d4689fc363ad9e0e415fd6ca627a2c4b025 files/di
 MD5 eb8b1c1a2c7147ee7b975b8e9902549a files/digest-wine-0.9.24 244
 RMD160 a22d1b4bcb729f9c0d809e8ce7236a540864d43f files/digest-wine-0.9.24 244
 SHA256 044bfbe69c4145d3862bdee5e3207b8a17c675ba5210e0730cd03fd86f56c3c9 files/digest-wine-0.9.24 244
+MD5 fa236822eb77e737552bb96730a4df95 files/digest-wine-0.9.25 244
+RMD160 eb69d4a91c8624d393f51c6f7a377da3d026219a files/digest-wine-0.9.25 244
+SHA256 33902d9afdf63e1eea93a8b7fbf924eb41b4f861cfeb3eb77264a65aee20f381 files/digest-wine-0.9.25 244
 MD5 bbf656ce4ef0d6ed31c65a6cb2028bae files/digest-wine-0.9.3 241
 RMD160 1286a9f6ad02f4682b3fd26bb25f43c391abb43b files/digest-wine-0.9.3 241
 SHA256 dd461e877df62f55e1920e43c1f7974d8858917f88e2a3f63938d92665f9db5d files/digest-wine-0.9.3 241
@@ -368,7 +376,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQ+ubamhnQswr0vIRAvBmAKCrTclZeeOGGUCwB61XdkYjwPQvgQCfbQDI
-ie8/iXt4AIbwGC2P3n9mjlw=
-=TkCl
+iD8DBQFFVTI9amhnQswr0vIRAtIjAKCffSZ6rRtDpoBumQ3s0OY3V1udtwCaA7CX
+PuANS70mGxeOXwdy/daS42E=
+=XTRX
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/digest-wine-0.9.25 b/app-emulation/wine/files/digest-wine-0.9.25
new file mode 100644
index 000000000000..00b11cc083a1
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-0.9.25
@@ -0,0 +1,3 @@
+MD5 83651d82ada4b06cfead5c535bcbdd6e wine-0.9.25.tar.bz2 11297723
+RMD160 7aa4317cf64f473a44fb7f9093cecf86ba022fd8 wine-0.9.25.tar.bz2 11297723
+SHA256 427d12210120cc7a8f297e2f42ee026bebc5931b9d477efd31f5bfc1cb5d5a5a wine-0.9.25.tar.bz2 11297723
diff --git a/app-emulation/wine/wine-0.9.25.ebuild b/app-emulation/wine/wine-0.9.25.ebuild
new file mode 100644
index 000000000000..6a13af2a903e
--- /dev/null
+++ b/app-emulation/wine/wine-0.9.25.ebuild
@@ -0,0 +1,124 @@
+# 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.25.ebuild,v 1.1 2006/11/11 02:15:17 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 dbus debug esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml 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 )
+	dbus? ( sys-apps/dbus )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	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 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	>=media-gfx/fontforge-20060406
+	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/xf86vidmodeproto
+	)
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack wine-${PV}.tar.bz2
+	cd "${S}"
+
+	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 ac_cv_path_ARTSCCONFIG=""
+	use esd     || export ac_cv_path_ESDCONFIG=""
+	use scanner || export ac_cv_path_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 xml 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 dbus dbus/dbus.h
+	config_cache hal hal/libhal.h
+	config_cache jpeg jpeglib.h
+	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
+	config_cache lcms lcms.h
+
+	strip-flags
+
+	use amd64 && multilib_toolchain_setup x86
+
+	#	$(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"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS ChangeLog DEVELOPERS-HINTS README
+}
+
+pkg_postinst() {
+	einfo "~/.wine/config is now deprecated.  For configuration either use"
+	einfo "winecfg or regedit HKCU\\Software\\Wine"
+}