Version bump.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64

3 files changed, 160 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0d933b522b94..a39b0f117697 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.218 2008/06/13 19:48:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.219 2008/06/17 22:03:08 vapier Exp $
+
+*wine-1.0 (17 Jun 2008)
+
+  17 Jun 2008; Mike Frysinger <vapier@gentoo.org> +wine-1.0.ebuild:
+  Version bump.
 
 *wine-1.0_rc5 (13 Jun 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 58b3e722a5d1..dc612ea8420e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -91,6 +91,7 @@ DIST wine-1.0-rc2.tar.bz2 13948521 RMD160 65880c7f668d97577adf568bd44037da28261e
 DIST wine-1.0-rc3.tar.bz2 13991771 RMD160 5c50dfcba63e569d88b4b487f422a20e2205955a SHA1 b03514253b7218781b694004ac4640557b4d1f96 SHA256 b56b994e043d4a34bbda605ceba5607f699bdff68b8bbfd91e4e0701e4f6c5b6
 DIST wine-1.0-rc4.tar.bz2 13983809 RMD160 c6e26e6299e2068e928937bbde820c62ab768315 SHA1 c737110f51bbdd1451590722f1224013198ce8e1 SHA256 72afc4184606aa8cccdb356a3923414e3f8c626d1c037cae1792d0a146600c47
 DIST wine-1.0-rc5.tar.bz2 13971266 RMD160 76c1783d2cee3c39eb829f2910841a5c145d6e74 SHA1 67e78e6c32612e0e58fdd4df5472478c46637f51 SHA256 f4d33db7a98d096e449a4c35a690dc0df59d0fd43ae9340525c72b266b2bc3f9
+DIST wine-1.0.tar.bz2 13981030 RMD160 1dbfa38e54e7d6269ad4110f22b2791393fd3b59 SHA1 84150abdda18bc34b187335c6862718a6e08d255 SHA256 27a31ffafd8f39dd7e434e6a9789f3b4c35145568ab79c3dc8120153469c6cdc
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 EBUILD wine-0.9.1.ebuild 4029 RMD160 a3bd9f11506b0175286e5128e4f185a5ccc60d9f SHA1 ba419db0b6cbf5a99a83a1ee7e7c693adbf3e98b SHA256 c74c08048901d8c40a49bc96f5765d88d921a82a32bb2e690b93a253d950ae58
 EBUILD wine-0.9.10.ebuild 3346 RMD160 dd8b03fa64d320feff2b403afc9be4adc3901be1 SHA1 9ea643a17ec75d1148623bcc635d7d180f32eb5e SHA256 1e59f85eaace2dadf040fba5cb3744249976741b8ee093fa72fe495540079589
@@ -154,6 +155,7 @@ EBUILD wine-0.9.7.ebuild 3579 RMD160 22b671ce0b34c204af331165a2835390d225caa5 SH
 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
 EBUILD wine-0.9.ebuild 4027 RMD160 f0ddba224c7c2a20078c4eea4aa29a29b7380562 SHA1 7f9b646760535ef0a0421ba6486549575fa5b343 SHA256 7a687c523556eb47cb695be716809027a7a82410e74f784258473b60348e000b
+EBUILD wine-1.0.ebuild 3771 RMD160 4d88cd4b69642330eb8e582c7ba00f3b524009f1 SHA1 47007785cb28542a54133c1e70a87e0dd6cd66a3 SHA256 3d7cb994656a7c5e8e3bd821991681829931d160a410aa77f1c9a6230c52fb73
 EBUILD wine-1.0_rc1.ebuild 3762 RMD160 e2e91e6e8853742d15434f0d799b44e5750e5cf3 SHA1 c3f80820b677e24552dc72644a717b0fe384bb47 SHA256 0cbfea738c5c2db9d2f88a58414ece535eb07b90fb00bb7f580bcb0af2eedc31
 EBUILD wine-1.0_rc2.ebuild 3775 RMD160 f9a34f344af47ed22a8977a1ba4452a2a4d7c250 SHA1 3cb3882c80b81960bd8b45739652e6ec5c5ccbc7 SHA256 14da752c68a20e66ec171d647acc736558769fb072917372cbf37ea601141e51
 EBUILD wine-1.0_rc3.ebuild 3824 RMD160 18bd11b38dda9344c01b9bd0cf6f7b0bd121280f SHA1 734c7b3997e00f11e3c68211e15660ec88cc8e3d SHA256 f20b2727e2c043e1a6f5adc535d96939e4ac0130f7a3222daa9fd3d2f3f0d981
@@ -164,12 +166,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 39894 RMD160 e123801c696a61ff882d98b99ee35d7e1c13319b SHA1 a036ce3769ac6df47e61b835aacbe2dc7e46484d SHA256 45a514b1465421d102029453e221ced1988be73487f7897ef078d0d8d9cc4a98
+MISC ChangeLog 40004 RMD160 4cc92217cabef841b7157288fafe7b709ef088ff SHA1 f388b4e9bbf7941c031544e5be047d09268516b9 SHA256 89defa9e8a121ec08929450e8adb82549aeeab6f1b6776508c80e0555934c15f
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhS49EACgkQj9hvisErhMI6cQCffvJo+NPMmYz4wElcyMZt9mvS
-tMIAnj4xf1SLpYwiW5Ae7UqdNT40ra92
-=e/PM
+iEYEARECAAYFAkhYNKQACgkQj9hvisErhMLoEgCcDL2YBMlmtsTggXwASZ55jOt2
+NAwAnjLSt2L0cefyN3+cttvfFuUgOrmk
+=cjug
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.0.ebuild b/app-emulation/wine/wine-1.0.ebuild
new file mode 100644
index 000000000000..636b2fb49014
--- /dev/null
+++ b/app-emulation/wine/wine-1.0.ebuild
@@ -0,0 +1,148 @@
+# 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-1.0.ebuild,v 1.1 2008/06/17 22:03:08 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
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
+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? (
+		X? (
+			>=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() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+	cd "${S}"
+
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	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"
+}