diff options
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 1584784f0eb8..366698ebf273 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6691 2012/06/18 08:55:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6692 2012/06/18 12:06:38 ultrabug Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 18 Jun 2012; Ultrabug <ultrabug@gentoo.org> package.mask: + Unmask gevent-1.0_beta2 with approval of xarthisius and dev-zero + 18 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: Mask kicad (live ebuild in ~arch). diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 060ffc802977..1d563bd7c6e6 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.405 2012/06/17 22:12:11 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.406 2012/06/18 12:06:38 ultrabug Exp $ + + 18 Jun 2012; Ultrabug <ultrabug@gentoo.org> package.use.mask: + Drop gevent USE mask for www-servers/uwsgi wrt gevent-1.0_beta2 being + unmasked 17 Jun 2012; Davide Pesavento <pesa@gentoo.org> package.use.mask: Restrict c++0x and qpa USE mask to Qt < 4.8.3 only. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 312d824b1332..c1a5cf2a0478 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.363 2012/06/17 22:12:11 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.364 2012/06/18 12:06:38 ultrabug Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -21,10 +21,6 @@ dev-db/firebird client # Requires icc which does not emerge (distfile unavailable) media-libs/opencv ipp -# Tiziano Müller <dev-zero@gentoo.org> (24 May 2012) -# Requires gevent-1 which is still p.masked -www-servers/uwsgi gevent - # Alexandre Rostovtsev <tetromino@gentoo.org> (14 May 2012) # This is the GNOME 3.4 package.use mask =media-gfx/eog-plugins-3.4* map diff --git a/profiles/package.mask b/profiles/package.mask index d0a5b3329d54..82c26677fa67 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13872 2012/06/18 08:55:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13873 2012/06/18 12:06:38 ultrabug Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -430,10 +430,6 @@ x11-wm/parti # Removal in 30 days app-arch/hardlink++ -# Kacper Kowalik <xarthisius@gentoo.org> (19 May 2012) -# Masked for testing ->=dev-python/gevent-1.0_beta2 - # Maciej Mrozowski <reavertm@gentoo.org> (18 May 2012) # Masked for testing, luatex compilation fails due to API change. =app-text/poppler-0.20.0 |