Version bump.

Package-Manager: portage-2.1.4

4 files changed, 161 insertions, 9 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 20024c77a08a..8866c306af15 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.201 2008/01/11 20:03:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.202 2008/01/26 06:13:16 vapier Exp $
+
+*wine-0.9.54 (26 Jan 2008)
+
+  26 Jan 2008; Mike Frysinger <vapier@gentoo.org> +wine-0.9.54.ebuild:
+  Version bump.
 
 *wine-0.9.53 (11 Jan 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index f7452ae7d35c..4cb382908cd6 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -131,6 +131,7 @@ DIST wine-0.9.50.tar.bz2 12891197 RMD160 86dad0b766025bcfbe7b49a27195ac8cd236210
 DIST wine-0.9.51.tar.bz2 12962782 RMD160 96dd0290679530d363f99f0997ea37748710605c SHA1 d08a4c4cd1f21859e25902bf634e13277d3e89e0 SHA256 0cd86ded13eb25d0d1339e1bd8dc787143dd1db278fead5bb18ab47e4a95df3c
 DIST wine-0.9.52.tar.bz2 12966473 RMD160 686b2b5f4c7aff2167a6710b1b392bc282c3768a SHA1 2b7e7cf92691139245ca5d7a026db55d92107355 SHA256 de3fabb72b69b088ff5c8f769e9478bdc07ff3a247428c660e12ac5cae3b6026
 DIST wine-0.9.53.tar.bz2 13064017 RMD160 19f0596d987b1b7da8b33c98e84c6484ad6914ae SHA1 be61c0bead88e85b178c29d7026f54bf72a6540a SHA256 06317d78b7db39458656b6acc6b265ce97f358aefd7ded679263f397a89f1200
+DIST wine-0.9.54.tar.bz2 13106716 RMD160 5208470586169ad2e86745506a79347002871155 SHA1 ac63ae822857edb0a87202f40d14b0614bede5e7 SHA256 ce877d0fcce366dc22faa33ddc57024ca2e1af90564d044d6eb97c4e54d2988f
 DIST wine-0.9.6.tar.bz2 10454441 RMD160 5fb3005c84318e837782bd1b78d0694f3f7ce576 SHA1 8fde8657c67929da25449431cfa7baebb36add4f SHA256 13385d0baad5d63a59e69611852c4ed1c30fccf7c11ec16aa37740c0e1057d70
 DIST wine-0.9.7.tar.bz2 10503641 RMD160 4244d45f9167292301c4ba60417d7119567b000d SHA1 91ea378d55bd76f814a086b13147c1d39d73b874 SHA256 c48bb18fd89b7ffd21931fcc258b8f3d8ce30f0a57c9e1a78569b6861fc1b1e4
 DIST wine-0.9.8.tar.bz2 10563571 RMD160 54b44b3733cb1628189830e3e8295efa848af6f1 SHA1 a1f7e397ed11f69515c228151eb359bd17974601 SHA256 6e6442aec2a889f04897ad739b863abec05c320a6f43c12198914cf7f830ee48
@@ -334,6 +335,10 @@ EBUILD wine-0.9.53.ebuild 3526 RMD160 c105fd203c5696b468d5cf76514c303cf2545c4e S
 MD5 7f4e9c27afe053fb41791c2d4a1f9b58 wine-0.9.53.ebuild 3526
 RMD160 c105fd203c5696b468d5cf76514c303cf2545c4e wine-0.9.53.ebuild 3526
 SHA256 41ca9d61933e47f57b752d8f9da2ed1b5200fec102b2ede4c53d4c74552c8aef wine-0.9.53.ebuild 3526
+EBUILD wine-0.9.54.ebuild 3526 RMD160 0ec2cdf7301900c0d2eb02ddfeb4f0054dd41bd9 SHA1 9fe7a4787663b69b031c0fdf1d18217c2c82dc9c SHA256 418f74a4bc3b961044001d0fe3fb84481f4fe98f45351d5228143a12f97ca481
+MD5 357768b01dabf6e3f83b8637a3e5eed2 wine-0.9.54.ebuild 3526
+RMD160 0ec2cdf7301900c0d2eb02ddfeb4f0054dd41bd9 wine-0.9.54.ebuild 3526
+SHA256 418f74a4bc3b961044001d0fe3fb84481f4fe98f45351d5228143a12f97ca481 wine-0.9.54.ebuild 3526
 EBUILD wine-0.9.6.ebuild 3992 RMD160 0c62501cc18cf8ff136168c08d9b17b10212010d SHA1 30801571e807b0bf7256397818653d906bd5399a SHA256 b29da96f895c70be8c41c5ba4fac6919d4034b62ed7ef2c5ee0eda71dd417eac
 MD5 2c0eac8aab2a8531c70583e6fb11c924 wine-0.9.6.ebuild 3992
 RMD160 0c62501cc18cf8ff136168c08d9b17b10212010d wine-0.9.6.ebuild 3992
@@ -394,10 +399,10 @@ EBUILD wine-9999.ebuild 3155 RMD160 656c808a5b3b46d61f236abb7d46d12fde9fa030 SHA
 MD5 c66e557289c63602125708f6d34f1c73 wine-9999.ebuild 3155
 RMD160 656c808a5b3b46d61f236abb7d46d12fde9fa030 wine-9999.ebuild 3155
 SHA256 8525b3cba9ec1706c4b25a42e9f3124c077eea2b5bae1ad94ac599409055e1dc wine-9999.ebuild 3155
-MISC ChangeLog 36758 RMD160 93df511cb100017eb7b2bcbf0fa3245c15bb44dd SHA1 c77522de1e81c422bc861248f81678833ee23fd0 SHA256 9d8302119a6b4a5c15090e8247ac9475c3861a53045938a0d48c8d345034f090
-MD5 570156cebc571a5c3874a8ad44c0c3dd ChangeLog 36758
-RMD160 93df511cb100017eb7b2bcbf0fa3245c15bb44dd ChangeLog 36758
-SHA256 9d8302119a6b4a5c15090e8247ac9475c3861a53045938a0d48c8d345034f090 ChangeLog 36758
+MISC ChangeLog 36874 RMD160 92f81d6be57b47e645c678fdf838d433327740a6 SHA1 9c79fd66ebcd4756dc00ac5f4719cfedd9c854b1 SHA256 c212e18b072c7e3af4bc61218bca4ab95cc9ea49af705c3ec28228cf1bb03723
+MD5 1670198103a74bada388bea3265adab5 ChangeLog 36874
+RMD160 92f81d6be57b47e645c678fdf838d433327740a6 ChangeLog 36874
+SHA256 c212e18b072c7e3af4bc61218bca4ab95cc9ea49af705c3ec28228cf1bb03723 ChangeLog 36874
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -552,6 +557,9 @@ SHA256 79215b00d633d572d2797358c598c3907e6b22d94fcef35737f68249ea769ac0 files/di
 MD5 b6a7924048dd229f0c43d7bfda07fb42 files/digest-wine-0.9.53 488
 RMD160 6821cafce70b564e424c32c3bf48163e99dec290 files/digest-wine-0.9.53 488
 SHA256 640bdce33d4f5953e26c16aa82ee65f2a681573fec67fa84a2ca4251298fd079 files/digest-wine-0.9.53 488
+MD5 22c601f7d515f4dee6523658bdbbb34d files/digest-wine-0.9.54 488
+RMD160 16d2402ed850712163d5be34dac11f8b5ed9a15a files/digest-wine-0.9.54 488
+SHA256 9a272d07dc2b84017792cb63b343922c24bfa31dbe1f39d387bfe92eff4a06b9 files/digest-wine-0.9.54 488
 MD5 039621b36e2a0b7b840dc3afef8e4ecc files/digest-wine-0.9.6 176
 RMD160 90a7659326320ef2e8376baa92631b7ae467040a files/digest-wine-0.9.6 176
 SHA256 4f0182a7f274fd2bf5946730955c0fa04eb51416442f3557e8d08497333216ca files/digest-wine-0.9.6 176
@@ -595,9 +603,9 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-wine-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-wine-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-wine-9999 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeHy64ACgkQj9hvisErhMJmdQCfYbFzC2mfZ5749ncgYIrg7aXE
-9YYAoI+QCcVkdGW+8ow1Mc2/oS4NWzwY
-=IiZ6
+iD8DBQFHms+Cj9hvisErhMIRAqEfAKCSwy8kr55wSSs8xZeC8XtaO2rWqgCg2W7X
+cZWcTffLkctwIwuEZ7AX/0M=
+=RIh8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/digest-wine-0.9.54 b/app-emulation/wine/files/digest-wine-0.9.54
new file mode 100644
index 000000000000..3da85ee0f99a
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-0.9.54
@@ -0,0 +1,6 @@
+MD5 8d9d5c8ed53f1f97cc997c2612bc3993 wine-0.9.54.tar.bz2 13106716
+RMD160 5208470586169ad2e86745506a79347002871155 wine-0.9.54.tar.bz2 13106716
+SHA256 ce877d0fcce366dc22faa33ddc57024ca2e1af90564d044d6eb97c4e54d2988f wine-0.9.54.tar.bz2 13106716
+MD5 b188c296f045d20abdb11e9c0564894b wine_gecko-0.1.0.cab 5746895
+RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 wine_gecko-0.1.0.cab 5746895
+SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10 wine_gecko-0.1.0.cab 5746895
diff --git a/app-emulation/wine/wine-0.9.54.ebuild b/app-emulation/wine/wine-0.9.54.ebuild
new file mode 100644
index 000000000000..2e7f44ecc30f
--- /dev/null
+++ b/app-emulation/wine/wine-0.9.54.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.54.ebuild,v 1.1 2008/01/26 06:13:16 vapier Exp $
+
+EAPI="1"
+
+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
+	gecko? ( mirror://sourceforge/wine/wine_gecko-0.1.0.cab )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba 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/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( media-libs/lcms )
+	samba? ( >=net-fs/samba-3.0.25 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	>=media-gfx/fontforge-20060703
+	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"
+
+pkg_setup() {
+	use alsa || return 0
+	if ! built_with_use --missing true media-libs/alsa-lib midi ; then
+		eerror "You must build media-libs/alsa-lib with USE=midi"
+		die "please re-emerge media-libs/alsa-lib with USE=midi"
+	fi
+}
+
+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 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 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) \
+		|| die "configure failed"
+
+	emake -j1 depend || die "depend"
+	emake all || die "all"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS ChangeLog README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-*.cab || die
+	fi
+}
+
+pkg_postinst() {
+	elog "~/.wine/config is now deprecated.  For configuration either use"
+	elog "winecfg or regedit HKCU\\Software\\Wine"
+}