Version bump.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

3 files changed, 166 insertions, 9 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 64f0e9181f76..6583dd06dcae 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.236 2008/12/21 22:00:16 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.237 2009/01/02 22:57:36 vapier Exp $
+
+*wine-1.1.12 (02 Jan 2009)
+
+  02 Jan 2009; Mike Frysinger <vapier@gentoo.org> +wine-1.1.12.ebuild:
+  Version bump.
 
 *wine-1.1.11 (21 Dec 2008)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 051c6e538309..6e00cfde4a0c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -5,7 +5,6 @@ AUX wine-0.9.51-valgrind.patch 1754 RMD160 d3b76fe90f1039a01972df378edeb3dc97394
 AUX wine-1.0_rc3-openssl.patch 1884 RMD160 6ef2d1ced064a8a6906d89bf2b20e36c37d70011 SHA1 67e2d6a4a393b4f5dd26c9cdd0db12357c962cf0 SHA256 aba9becc2e1e03a2a0284020f2e3f37396d1aff197ad1b665c50c0a26369802b
 AUX wine-1.1.4-install-fix.patch 959 RMD160 b0b642ae38ac95d12af066e8bf466e2a604bbaac SHA1 693dcccf489a93d97c0a01f355aa1881b8e9e9e7 SHA256 5fc22bfa7f06b3f8e7a28fdd65a5209a7a417dfb77b76c2f5318e09d0c683e89
 AUX wine-gentoo-no-ssp.patch 532 RMD160 fd5de0dd965ec58aa53f0ec1fb74ce7cd498a24e SHA1 6fc776bd96438c65a44a03c8adb3fedb0aaa70bf SHA256 6408ae3ed9bacc895677a5b2302bc27afc549ea99f54a9ab4594afb34c629e9e
-DIST wine-0.9.52.tar.bz2 12966473 RMD160 686b2b5f4c7aff2167a6710b1b392bc282c3768a SHA1 2b7e7cf92691139245ca5d7a026db55d92107355 SHA256 de3fabb72b69b088ff5c8f769e9478bdc07ff3a247428c660e12ac5cae3b6026
 DIST wine-0.9.53.tar.bz2 13064017 RMD160 19f0596d987b1b7da8b33c98e84c6484ad6914ae SHA1 be61c0bead88e85b178c29d7026f54bf72a6540a SHA256 06317d78b7db39458656b6acc6b265ce97f358aefd7ded679263f397a89f1200
 DIST wine-0.9.54.tar.bz2 13106716 RMD160 5208470586169ad2e86745506a79347002871155 SHA1 ac63ae822857edb0a87202f40d14b0614bede5e7 SHA256 ce877d0fcce366dc22faa33ddc57024ca2e1af90564d044d6eb97c4e54d2988f
 DIST wine-0.9.55.tar.bz2 13103916 RMD160 8d2eb96ba6d0e753836d7884f7378007dfc3215c SHA1 fc762a4f78d6092f0c9e60e365948e0eed0476b9 SHA256 8da8e13f7e3d6d7c50844e9dd862f8e6dea99c38f11f3fb6b6682f7726695ee3
@@ -26,6 +25,7 @@ DIST wine-1.1.0.tar.bz2 14016982 RMD160 688feb6967fb27906372d80dbdfc5882344ad0e1
 DIST wine-1.1.1.tar.bz2 14114338 RMD160 8d4f41617ccc6de17528e634d2b96e5478f7dea3 SHA1 e9da2b63b9d29c3ddd4ac0c02353579d4ee3b12c SHA256 9f6e66ef5139d9b6850ec6dccb1200441a82b17e73dc9c62e53cc417e4670cd7
 DIST wine-1.1.10.tar.bz2 14734081 RMD160 a03ebd900622a95a3232abf1827664bbcd2861d0 SHA1 21712c3c6195779304cd72f5175ea1528b2a26a0 SHA256 2263e1a5fb91f2da5fdbd2eae23eaa7ecac0ca8f960005db05e2f4ca043b5269
 DIST wine-1.1.11.tar.bz2 14801555 RMD160 21cad81c4cb80c1f6251a91e1abc1121b4996d9d SHA1 6ec4fa4feb06048547cc31f1fc3ae483d1143cfa SHA256 335bf791e250364dab2c82b0d7c5759c557ea4071e4d399db79e9eec5179cb41
