diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-06-04 15:52:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-06-04 15:52:37 +0000 |
| commit | ba6007ac1519ad4c4752da192e398579f9821fa5 (patch) | |
| tree | 48e64567e853b8b9b4da93692d0887a8f3a42cba /profiles/base | |
| parent | Version bump. Keyword amd64-linux and x86-linux. Fixed non-bashism in init sc... (diff) | |
| download | gentoo-2-ba6007ac1519ad4c4752da192e398579f9821fa5.tar.gz gentoo-2-ba6007ac1519ad4c4752da192e398579f9821fa5.tar.bz2 gentoo-2-ba6007ac1519ad4c4752da192e398579f9821fa5.zip | |
punt inline commenting for bug 472292
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index c1ffa8bb92f7..8c95fc4bce87 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.547 2013/06/02 19:40:59 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.548 2013/06/04 15:52:37 ssuominen Exp $ + + 04 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> package.use.mask: + Punt inline commenting wrt #472292 since "man 5 portage" says it's illegal + by Andreas Wiese 02 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> package.use.mask: Block new PBXT usage per news item. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index ada4a00e0d22..4cf44dddf231 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -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/profiles/base/package.use.mask,v 1.472 2013/06/02 19:40:59 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.473 2013/06/04 15:52:37 ssuominen Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -9,11 +9,12 @@ # Robin H. Johnson <robbat2@gentoo.org> (02 Jun 2013) # PBXT is no longer supported by upstream, and fails testcases. >=dev-db/mysql-5.5 pbxt ->=dev-db/mysql-cluster-5.5 pbxt # overlay >=dev-db/mariadb-5.5 pbxt ->=dev-db/mariadb-galera-5.5 pbxt # overlay ->=dev-db/percona-server-5.5 pbxt # overlay ->=dev-db/google-mysql-5.5 pbxt # overlay +# overlay -- no inline comments wrt bug #472292, ssuominen (04 Jun 2013) +>=dev-db/mysql-cluster-5.5 pbxt +>=dev-db/mariadb-galera-5.5 pbxt +>=dev-db/percona-server-5.5 pbxt +>=dev-db/google-mysql-5.5 pbxt # XFCE <xfce@gentoo.org> (01 Jun 2013) # Masked temporarily while waiting for >=net-libs/webkit-gtk-2 unmasking from |