Version bump.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26.1 x86_64

3 files changed, 160 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0de10be69e44..32081f09f380 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.221 2008/07/28 20:46:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.222 2008/08/16 06:07:05 vapier Exp $
+
+*wine-1.1.1 (16 Aug 2008)
+
+  16 Aug 2008; Mike Frysinger <vapier@gentoo.org> +wine-1.1.1.ebuild:
+  Version bump.
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index fae8fc90a30a..049326ab6639 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -49,6 +49,7 @@ DIST wine-1.0-rc4.tar.bz2 13983809 RMD160 c6e26e6299e2068e928937bbde820c62ab7683
 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-1.1.0.tar.bz2 14016982 RMD160 688feb6967fb27906372d80dbdfc5882344ad0e1 SHA1 171d6541521d4579c7eaa1b7d751d674c64fdecb SHA256 e079cec1eb8bbcfb176674a0ab2454bb2b2d1b16e518a02a66eaaa6c4e1a3607
+DIST wine-1.1.1.tar.bz2 14114338 RMD160 8d4f41617ccc6de17528e634d2b96e5478f7dea3 SHA1 e9da2b63b9d29c3ddd4ac0c02353579d4ee3b12c SHA256 9f6e66ef5139d9b6850ec6dccb1200441a82b17e73dc9c62e53cc417e4670cd7
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 EBUILD wine-0.9.40.ebuild 3293 RMD160 843021a014a7cd2e6e1eb15aeb1b60ca1a835993 SHA1 818bea52e2d5d8550a571f46fc52a565cb52bb95 SHA256 d7ac7c56e87ea80fe1848842cd716c3242a10c9ff3843bb777d93c05fc756f3d
 EBUILD wine-0.9.41.ebuild 3293 RMD160 89e5be8adf5adccf7ddd8d80ff434c989c057579 SHA1 6e13664240ae0b1f4a28ff6db4d1e197def73be2 SHA256 119e0e15c1b8682dac82d1c040010bb4d6f1d7759b4ab5f181b70d84c0b6d1f4
@@ -79,13 +80,14 @@ EBUILD wine-1.0_rc3.ebuild 3822 RMD160 de6b63deb777f6f62b3e4f3a8a04e7b09af962a1
 EBUILD wine-1.0_rc4.ebuild 3773 RMD160 b885c4acf94b0e2cff5f2967fe2adec195b3ef18 SHA1 7fbf5a53c06929c9808e31648a0f1ed4bb1c2ad8 SHA256 134f4091d05324b8d804d24c31d07f5b9494b3ef24e250b08f3aa2eb557a5f67
 EBUILD wine-1.0_rc5.ebuild 3773 RMD160 5c4872ff9dfb66b22c7099709d41be31713d4fd6 SHA1 bbeb35adf93f0c5aeed425102c41deb52d1deb90 SHA256 35dac08a3a4c244c6c47837353c6b5f0dd068d4f65043b2bf2a3e41f84a4eec1
 EBUILD wine-1.1.0.ebuild 3771 RMD160 fff04e33c76f5afb81a3ab7fbd2ee0219b292c94 SHA1 17a44563701599393efc5e4de369a8626deddb35 SHA256 9d480bc4d33f70b09e5a77604ed54c70d62ba7f303d737b7e82097a71246f073
+EBUILD wine-1.1.1.ebuild 3773 RMD160 5a38f025df9d6cf23710d3b0a7c0826e1931b475 SHA1 d99cb9bfb6efa7dd7e2468a837a1e1ef18ca3ba4 SHA256 a1a5fe53d7902cb8efd2c09428987a1877ab20ee616ae4d9499e59a76491ce64
 EBUILD wine-9999.ebuild 3721 RMD160 57824e46ba6ac5a11c9698c8957a5bc0d1211546 SHA1 ece114f6e5ee37a45bac61521da9b0c5349d077e SHA256 3533ffe5bc2b497ede11cb97623d97682184a53e3b229317be109c3cf5b53b14
-MISC ChangeLog 40231 RMD160 e0f25b879f4cf026f39ca3ef82e48104b6a8b69d SHA1 cba544a88d112187320d16377d45bf9c0a37ac6e SHA256 0f394c0ada58fe0fdf72293057b918e82a879b7750e8debb8382842db15319ce
+MISC ChangeLog 40345 RMD160 ad53961083193bd6bf2151e16120bc6b90092b7f SHA1 5482f8513a3afef41f9fb7b5a5404427bb8586f4 SHA256 408a2ba141be91296dd6ca1517da43bddc63e4a63ca79f538ca5dc8b8072c7f1
 MISC metadata.xml 886 RMD160 b95fced5f442faad3f40d49ced406da725f208e1 SHA1 3648fc60a651e2456aaa8bf6c3a8e1fd04210113 SHA256 d0cd1b3c6c538b0c5ade5f820e1982373d6f3376ff698fcff234bce6202877eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkimZbQACgkQ67wieSYcaxcgqgCgr3KTIPb8aDog7bRzAjz+IKLm
-EQYAoICdCJn65WlB2CG0Ws4v6RfZy49l
-=3M65
+iEYEARECAAYFAkimbpAACgkQ67wieSYcaxc3zACfSKQZdPTWxY/wM0wciZPfcpwC
+GxkAn00ladVB+EAXP9mAWS1ej9LeW5Tt
+=YGH0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.1.ebuild b/app-emulation/wine/wine-1.1.1.ebuild
new file mode 100644
index 000000000000..dc90868c6245
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.1.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.1.1.ebuild,v 1.1 2008/08/16 06:07:05 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"
+}