summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-03-04 15:44:18 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-03-04 15:44:18 +0000
commit27939cbb5d3e83ed7b28389f26751f3267d6f738 (patch)
treed215b7f1389b2c276776b666835b3268f613e978
parentStable for HPPA (bug #452584). (diff)
downloadgentoo-2-27939cbb5d3e83ed7b28389f26751f3267d6f738.tar.gz
gentoo-2-27939cbb5d3e83ed7b28389f26751f3267d6f738.tar.bz2
gentoo-2-27939cbb5d3e83ed7b28389f26751f3267d6f738.zip
Require >=emul-linux-x86-baselibs-20130224 to prevent build failure (bug #460236, thanks to Ortwin Glueck).
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
-rw-r--r--app-emulation/wine/ChangeLog7
-rw-r--r--app-emulation/wine/wine-1.5.25.ebuild4
-rw-r--r--app-emulation/wine/wine-9999.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 6e4beff3742a..555702a45469 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/wine
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.455 2013/03/03 08:15:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.456 2013/03/04 15:44:18 tetromino Exp $
+
+ 04 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.25.ebuild,
+ wine-9999.ebuild:
+ Require >=emul-linux-x86-baselibs-20130224 to prevent build failure (bug
+ #460236, thanks to Ortwin Glueck).
*wine-1.5.25 (03 Mar 2013)
diff --git a/app-emulation/wine/wine-1.5.25.ebuild b/app-emulation/wine/wine-1.5.25.ebuild
index abf87d736c3b..6fad5f81dd19 100644
--- a/app-emulation/wine/wine-1.5.25.ebuild
+++ b/app-emulation/wine/wine-1.5.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.25.ebuild,v 1.1 2013/03/03 08:15:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.25.ebuild,v 1.2 2013/03/04 15:44:18 tetromino Exp $
EAPI="5"
@@ -108,7 +108,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
- app-emulation/emul-linux-x86-baselibs[development]
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development]
>=sys-kernel/linux-headers-2.6
)
)"
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index b5d28168d151..3ffa33cf5694 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.136 2013/03/03 08:15:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.137 2013/03/04 15:44:18 tetromino Exp $
EAPI="5"
@@ -108,7 +108,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
- app-emulation/emul-linux-x86-baselibs[development]
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development]
>=sys-kernel/linux-headers-2.6
)
)"