Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

3 files changed, 162 insertions, 7 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 6201fe6b5aea..c208c3ed4938 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.228 2008/09/19 18:11:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.229 2008/10/10 18:34:07 vapier Exp $
+
+*wine-1.1.6 (10 Oct 2008)
+
+  10 Oct 2008; Mike Frysinger <vapier@gentoo.org> +wine-1.1.6.ebuild:
+  Version bump.
 
 *wine-1.1.5 (19 Sep 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index fad539799f52..cd769c355a19 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -29,6 +29,7 @@ DIST wine-1.1.2.tar.bz2 14077780 RMD160 6d7a55809f38bab8401c2009b7d5170975038754
 DIST wine-1.1.3.tar.bz2 14305946 RMD160 890d6eac933ca590856121576a837e057a6e26a5 SHA1 c380d53a5f6a95c4e27dbf4f473facb2d349c522 SHA256 d64763829b38f4c8804b809a3130d1a525d062a33802e46dff33f60f159ac71f
 DIST wine-1.1.4.tar.bz2 14362995 RMD160 e5c3b0037341dab5b234b4ad1a54a64bb659fd56 SHA1 4d8e1b43b0638ab0796abb37d678e1f1199d4561 SHA256 745ae9142dbd11e430410200e09128e3ffe114faade8f97be83fced8e0327230
 DIST wine-1.1.5.tar.bz2 14467703 RMD160 b59d8a1d7b2e91c685a1501793f7373c53276175 SHA1 53a9ba0b463bcb492eeccca10d96057ee0fb13fa SHA256 759208a35cb243ab25338d42facf73e21523b1afac074ba4605a66099e454493
+DIST wine-1.1.6.tar.bz2 14544064 RMD160 57f57de84e815ed3db4e623d393e80572a4696eb SHA1 431187af5496071d51ebada4fce0fa657cd09cba SHA256 5c14e13dd166a22b3d1e3af0834265d9a5c0e3fa63ed35da6e67861b29a7345e
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 EBUILD wine-0.9.50.ebuild 3303 RMD160 9a6a015afd9d31cbd9a15afca5ef8624996a7683 SHA1 04a9aa49c91c87277708ec4ab95e778f54e58c6d SHA256 7cb035080000ab7f4ed73ce02344968c93e063a21b567186e0cab79434b413a8
 EBUILD wine-0.9.51.ebuild 3353 RMD160 ee68156f4fab9890914597d4ebe437b283a30d57 SHA1 c6deb9bd3a20d5879796f68723a64a87ce3def00 SHA256 18a94221187cebdbac0865623ad651df824f06791d71e0088452548c73293a3f
@@ -51,16 +52,17 @@ EBUILD wine-1.0_rc5.ebuild 3773 RMD160 5c4872ff9dfb66b22c7099709d41be31713d4fd6
 EBUILD wine-1.1.0.ebuild 3770 RMD160 1ce5979b11e83a916b10cdbda0728dbcb57c550f SHA1 18271a7e9ef598f92ce51c111c5353e604db8582 SHA256 abdaeec681e4f571ec7070121b6fd5cef506b6667d3c74ed3462988b10405a4e
 EBUILD wine-1.1.1.ebuild 3770 RMD160 44cb7edbc28fcfead5f7f1358dd693f5a5ef1cce SHA1 52920bd2bff320e3071920e5648ff2bb085da4a2 SHA256 28c6ea379d3b1df064ca6bcb05ef289a2c9b4db75cb39cae754d5d9e7f2ebaee
 EBUILD wine-1.1.2.ebuild 3770 RMD160 267dd53dd9dad996e031ead7ed4dee3b8425003b SHA1 2396c3cbe53c1ee1d53f3ed2f960c2210f260207 SHA256 d3d12d800798fb4efa595f318ab96fbbbb65df221aefa31501949d42797d03a4
-EBUILD wine-1.1.3.ebuild 3773 RMD160 24749f74b756d8c6ea11b1f9b5949f573814a466 SHA1 e28e3f3c739d1217230fd8509f2436f058352c9a SHA256 a0fb8641774d51b9d43ad6cd8d0838bbd9e5d9344ad2d34a15a0237c9962eab3
-EBUILD wine-1.1.4.ebuild 3796 RMD160 6ae21ae93bb96121fcb10e4da2f9e8c7af84b885 SHA1 d97efcded98f24af370b73114b25fa685a842d79 SHA256 c71a74d5fab68980bc83f2b11c58a9b41f2be8c99188a5c9dda876858b92a44e
+EBUILD wine-1.1.3.ebuild 3771 RMD160 405748e8500186063a36a73543eb42469cb22c3b SHA1 a2e53e15212156cfea9dfcfd4967b4dcf38b44b5 SHA256 10eeccb5e3538ed51f5474794ccf26a3bb0796f98ece280f5c1f4d358bc0e6dd
+EBUILD wine-1.1.4.ebuild 3797 RMD160 422178d66cfd5cd8aa2afc1646c8301c886158c0 SHA1 e42cdbbfe01494cdac912caab3a9c93e7ab1a15c SHA256 eac167e43c9cfff73621cdbb44fbd44140458a034c4c6ccce0c7a40a8c58a7a1
 EBUILD wine-1.1.5.ebuild 3746 RMD160 6171043c1a4c05dfce68ab1e890b558fe75f9159 SHA1 849ad7f4b4670ca9efc6dad5b545d83db805fcef SHA256 9cb061f438a414f8d59d79ba43ad9bf210b26c29f4f6b431354284e785d66c1a
+EBUILD wine-1.1.6.ebuild 3746 RMD160 e1f21639cc5a9be58bfbbe40d0b0068990d2ff71 SHA1 93acd4b39a451ec8a1c99a9c7c3b5522c6da2c0b SHA256 6dc1367ebf90cd0044085adbc749a6549a588280d2ad41304926194f61225c66
 EBUILD wine-9999.ebuild 3721 RMD160 57824e46ba6ac5a11c9698c8957a5bc0d1211546 SHA1 ece114f6e5ee37a45bac61521da9b0c5349d077e SHA256 3533ffe5bc2b497ede11cb97623d97682184a53e3b229317be109c3cf5b53b14
-MISC ChangeLog 41102 RMD160 6a842ce54295c3324c05d4e0b39162f1eeaa3e05 SHA1 abe9157ca27303e0bae4c413d5358c5d8176db24 SHA256 7fa0e0ec769a88466b6a6fe4fc095400935cf8a00ea1bb380798bab1786cb22b
+MISC ChangeLog 41216 RMD160 82d2a836b671296b07a4e7d1179e0deded4f6902 SHA1 a77d33e9e81cb35e4e43e021f489c8ae167df998 SHA256 8bc3c01605ae82f627a85809c76d332e96c2925303f0b11076f3328e2af00acd
 MISC metadata.xml 1039 RMD160 5b2f005613a1b24fe76bff637e18098845fb2530 SHA1 808a44e9258b5a9285e72f107d42823a291eec01 SHA256 b10ecc234f06c8f2e1d7e496f678e014a3122852a2901eb036b64c4a672fb103
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjT63IACgkQ67wieSYcaxdnjQCgsqpDkAm2kI/UWXISuSuG9PrC
-x2AAoOMfyowr7v1Yq6hCrIyOndEgQB+o
-=xMey
+iEYEARECAAYFAkjvoCUACgkQ67wieSYcaxeZsACgtccB7EYMopMora5z0keRue6X
+5aoAniicgMhg5JFwNkcMiGAVaXYQxVdd
+=fj+t
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.6.ebuild b/app-emulation/wine/wine-1.1.6.ebuild
new file mode 100644
index 000000000000..c48a9d9595f7
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.6.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.6.ebuild,v 1.1 2008/10/10 18:34:07 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 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"
+}