summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-09-21 21:31:57 +0000
committerMike Frysinger <vapier@gentoo.org>2010-09-21 21:31:57 +0000
commit7ded7fb69821405f6102a4a91f27df481cc948ad (patch)
treec2fc80c501c989e5c27a9179ed63a657585f523b /app-emulation/wine
parentfix indentation to match codebase (diff)
downloadgentoo-2-7ded7fb69821405f6102a4a91f27df481cc948ad.tar.gz
gentoo-2-7ded7fb69821405f6102a4a91f27df481cc948ad.tar.bz2
gentoo-2-7ded7fb69821405f6102a4a91f27df481cc948ad.zip
Update b Y Liu for gecko support #336310 by ScytheMan.
Diffstat (limited to 'app-emulation/wine')
-rw-r--r--app-emulation/wine/ChangeLog6
-rw-r--r--app-emulation/wine/wine-1.3.2.ebuild12
-rw-r--r--app-emulation/wine/wine-9999.ebuild12
3 files changed, 21 insertions, 9 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index fe5a03405f95..39abad736e33 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/wine
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.325 2010/09/07 17:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.326 2010/09/21 21:31:57 vapier Exp $
+
+ 21 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.2.ebuild,
+ wine-9999.ebuild:
+ Update b Y Liu for gecko support #336310 by ScytheMan.
07 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.0.ebuild,
wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-9999.ebuild:
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 29c0b96142ba..1e501c301b49 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.3 2010/09/21 21:31:57 vapier Exp $
EAPI="2"
@@ -21,11 +21,14 @@ else
fi
pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; }
-GV="1.0.0-x86"
+GV="1.1.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 )
+ gecko? (
+ mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
+ mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.cab
+ )
pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
LICENSE="LGPL-2.1"
@@ -193,7 +196,8 @@ src_install() {
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || 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
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index e08ee80ce65a..74eb228111bf 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.59 2010/09/07 17:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.60 2010/09/21 21:31:57 vapier Exp $
EAPI="2"
@@ -21,11 +21,14 @@ else
fi
pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; }
-GV="1.0.0-x86"
+GV="1.1.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 )
+ gecko? (
+ mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
+ mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.cab
+ )
pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
LICENSE="LGPL-2.1"
@@ -193,7 +196,8 @@ src_install() {
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || 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