Version bump.

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 151 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 3cdf4a3a811b..2b74040d2a43 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.257 2009/03/14 11:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.258 2009/03/27 20:46:52 vapier Exp $
+
+*wine-1.1.18 (27 Mar 2009)
+
+  27 Mar 2009; Mike Frysinger <vapier@gentoo.org> +wine-1.1.18.ebuild:
+  Version bump.
 
 *wine-1.1.17 (14 Mar 2009)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 8448c3a26354..4bbb843ce587 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -33,6 +33,7 @@ DIST wine-1.1.14.tar.bz2 15023413 RMD160 e1eac6c7110c8f40d1ff00ec945977bce822c0f
 DIST wine-1.1.15.tar.bz2 15057931 RMD160 5203e46e498ae064a07d5ebe83fcb5ded3bc422d SHA1 99267058cf14d52b55c360d6e3af337d81695974 SHA256 ef96f6fafc19c2a4411612113b1cff10f318c62f07b9cf66144f98fb9f8e254e
 DIST wine-1.1.16.tar.bz2 15178491 RMD160 449baa620eea114d65a8a65d1f0e88d377b94615 SHA1 02f3363de5a2476b513beca3da2bb42aeeff5218 SHA256 56ce0b741c584501f4a3a78b4569276174b20e0ed8405b2a824b1a66ad8cde50
 DIST wine-1.1.17.tar.bz2 15187387 RMD160 9b7e2da40abbb455973ad850b3eb0c9d028594d8 SHA1 4106dd14a45255d4d27b230bd5c4e9d7070e9e35 SHA256 47962e6fc0d3ad46f33ee437a2c23d3876433ea98fd71efcce2c7f04f5224e79
+DIST wine-1.1.18.tar.bz2 15184906 RMD160 45673ce8e479c030efcba607ddce654f7e24c300 SHA1 81beebbbea39774ca0ef6abddd44685b354fcfd8 SHA256 87e0afbce038d6cfd95d21fe824e97e7e88f5af6007a9d1bbad424160dfffc49
 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
@@ -70,6 +71,7 @@ EBUILD wine-1.1.14.ebuild 3332 RMD160 f2a82ce27723ba48f23ddf75139c4638e0f99341 S
 EBUILD wine-1.1.15.ebuild 3452 RMD160 cff6d1dc44db6e5310eaf9d59e6ee6b03ae5891c SHA1 d2823d526226c3bb6a2f1cc85009ceea4c73ad07 SHA256 fd06b9ebfc815336edc1722abd4f6433dd83947c70ae937e51e81595877047bb
 EBUILD wine-1.1.16.ebuild 3396 RMD160 fa350ad52d823bbb347efdbaef45721e7e7a7543 SHA1 4602bbf3b2bf20878b2a6bb2ff1099766f5765cf SHA256 960102770a01d9d41a3e32d3f5c222cab2aeb4843cbcf7f8f4ba6f85607b49a9
 EBUILD wine-1.1.17.ebuild 3396 RMD160 e749781aa3863b3effc594c94ab3068603145ae3 SHA1 30666c5d9271b42b3fac44ea8d628be13c84e9d1 SHA256 d4d8daf03eeb5f6f1c855ee8e6a53512f775275183ebe4c962dae2460350f2ee
+EBUILD wine-1.1.18.ebuild 3396 RMD160 240b4ff249f3a810c4b749dcdc42aaeab5e13a32 SHA1 14d33a5e55c35d7444d4d4e30782983d44ea8456 SHA256 9021bc7c3396e139bfbb5058b6114f4419aeb1608af3af193b9242385f2f2ae2
 EBUILD wine-1.1.2.ebuild 3773 RMD160 6063e652407012797fe4ced42709f10f3a09017a SHA1 4b2fb9982b7814a3055534fded4cb77416376d1b SHA256 48e202ba68c92a2b89c57f000bf8f2bdce8dd4cd845f654ca996b2b86b7d2fe0
 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
@@ -79,12 +81,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 3331 RMD160 8f83228067f66bc00f35cb1d04b98551b05aee31 SHA1 03c6ae840d7d435a91d98c35723e2aaeb6ef1e35 SHA256 e8a78522c73561c600c0375b399a34ec86df3ff6b67921f914fea1e9db6c9ded
-MISC ChangeLog 44563 RMD160 dfdaf2cf5986139d493a6298ae840bebfb485b1c SHA1 3d46536d60d315b45ea5e4f64bd7c1bc2261766f SHA256 7875058aea27732d5c101bedc6e1e5e2829c48f9f58512b87c95a6a1f919328b
+MISC ChangeLog 44679 RMD160 6240cd30c39c6628f50299e4819f990533c4fa78 SHA1 0ed217ae45d7efb3e3ce6bfb7b1cb5c7085c2ce7 SHA256 d8fe2746bb9e1d8a99ad4bf6f56b9088ef285a5ec596df6555ee62de5581c74b
 MISC metadata.xml 1123 RMD160 168b7d83724ac65a23a10ad8bbe04d4dee180f6f SHA1 f8bb8f4eb1e4dab230f9f8d8b87fe04c6e638334 SHA256 eeee6aabb900286b05e81427597d143fb5fe74cc9b503d58464abd2534eaa569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm7mA4ACgkQn/5bYzqsSmELygCgp0HPzvzQWVwJHa95DC6Hn5BF
-ZQQAnjBqfgUBo/kY94a2+YanXvw8Utwn
-=bDVQ
+iEYEARECAAYFAknNO0IACgkQn/5bYzqsSmF3YgCfQ0J+eOb8B2iAlTVPF7vQiiRr
+/pkAoI7T8rt34PA5DBPqPnEI+/UkGWg4
+=DMRg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
new file mode 100644
index 000000000000..5faa9d4bec4a
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.18.ebuild
@@ -0,0 +1,139 @@
+# 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.18.ebuild,v 1.1 2009/03/27 20:46:52 vapier Exp $
+
+EAPI="2"
+
+inherit multilib eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="0.9.1"
+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"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+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[midi] )
+	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 )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	win64? ( >=sys-devel/gcc-4.4_alpha )
+	amd64? (
+		X? (
+			>=app-emulation/emul-linux-x86-xlibs-2.1
+			>=app-emulation/emul-linux-x86-soundlibs-2.1
+		)
+		app-emulation/emul-linux-x86-baselibs
+		>=sys-kernel/linux-headers-2.6
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+
+	use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+	# XXX: should check out these flags too:
+	#	audioio capi fontconfig freetype gphoto
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with cups) \
+		$(use_with esd) \
+		$(use_with gnutls) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with lcms cms) \
+		$(use_with ldap) \
+		$(use_with nas) \
+		$(use_with ncurses curses) \
+		$(use_with opengl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with scanner sane) \
+		$(use_with ssl openssl) \
+		$(use_enable win64) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		|| die "configure failed"
+
+	emake -j1 depend || die "depend"
+}
+
+src_compile() {
+	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
+}