+DIST wine-1.1.12.tar.bz2 14794095 RMD160 7591294784ecffb92d67b4734712edcfd87c1f2a SHA1 ab93dc886d38a67fcb01223de746cf35ce7fafd5 SHA256 3c43fd3b4a4bb776710052daec5ef239f90c3f74e254fc62fc665adeeb2dc89d
 DIST wine-1.1.2.tar.bz2 14077780 RMD160 6d7a55809f38bab8401c2009b7d5170975038754 SHA1 664df57d33fc831b7e07a9a3c1f58df6337a9db3 SHA256 1ef9a07afe9057ff467e80e7cd1bccaf0f5d86618ed5094b85af4aeb6a3323b4
 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
@@ -35,7 +35,7 @@ DIST wine-1.1.7.tar.bz2 14623875 RMD160 77f4552f22850ee50602f095c777cd8f679cd231
 DIST wine-1.1.8.tar.bz2 14665390 RMD160 13501a94f3eeeb8e75be25e4dc5c178414d473c3 SHA1 a01bea15352e4c9026109f8ba0cfe66e7167c3d6 SHA256 dbadd980d3ab1d3f188c5972c980312324aedf5681494732a45c0459b17d0c1e
 DIST wine-1.1.9.tar.bz2 14731804 RMD160 3a366c6b5c8f07d61d67b278000bbe0131fa7d99 SHA1 a9d5938b76198d244f0950e843dd4347661f4e74 SHA256 fed77069751d9a0d026b4f927672237cbd283971e08062932831cb800b3d1eca
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
-EBUILD wine-0.9.52.ebuild 3524 RMD160 33faa4b9eaa0b905fc0472a3c023893865fb18d9 SHA1 1dfcaa0d2358fe17a6aca48b74bb98c27a7e82ad SHA256 4986406e5c3480841773ba1630e7b23e71842ea16dd1c0c9a28ff024145a78c1
+DIST wine_gecko-0.9.0.cab 7806669 RMD160 6cd55a76dea2fa5b50adf98423d0e38a207fde92 SHA1 5cf410ff7fdd3f9d625f481f9d409968728d3d09 SHA256 8ed1aec2b9255cd1baaaf8933b7bdbc1ea20f1f1513797144ec5c9b9482d3d74
 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
@@ -54,8 +54,9 @@ EBUILD wine-1.0_rc4.ebuild 3773 RMD160 b885c4acf94b0e2cff5f2967fe2adec195b3ef18
 EBUILD wine-1.0_rc5.ebuild 3773 RMD160 5c4872ff9dfb66b22c7099709d41be31713d4fd6 SHA1 bbeb35adf93f0c5aeed425102c41deb52d1deb90 SHA256 35dac08a3a4c244c6c47837353c6b5f0dd068d4f65043b2bf2a3e41f84a4eec1
 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.10.ebuild 3806 RMD160 94e099193e2090c6b46cc9675482d79a70094d24 SHA1 a9c1b487f8754debaa22c470a0e96ded0249a620 SHA256 273c9fcfed650f310e6971225fba6b88479c2e35e975e658387a517266aaafed
+EBUILD wine-1.1.10.ebuild 3804 RMD160 ee577d39198c00427121c733629fc88d6d65486e SHA1 b476d4ddefbb11ffef9e63dd18496809308b359c SHA256 053dc83a2e4955b57e72ce55e070bcce6c331184f05458332c78a8d3de493596
 EBUILD wine-1.1.11.ebuild 3806 RMD160 e9750b284dd7d31a1c56dcc128de981945ec65dc SHA1 0932c39de0a1e8b28ed80c05da41d3955fbde032 SHA256 5c022ecb0bc380a0a4a075f4921fe16179271e477470e3b5e0be9e4600ae75f0
