Version bump #382869 by Emulatorman.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 219 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index ee45a7f365f4..e3e59dbbb0e9 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.382 2011/09/15 03:17:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.383 2011/09/15 03:48:49 vapier Exp $
+
+*wine-1.3.28 (15 Sep 2011)
+
+  15 Sep 2011; Mike Frysinger <vapier@gentoo.org> +wine-1.3.28.ebuild:
+  Version bump #382869 by Emulatorman.
 
   15 Sep 2011; Mike Frysinger <vapier@gentoo.org> wine-1.2.ebuild,
   wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index a01243c9b93b..644c9234376c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -31,6 +31,7 @@ DIST wine-1.3.24.tar.bz2 19525444 RMD160 6567c8cbc646f5f447375046c3f25b4036689a5
 DIST wine-1.3.25.tar.bz2 19580506 RMD160 a7fde0bf819df1bb2025a47f7b39bc01f88887a1 SHA1 df5f16a2497b370761f2da5be257eae7407c8d6a SHA256 f5525a966efd2f973c9a0fd6391d0d3e5817432e59598fe47c494b240d7e1caa
 DIST wine-1.3.26.tar.bz2 19540784 RMD160 c1d98690ff16a63cea6c04c64444c075ad7ab472 SHA1 a609ebb1f8c0908fb86948edcb1f7f9ccca47e7f SHA256 6cadb2d80c0cd12c44fa26147041a32f61066dd39e748c83dad48af79ecd4e74
 DIST wine-1.3.27.tar.bz2 19566507 RMD160 753dd245f2a77f9923795504d44bb96a5f294649 SHA1 5323bdb9eda5c53650f4d16dff16e11e3e53dfa3 SHA256 6163a4734f47453cf9cee996efcf9d55ee49bb4a055f5b28a3907e4135edbeed
+DIST wine-1.3.28.tar.bz2 19626794 RMD160 15366a4c1710a130d153127ba6149f7cadef3d7e SHA1 240778556a4103c40bb59a986203a2111ed0350d SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38
 DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f SHA1 b19455987f0a71adf691046898a1ca6b3ed7d155 SHA256 455b6ec2f881f54d89d3e6dd9d04318a9eeb3c40f8c66b53e5bf73fc4765fcce
 DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
 DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc SHA1 52b151855087dce69a8b3405d2ad93b24f96c6fb SHA256 bb2d44c1ae488b972f03e8f97c44fe1608240984075ccf75952edddf1dd2b79e
@@ -82,6 +83,7 @@ EBUILD wine-1.3.24.ebuild 6234 RMD160 e6e2a2bf5af71e0f237280fa5503b500e7689a30 S
 EBUILD wine-1.3.25.ebuild 5644 RMD160 75f8d53aa2f01c437672345d6785b72e7c77cb38 SHA1 1c9f7f50aa3d680db8baab15d7aceac035a0c674 SHA256 98fa2f83b9b1517626ad75abaa3ed994fe9250cc0b74cbd544abd8c18a083288
 EBUILD wine-1.3.26.ebuild 5644 RMD160 4cf4be1f73af7361adee150b6f87a3b16329b20a SHA1 74a84e8006a70551031c1ec532766a799bf130c3 SHA256 dfb541b04fe28e1cbc2e92d190b10531872360f557da69d32f621e93f8657f1a
 EBUILD wine-1.3.27.ebuild 5642 RMD160 54895236f2b2c926dc29754a828ee7336c97ddcc SHA1 6d0da7710485517058baa40bcb62718c3ad8f67d SHA256 909a7c81bb8cb3bd5ebc390a9b9000379d082babeeb07b6e326e4331da6bc819
