Version bump.
authorMike Frysinger <vapier@gentoo.org>
Fri, 25 Jun 2010 21:04:17 +0000 (21:04 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 25 Jun 2010 21:04:17 +0000 (21:04 +0000)
app-emulation/wine/ChangeLog
app-emulation/wine/wine-1.2_rc4.ebuild [new file with mode: 0644]
app-emulation/wine/wine-1.2_rc5.ebuild [new file with mode: 0644]

index 3b2c7148383aad1eb4eeaa4a42a557eade41dab4..f2dd19c05d0ee7874fe607036e4928c24c495fdb 100644 (file)
@@ -1,6 +1,13 @@
 # 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.313 2010/06/22 03:05:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.314 2010/06/25 21:04:17 vapier Exp $
+
+*wine-1.2_rc5 (25 Jun 2010)
+*wine-1.2_rc4 (25 Jun 2010)
+
+  25 Jun 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.2_rc4.ebuild,
+  +wine-1.2_rc5.ebuild:
+  Version bump.
 
   22 Jun 2010; Mike Frysinger <vapier@gentoo.org> wine-1.2_rc3.ebuild:
   Update pulseaudio patch #324817 by Juergen Rose.
diff --git a/app-emulation/wine/wine-1.2_rc4.ebuild b/app-emulation/wine/wine-1.2_rc4.ebuild
new file mode 100644 (file)
index 0000000..446d3fc
--- /dev/null
@@ -0,0 +1,178 @@
+# 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.2_rc4.ebuild,v 1.1 2010/06/25 21:04:17 vapier Exp $
+
+EAPI="2"
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit eutils flag-o-matic multilib autotools
+
+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
+
+pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.37-winecfg}.patch ; }
+GV="1.0.0-x86"
+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 )
+       pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+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 )
+       jack? ( media-sound/jack-audio-connection-kit )
+       openal? ( media-libs/openal )
+       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
+       )
+       xinerama? ( x11-libs/libXinerama )
+       alsa? ( media-libs/alsa-lib )
+       esd? ( media-sound/esound )
+       nas? ( media-libs/nas )
+       cups? ( net-print/cups )
+       opengl? ( virtual/opengl )
+       pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} )
+       gsm? ( media-sound/gsm )
+       jpeg? ( media-libs/jpeg )
+       ldap? ( net-nds/openldap )
+       lcms? ( =media-libs/lcms-1* )
+       mp3? ( >=media-sound/mpg123-1.5.0 )
+       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? ( 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
+               )
+               openal? ( app-emulation/emul-linux-x86-sdl )
+               app-emulation/emul-linux-x86-baselibs
+               >=sys-kernel/linux-headers-2.6
+       ) )
+       xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+       X? (
+               x11-proto/inputproto
+               x11-proto/xextproto
+               x11-proto/xf86vidmodeproto
+       )
+       xinerama? ( x11-proto/xineramaproto )
+       sys-devel/bison
+       sys-devel/flex"
+
+src_unpack() {
+       if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
+               use win64 && die "you need gcc-4.4+ to build 64bit wine"
+       fi
+
+       if [[ ${PV} == "9999" ]] ; then
+               git_src_unpack
+       else
+               unpack ${MY_P}.tar.bz2
+       fi
+}
+
+src_prepare() {
+       if use pulseaudio ; then
+               EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
+               eautoreconf
+       fi
+       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
+}
+
+src_configure() {
+       export LDCONFIG=/bin/true
+
+       use custom-cflags || strip-flags
+       use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+       econf \
+               --sysconfdir=/etc/wine \
+               $(use_with alsa) \
+               $(use_with capi) \
+               $(use_with lcms cms) \
+               $(use_with cups) \
+               $(use_with ncurses curses) \
+               $(use_with esd) \
+               $(use_with fontconfig) \
+               $(use_with gnutls) \
+               $(use_with gphoto2 gphoto) \
+               $(use_with gsm) \
+               $(! use dbus && echo --without-hal || use_with hal) \
+               $(use_with jack) \
+               $(use_with jpeg) \
+               $(use_with ldap) \
+               $(use_with mp3 mpg123) \
+               $(use_with nas) \
+               $(use_with openal) \
+               $(use_with opengl) \
+               $(use_with ssl openssl) \
+               $(use_with oss) \
+               $(use_with png) \
+               $(use_with threads pthread) \
+               $(use pulse && use_with pulseaudio pulse) \
+               $(use_with scanner sane) \
+               $(use_enable test tests) \
+               $(use_with truetype freetype) \
+               $(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
+       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
+}
diff --git a/app-emulation/wine/wine-1.2_rc5.ebuild b/app-emulation/wine/wine-1.2_rc5.ebuild
new file mode 100644 (file)
index 0000000..92cdf1a
--- /dev/null
@@ -0,0 +1,178 @@
+# 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.2_rc5.ebuild,v 1.1 2010/06/25 21:04:17 vapier Exp $
+
+EAPI="2"
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit eutils flag-o-matic multilib autotools
+
+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
+
+pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.37-winecfg}.patch ; }
+GV="1.0.0-x86"
+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 )
+       pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+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 )
+       jack? ( media-sound/jack-audio-connection-kit )
+       openal? ( media-libs/openal )
+       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
+       )
+       xinerama? ( x11-libs/libXinerama )
+       alsa? ( media-libs/alsa-lib )
+       esd? ( media-sound/esound )
+       nas? ( media-libs/nas )
+       cups? ( net-print/cups )
+       opengl? ( virtual/opengl )
+       pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} )
+       gsm? ( media-sound/gsm )
+       jpeg? ( media-libs/jpeg )
+       ldap? ( net-nds/openldap )
+       lcms? ( =media-libs/lcms-1* )
+       mp3? ( >=media-sound/mpg123-1.5.0 )
+       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? ( 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
+               )
+               openal? ( app-emulation/emul-linux-x86-sdl )
+               app-emulation/emul-linux-x86-baselibs
+               >=sys-kernel/linux-headers-2.6
+       ) )
+       xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+       X? (
+               x11-proto/inputproto
+               x11-proto/xextproto
+               x11-proto/xf86vidmodeproto
+       )
+       xinerama? ( x11-proto/xineramaproto )
+       sys-devel/bison
+       sys-devel/flex"
+
+src_unpack() {
+       if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
+               use win64 && die "you need gcc-4.4+ to build 64bit wine"
+       fi
+
+       if [[ ${PV} == "9999" ]] ; then
+               git_src_unpack
+       else
+               unpack ${MY_P}.tar.bz2
+       fi
+}
+
+src_prepare() {
+       if use pulseaudio ; then
+               EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
+               eautoreconf
+       fi
+       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
+}
+
+src_configure() {
+       export LDCONFIG=/bin/true
+
+       use custom-cflags || strip-flags
+       use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+       econf \
+               --sysconfdir=/etc/wine \
+               $(use_with alsa) \
+               $(use_with capi) \
+               $(use_with lcms cms) \
+               $(use_with cups) \
+               $(use_with ncurses curses) \
+               $(use_with esd) \
+               $(use_with fontconfig) \
+               $(use_with gnutls) \
+               $(use_with gphoto2 gphoto) \
+               $(use_with gsm) \
+               $(! use dbus && echo --without-hal || use_with hal) \
+               $(use_with jack) \
+               $(use_with jpeg) \
+               $(use_with ldap) \
+               $(use_with mp3 mpg123) \
+               $(use_with nas) \
+               $(use_with openal) \
+               $(use_with opengl) \
+               $(use_with ssl openssl) \
+               $(use_with oss) \
+               $(use_with png) \
+               $(use_with threads pthread) \
+               $(use pulse && use_with pulseaudio pulse) \
+               $(use_with scanner sane) \
+               $(use_enable test tests) \
+               $(use_with truetype freetype) \
+               $(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
+       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
+}