diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-12-08 23:50:23 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-12-08 23:50:23 +0000 |
| commit | 2f22855c278c47d792f5a6b9bb6dee451e763eeb (patch) | |
| tree | ccb5f319195b857bc5909672d7563a07d9154ca9 /profiles/arch/amd64 | |
| parent | fix accidental checkin (diff) | |
| download | gentoo-2-2f22855c278c47d792f5a6b9bb6dee451e763eeb.tar.gz gentoo-2-2f22855c278c47d792f5a6b9bb6dee451e763eeb.tar.bz2 gentoo-2-2f22855c278c47d792f5a6b9bb6dee451e763eeb.zip | |
Mask gcj-jdk[X] instead of the whole package, pointed out in bug #531900, comment 3.
Diffstat (limited to 'profiles/arch/amd64')
| -rw-r--r-- | profiles/arch/amd64/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/arch/amd64/no-emul-linux-x86/package.mask | 7 | ||||
| -rw-r--r-- | profiles/arch/amd64/no-emul-linux-x86/package.use.mask | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index 93a8a7edfd0b..f5bf0c69ddf9 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.295 2014/12/07 18:52:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.296 2014/12/08 23:50:23 mgorny Exp $ + + 08 Dec 2014; Michał Górny <mgorny@gentoo.org> + no-emul-linux-x86/package.mask, no-emul-linux-x86/package.use.mask: + Mask gcj-jdk[X] instead of the whole package, pointed out in bug #531900, + comment 3. 07 Dec 2014; Michał Górny <mgorny@gentoo.org> no-emul-linux-x86/package.mask: diff --git a/profiles/arch/amd64/no-emul-linux-x86/package.mask b/profiles/arch/amd64/no-emul-linux-x86/package.mask index 3bc8b3cb36ce..891e5ff782bd 100644 --- a/profiles/arch/amd64/no-emul-linux-x86/package.mask +++ b/profiles/arch/amd64/no-emul-linux-x86/package.mask @@ -1,11 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.mask,v 1.4 2014/12/07 18:52:51 mgorny Exp $ - -# Michał Górny <mgorny@gentoo.org> (07 Dec 2014) -# on behalf of gx86-multilib project <multilib@gentoo.org> -# Requires masked sys-devel/gcc[awt]. Does not have any real use. -dev-java/gcj-jdk +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.mask,v 1.5 2014/12/08 23:50:23 mgorny Exp $ # Michał Górny <mgorny@gentoo.org> (14 Sep 2014) # on behalf of gx86-multilib project <multilib@gentoo.org> diff --git a/profiles/arch/amd64/no-emul-linux-x86/package.use.mask b/profiles/arch/amd64/no-emul-linux-x86/package.use.mask index 4e24a054d742..5998826a403a 100644 --- a/profiles/arch/amd64/no-emul-linux-x86/package.use.mask +++ b/profiles/arch/amd64/no-emul-linux-x86/package.use.mask @@ -1,8 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.use.mask,v 1.2 2014/12/07 15:03:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-emul-linux-x86/package.use.mask,v 1.3 2014/12/08 23:50:23 mgorny Exp $ # Michał Górny <mgorny@gentoo.org> (14 Sep 2014) # on behalf of gx86-multilib project <multilib@gentoo.org> -# Has incorrect dependencies and maintainer is unwilling to fix them. +# gcc[awt] is only used by gcj-jdk[X], and gcj-jdk[X] is not really +# used by anything. The deps are hard to fix properly thanks +# to toolchain.eclass. sys-devel/gcc awt +dev-java/gcj-jdk X |