+EBUILD wine-1.3.28.ebuild 5642 RMD160 32c591433e16da1c366a181519ea89d3ea6f1774 SHA1 04e9bea8f2f24561213172ab7c38b5076c0098f4 SHA256 09bcdaca63c1dfddbcb20ebc6c3dc11974a808dd5596f9cc00abdeeb6454c75d
 EBUILD wine-1.3.3.ebuild 5962 RMD160 453ef2a19f45f011211a449373b772d84c4ed299 SHA1 1931022a83aa52f522746e1c925dccfc2f721bb0 SHA256 b0f1808cce40f79deacb2bb664e3a7412bc4aecb1559316ab96870f6a2fa161a
 EBUILD wine-1.3.4.ebuild 5962 RMD160 4dfaaf78eabd0b82c9097fab80bb734103edd7fb SHA1 ae96732d7574d7df19c59e47060289a0ee1376df SHA256 dcba53c2cfc8c1a81069f259d1bf0e968eacb05aa5a260e514cd6d2144882f45
 EBUILD wine-1.3.5.ebuild 5962 RMD160 288ec5bbc323a7f34f181229f651911bebccbd4e SHA1 d4dc8ef147d852486b12ec900b4b1e14a44dcb80 SHA256 1cef27e3a70ee2ad354e3bea14d2dac39a03f9b7c8b69374637197da3202d2df
@@ -90,12 +92,12 @@ EBUILD wine-1.3.7.ebuild 6063 RMD160 ffa0a8ef04ad5ee757ec1e57c518fcdc32e7afae SH
 EBUILD wine-1.3.8.ebuild 6063 RMD160 3bcef1507f1260c3ed425f544c933b89bf4601ab SHA1 6f72932b6f81e3f2e45989fa8cc515ccf1ff2832 SHA256 23a80078bde521597a1226f2f7e20fe1484ecb7bd3dd83e46003b12f0c682cb1
 EBUILD wine-1.3.9.ebuild 6168 RMD160 1aaa6839f2f8f78dc7267882d181957c61b61b43 SHA1 733bd5e450d5949cb3fa3bfb54c4452ad9dae58c SHA256 5eda9c91788b1e427849942e1c26e80802cd5e9d38619a2a301290e6184c7f91
 EBUILD wine-9999.ebuild 5641 RMD160 596439399dd6f3ba0ed524e7caed7c0d0ea80a20 SHA1 0ba4b0e182ce9e957215a4f2b2088ff174d99523 SHA256 aa3bd842536a64a3e0939c8c388485e10180391e916fcea0d299a60c60f284a2
-MISC ChangeLog 76144 RMD160 18eb247cc2ec8cf16933b7383df1b3ed52e2f412 SHA1 cb055e7acbd979a05ff81a863c5b10d54fb769d1 SHA256 9591fe6e47771c138975d03ca77a14d4386d3af0dc2c3a97d2078291e1cf182e
+MISC ChangeLog 76283 RMD160 87a037023b546340e2dfd0cb595094db14f62eeb SHA1 6da19191a8c5d07392259e60aca79263a6f44d41 SHA256 423880644e071118b47410a0dc18cf6444d4c62b7a2655709475469f138605bf
 MISC metadata.xml 1681 RMD160 9c7ce105ac87de7a09f92cbb6a797f5f60576014 SHA1 80d03dc33ad3e8d1e73e8b02ff8b84f61df40912 SHA256 48a829d453b2910192cbd399a8a0ac6bb2354ec54bd0cdd6a8072d0b215aa85a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5xbmQACgkQaC/OocHi7JZWjQEAkveCBF2WbqmfRgzAVaa3Vzut
-1NIWcbj53o2iX52kvUQA/3I5tPxt/cr83ljTAL3lifGFX2uxCwM+cfswtmvWsMnF
-=Plf1
+iF4EAREIAAYFAk5xdYwACgkQaC/OocHi7JbM5gEAmxDbtx+W74LiIuLp+3f8MAE0
+8eq/JhjIZuNIEBnXA1QA/REujH7W7KhePHGjxYK1QQQwEu6ZnKmvJ9bUt5YHbZZZ
+=teAi
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild
new file mode 100644
index 000000000000..563d2cda31e0
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.28.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.1 2011/09/15 03:48:49 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2 autotools
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	AUTOTOOLS_AUTO_DEPEND="no"
+	inherit autotools
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.3"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
+	)"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hal hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	openal? ( media-libs/openal )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+	opengl? ( virtual/opengl )
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	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 )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch_user #282735
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettextpo) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend || die "depend"
+
+	popd >/dev/null
+}
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all || die
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}" || die
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+		use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
+	fi
+	if ! use perl ; then
+		rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+}
+
+pkg_postinst() {
+	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
+}