Version bump.

Package-Manager: portage-2.2_pre5

3 files changed, 145 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 2bce5331663a..2cdcc143c3da 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.206 2008/03/08 09:31:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.207 2008/03/22 20:05:33 vapier Exp $
+
+*wine-0.9.58 (22 Mar 2008)
+
+  22 Mar 2008; Mike Frysinger <vapier@gentoo.org> +wine-0.9.58.ebuild:
+  Version bump.
 
 *wine-0.9.57 (08 Mar 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 6c10455df585..88251fcd0c69 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -79,6 +79,7 @@ DIST wine-0.9.54.tar.bz2 13106716 RMD160 5208470586169ad2e86745506a7934700287115
 DIST wine-0.9.55.tar.bz2 13103916 RMD160 8d2eb96ba6d0e753836d7884f7378007dfc3215c SHA1 fc762a4f78d6092f0c9e60e365948e0eed0476b9 SHA256 8da8e13f7e3d6d7c50844e9dd862f8e6dea99c38f11f3fb6b6682f7726695ee3
 DIST wine-0.9.56.tar.bz2 13184259 RMD160 a25bd6e7c7e97d05cdafecf2211b275249fd07f2 SHA1 ef40fc70356394e570e48506c67c398abe4b509c SHA256 d211cffa3d0ca4922b062faff04871fd2744a783686dd6f4d9f87c9e1a2fccd3
 DIST wine-0.9.57.tar.bz2 13309776 RMD160 69b82e95bff12d4db388a90f30f02c1176e4df1b SHA1 0c99c7dd2e2041dc3d8913d395619d04b7c76284 SHA256 a11bb0a1e954656425fb20863169ea62daeef04b7dc846529da628bc998ee223
+DIST wine-0.9.58.tar.bz2 13344222 RMD160 05dda9c6dacfaf8a52cd5ad89e55d666af46b888 SHA1 ea5e645cecb4889f90cfb7e05cee150a547566b8 SHA256 ef3d5c8c877dd25591324ae51266936b7b8b9beb7c21fdeee5690c27b9e33ff8
 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
@@ -138,6 +139,7 @@ EBUILD wine-0.9.54.ebuild 3526 RMD160 61e7769b76ce590e1af6747c96d4e3a48c2e72c4 S
 EBUILD wine-0.9.55.ebuild 3526 RMD160 c1caa6cfb4504d8da4baa12d8438d69f0773e4ff SHA1 56d50298f54c2a2e3a3996c733fa1d086b7891c9 SHA256 575463d4406ea515ba32d544212f115497793569cb1efe69921cc555ffe584fd
 EBUILD wine-0.9.56.ebuild 3526 RMD160 0e39825745ef73ff6bee8de8d9f153e9b06b8f51 SHA1 274167634b1e58b7429b20c8c1c0bf03f1f18f79 SHA256 02a394012830f730f54a3d8ecbeafe6fa42900e4da974dd707198dd293ed16d9
 EBUILD wine-0.9.57.ebuild 3526 RMD160 8ddd42e8db04facdf0e6efcf3614fb6e84a63f24 SHA1 757f6979c0a06d66234645057c0d104963bfe70c SHA256 29a0f6e6b7521cd3a83f4d07e9e5953f120c786639023b7c4e699fd3f6089fb9
+EBUILD wine-0.9.58.ebuild 3526 RMD160 684ce6b96a4d2a89de574bdcc313c4734c506fed SHA1 ae968e3a819594ce40522226f6758fb42e7beeba SHA256 223c9451b517acd8c23b96418720a4205663ef2605651d09d812534f0b79a430
 EBUILD wine-0.9.6.ebuild 3992 RMD160 0c62501cc18cf8ff136168c08d9b17b10212010d SHA1 30801571e807b0bf7256397818653d906bd5399a SHA256 b29da96f895c70be8c41c5ba4fac6919d4034b62ed7ef2c5ee0eda71dd417eac
 EBUILD wine-0.9.7.ebuild 3579 RMD160 8f7850329ee08c6bdff38e9cb8b464dff0b6f26e SHA1 1cde07cc7e13f39ad4c0da7db1b37d96a262207d SHA256 e74cc046b087abcd20ffcfa560d84ca2b6e883aed4a10dd5627b9e3febc6cbd8
 EBUILD wine-0.9.8-r1.ebuild 3388 RMD160 96851b4dca79b88326d35bc3f87a011cd66e0b6c SHA1 ad70e0d74399d41cc3b589aab5d84c897e24c8b9 SHA256 f8f6754ca850a274ad623b5625d2bcecc98cca4987c89ae6f174ae8dcba98d68
@@ -151,12 +153,12 @@ EBUILD wine-20050725-r1.ebuild 4132 RMD160 491dc7a476b656702f6c27450384b8ccf985c
 EBUILD wine-20050830.ebuild 4116 RMD160 f89f50efe682eecedded5b4fafc6affd1d8c315c SHA1 705a61925dbf931e1955b7d2bbaaadb74ac35040 SHA256 d7b512f5654a21a100070f163077cb43633bb8ddbb97a3454cb372e8b6b2eaa0
 EBUILD wine-20050930.ebuild 4133 RMD160 8e256c1b825300ec5fddd85449fadafe4dab57be SHA1 a4e996d8cf5ee47fc73a2bc1ff56c6130c5441ae SHA256 80d89c4211c1d535259e25807ca5c7e7a5548419166d8fa41aefd4a305dd6a7a
 EBUILD wine-9999.ebuild 3156 RMD160 b2ef72c3d2b28d0225113598431b8cd483452bbe SHA1 fad43163e79d5de6894473c1bd6254fa348183e6 SHA256 3029b6c7ad1df81b42ec4d4d819f9055145f91c4fa251a605d3ccde3ac8bac23
-MISC ChangeLog 38347 RMD160 9a57931dc6f2b1250133ad6d12f8bb97785b310e SHA1 9627d817512441a7358e3abddf125d0b464e9b16 SHA256 4960cf163e11978b2c6ebad3e6db110806eb9fd9cd603517b64f19382ba8d093
+MISC ChangeLog 38463 RMD160 3c570a33272ebbedbffc98b841fe1031f7f13678 SHA1 e3cbca6a901930f16359d7108ee574f754f88670 SHA256 88a83cd6c9d8faf8f4f87ec6b1a9764fc0acc9878a593ffd26ee1113ec1242da
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH0nqFj9hvisErhMIRAh5yAJ4712Oc1+Rz+DVP05L8XZ6XRGmOcgCbB60d
-wHQ5HsQdXURm+KKxy0+EWj0=
-=OkVk
+iD8DBQFH5Wf9j9hvisErhMIRAlG9AJ9ivSHCmOsoax0h2VsSSWzDol3qxQCgmy4e
+xN2A0hh8KCLiNvaF1Wp/V5U=
+=mxL+
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.58.ebuild b/app-emulation/wine/wine-0.9.58.ebuild
new file mode 100644
index 000000000000..7e7484ba2da6
--- /dev/null
+++ b/app-emulation/wine/wine-0.9.58.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.58.ebuild,v 1.1 2008/03/22 20:05:33 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 )
+	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}
+	>=media-gfx/fontforge-20060703
+	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"
+}