+EBUILD wine-1.1.12.ebuild 3821 RMD160 186e9be0cd68f8f27f1c33148689da066ad12ff1 SHA1 09ddbf648de8d51f6f97b128d841e773eb256291 SHA256 c53cf987178e8fb5c46b876797ad73fd41654f394f889b4b401948cdc10324d8
 EBUILD wine-1.1.2.ebuild 3770 RMD160 267dd53dd9dad996e031ead7ed4dee3b8425003b SHA1 2396c3cbe53c1ee1d53f3ed2f960c2210f260207 SHA256 d3d12d800798fb4efa595f318ab96fbbbb65df221aefa31501949d42797d03a4
 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
@@ -65,12 +66,12 @@ EBUILD wine-1.1.7.ebuild 3803 RMD160 3458f03183f516a3d739a8e7fef6af12a9920aa2 SH
 EBUILD wine-1.1.8.ebuild 3803 RMD160 3b5b162c0e508f11c4d049f0a1c00d53d3e2d0b3 SHA1 6b75f3159e53f78968a3cb540a646068b51bfb67 SHA256 db3c86e95438438f2893a3a74166dc279f8d0c0d7993bedccbc4066276d67e53
 EBUILD wine-1.1.9.ebuild 3803 RMD160 68fbbb1dc13b572772de20aeb93c2fa640669a8b SHA1 9686113d28a1f432efb355a8c8d370878c809aa7 SHA256 323f69fc0649ea25bd01470b88b08daeb8d50b756f6324cdeb1e2bcdae757839
 EBUILD wine-9999.ebuild 3721 RMD160 57824e46ba6ac5a11c9698c8957a5bc0d1211546 SHA1 ece114f6e5ee37a45bac61521da9b0c5349d077e SHA256 3533ffe5bc2b497ede11cb97623d97682184a53e3b229317be109c3cf5b53b14
-MISC ChangeLog 42033 RMD160 ad75b06f16a401837f54474990b1104a16ee05db SHA1 a6b05bdfc3f5ed958da2effa4a92b263a5d46c8a SHA256 b6d45026aaf27fef5fc3dec12ae800716fefa131829f5b86b412fcc7add6cadd
+MISC ChangeLog 42149 RMD160 362b6bdd9c95ae6c067a4bbca9ba40fe03263dcd SHA1 7df1d4332fe1e80069bc6dc201d901d303c819ad SHA256 62a9eec1e63ab2bbf488e83a3fded3f845a0f8dcfbe2ee8e0fe86fbcc123e047
 MISC metadata.xml 1039 RMD160 5b2f005613a1b24fe76bff637e18098845fb2530 SHA1 808a44e9258b5a9285e72f107d42823a291eec01 SHA256 b10ecc234f06c8f2e1d7e496f678e014a3122852a2901eb036b64c4a672fb103
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklT9+AACgkQn/5bYzqsSmHXogCgitXuGWyFJL6TZOGLvzBWQh/8
-8scAoLUNpO7tnjRYmKXGWN6JLS3a6YNf
-=GQjs
+iEYEARECAAYFAklem+YACgkQn/5bYzqsSmHYfQCdH9sYfU+s0/vEpncWTFu7Or46
+V5sAoK2DvMoT6tW16x+gdXP5tL5VT3fu
+=ogvo
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild
new file mode 100644
index 000000000000..cb035da9b813
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.12.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.1 2009/01/02 22:57:36 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
+
+GV="0.9.0"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="alsa cups dbus esd +gecko gnutls 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 )
+	gnutls? ( net-libs/gnutls )
+	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 gnutls) \
+		$(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-${GV}.cab || die
+	fi
+}
+
+pkg_postinst() {
+	elog "~/.wine/config is now deprecated.  For configuration either use"
+	elog "winecfg or regedit HKCU\\Software\\Wine"
+}