Version bump.

Package-Manager: portage-2.2_pre5

3 files changed, 159 insertions, 7 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 2ae7cfec9e0a..38a50f3e691d 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.208 2008/04/04 23:32:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.209 2008/04/18 17:59:34 vapier Exp $
+
+*wine-0.9.60 (18 Apr 2008)
+
+  18 Apr 2008; Mike Frysinger <vapier@gentoo.org> +wine-0.9.60.ebuild:
+  Version bump.
 
 *wine-0.9.59 (04 Apr 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index b4e5324379ed..26dd43e8f0a9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -81,6 +81,7 @@ DIST wine-0.9.57.tar.bz2 13309776 RMD160 69b82e95bff12d4db388a90f30f02c1176e4df1
 DIST wine-0.9.58.tar.bz2 13344222 RMD160 05dda9c6dacfaf8a52cd5ad89e55d666af46b888 SHA1 ea5e645cecb4889f90cfb7e05cee150a547566b8 SHA256 ef3d5c8c877dd25591324ae51266936b7b8b9beb7c21fdeee5690c27b9e33ff8
 DIST wine-0.9.59.tar.bz2 13557410 RMD160 fc96c66706e4c5b38d07aac9403bcc39ab35affe SHA1 db89a1fb1251beb5d3463d53bb4a1b8fc61d29b0 SHA256 7b170a459494ea10b6212d0293c8e8f454fd854bd4c111f46b2587f281c54e31
 DIST wine-0.9.6.tar.bz2 10454441 RMD160 5fb3005c84318e837782bd1b78d0694f3f7ce576 SHA1 8fde8657c67929da25449431cfa7baebb36add4f SHA256 13385d0baad5d63a59e69611852c4ed1c30fccf7c11ec16aa37740c0e1057d70
+DIST wine-0.9.60.tar.bz2 13809862 RMD160 66053099d18ed898759db99367db198bbd817cf4 SHA1 bc203cad74a97184e5f0fffa14edd243c42511af SHA256 fb5bd9d70746c1c0a0d5fb506bf2d0fdb36bceaf1a790964890e934148722948
 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
 DIST wine-0.9.9.tar.bz2 10546298 RMD160 50f53da5a8be9ecdb7a982307952effc4754d5ec SHA1 efdff295b4996873c54e3536b73022dea41af923 SHA256 77c908178705b7b061e0ea759935643465c7591e54f59d2bb3ec7133ce3a51d5
@@ -137,11 +138,12 @@ EBUILD wine-0.9.52.ebuild 3524 RMD160 33faa4b9eaa0b905fc0472a3c023893865fb18d9 S
 EBUILD wine-0.9.53.ebuild 3524 RMD160 c91de8a514c73e349fec54e1666df543337a6089 SHA1 bfac35c4c6d12d99077e36dcd0fba4db20216a36 SHA256 227a349fb965af34b302233b5a4a6b784590734b1b8c983da0c38d62350dd494
 EBUILD wine-0.9.54.ebuild 3524 RMD160 d0a76aafdde995039c1e4d4012e226679a8744b3 SHA1 25449dd5183177726ca98f2a8223394ac26c65c3 SHA256 649bbb360921e5561b000c25f2923fdc392dbd13b5947c85b034a2f2ddd2b68d
 EBUILD wine-0.9.55.ebuild 3524 RMD160 ffe1a0be10e4e69c204abedf96331e15846a68ec SHA1 7201d42bbaea8a39e6c1a90e3b32016c046d94c0 SHA256 4100e388bacfa6dedd3e71cb66a24e6f6bbcb0f8246190f1b26e3c120445c4f9
-EBUILD wine-0.9.56.ebuild 3526 RMD160 ba377fb5ea9ec4f56930815fc863099d22f3d5b3 SHA1 d1f733f200289cbc2bd7272212874dccf86e7abf SHA256 c406c87e5735c4deb93e8651018425cec2ba3e2bd9936ecd95943dea61c4bd65
-EBUILD wine-0.9.57.ebuild 3526 RMD160 a7a96a966980ebdc398d305e1e13c20dc5cd023f SHA1 fa5650eaa96d33e76661fd087379fba6bb4ff896 SHA256 15948dbbd1cd4001e6c6e02f4686abecf23fe18e91f9b29ae174285e481f4c6f
+EBUILD wine-0.9.56.ebuild 3524 RMD160 1cfc9bb198ab2fdac26706849eee45d442bafd1e SHA1 0fcb3a8f689b7d0a139fb3eea7886579695f4507 SHA256 c20885c022af217466eb41840338b678bcca45235717f3755af99f70a9f193eb
+EBUILD wine-0.9.57.ebuild 3524 RMD160 4f5369cdc9289fb064c836a64a25b08fa9418e45 SHA1 80bc5158364e28a638d9bc1e9783e8e5abf20c2c SHA256 4026388c210267b956299a7074f8727480197b38be1cd1e4f8aaab1e7ffac3b8
 EBUILD wine-0.9.58.ebuild 3746 RMD160 48b04f3f9eb28041698f1d1f8e0870727033bab5 SHA1 dc6a7191cf1821650c9a24cf136ab56757973ab6 SHA256 9181928bdd00c100fcde465aba05ebce99a8270514f0f7bdf11618e84a359fbd
 EBUILD wine-0.9.59.ebuild 3746 RMD160 2c4dc4cd3bb3dd462c2a34365a32650600c6f1ce SHA1 6d4b91a3f3d8f45bde7e952c6bf4d3807bbdbf72 SHA256 d167bf71e71f8f5d3f8fe81b8fa31971ba46582973988f80d17940e721b02937
 EBUILD wine-0.9.6.ebuild 3992 RMD160 b06b88ea55725c2dcd78a568f45c7cfd51d12b5f SHA1 206f183cc5fe99fe45af23be51f8de0e966dd813 SHA256 7bb3f6dbce32575a76e744d4dcd9d09c11a78626b53309b44a7654a7eff9969e
+EBUILD wine-0.9.60.ebuild 3746 RMD160 ce341fb440afde59876ebd4a50e50b4ac489d956 SHA1 df67210d78ad2cf12321e9a8ea9a53472982b776 SHA256 dfe363698d42a4a0daaae8f9094b77382b37e7f31ae5db10de61430d140160c6
 EBUILD wine-0.9.7.ebuild 3579 RMD160 22b671ce0b34c204af331165a2835390d225caa5 SHA1 d4c447720533f099437bf2348c6ae142dc1d8868 SHA256 712cc881cd540b7bbb969412b24bb2cba3f9c5022980e8fbffb66f91c165659d
 EBUILD wine-0.9.8-r1.ebuild 3388 RMD160 34aa8f7662a99fbe47add687b861fb7a5cb0e017 SHA1 02a8b79818ea19d4a615ee2f809aee2ffb8be283 SHA256 93d097f95c70c5236cc2214d4f75c15719a3c6498b50545f5cb53328ea4a43cf
 EBUILD wine-0.9.9.ebuild 3397 RMD160 3c5660f04f4958621c8feb23682ca884e6507c67 SHA1 376da714a31b73276caa72f8bfba8fa6ffe81ab4 SHA256 e8d080042c70ff71240c68fd2740f49e83b719106dbbd9a4718de35a846f2edf
@@ -153,12 +155,12 @@ EBUILD wine-20050725-r1.ebuild 4133 RMD160 faf107f9c1686f423ace65242a5fb31611a89
 EBUILD wine-20050830.ebuild 4117 RMD160 8d1337a7e6986402ed0a6cd00f60789888c68c36 SHA1 924578326248435ac3e9326e35ab4d752a7f8897 SHA256 7189b9d3b69e447ce1cf2af22d58aa6cad4b9f1298f091644482567b6bd829ba
 EBUILD wine-20050930.ebuild 4134 RMD160 5f2b07bec71c6534ff3b005769972babce2fef07 SHA1 0158ee29f2f8beeeef46e5fce1ee8cb7c582fd46 SHA256 d123c1e3db09be04d43e80da1fc594e148c09f0aefc7f4d956e413ee89ab1bc5
 EBUILD wine-9999.ebuild 3721 RMD160 57824e46ba6ac5a11c9698c8957a5bc0d1211546 SHA1 ece114f6e5ee37a45bac61521da9b0c5349d077e SHA256 3533ffe5bc2b497ede11cb97623d97682184a53e3b229317be109c3cf5b53b14
-MISC ChangeLog 38579 RMD160 e667774acfe36234e7e759d2b56bade1d4c448b2 SHA1 3187d4eeb2cb574d93890fc5874433413fae8068 SHA256 ad91cab3d08856e061be8474d32d35bf536b219e918ead889e8e368add0b0029
+MISC ChangeLog 38695 RMD160 206b4bf3db8ec2e9cb02d6038b66a11a303b9b21 SHA1 2f27cfc0bd1dd62fefc759f4961a312c865af0e4 SHA256 82e2e15b747cfc19ba7bfa4a19098c439f794fed63653bbace667d1a142c1fb6
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH9rsPj9hvisErhMIRAiYRAJ9v60fw5BlLluEB3+zDMwB/+mCk1wCfZqXN
-ortn5oUuXjpUY7a41gOdoL4=
-=Y2M9
+iD8DBQFICOF1j9hvisErhMIRAmN+AJ0RPFTPya/eHPA2wfzYPbbfD01RhQCfWAX4
+wrvL1dnrCvk6Rywz2ziCe+k=
+=sb3D
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.60.ebuild b/app-emulation/wine/wine-0.9.60.ebuild
new file mode 100644
index 000000000000..efbf3491b8f8
--- /dev/null
+++ b/app-emulation/wine/wine-0.9.60.ebuild
@@ -0,0 +1,145 @@
+# 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.60.ebuild,v 1.1 2008/04/18 17:59:34 vapier Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
+fi
+
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	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() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack wine-${PV}.tar.bz2
+	fi
+	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 DEVELOPERS-HINTS 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"
+}