From d56aa18c6bf504a387c40d73ac3a5a6ca34a9445 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 28 Mar 2015 22:12:13 +0000 Subject: [PATCH] emul-linux-x86 last rites. Remove no-emul-linux-x86 subprofiles that are now redundant. --- profiles/ChangeLog | 6 ++++- profiles/hardened/ChangeLog | 7 +++++- .../linux/amd64/no-emul-linux-x86/eapi | 1 - .../linux/amd64/no-emul-linux-x86/parent | 2 -- profiles/package.mask | 24 ++++++++++++++++++- profiles/profiles.desc | 9 ------- 6 files changed, 34 insertions(+), 15 deletions(-) delete mode 100644 profiles/hardened/linux/amd64/no-emul-linux-x86/eapi delete mode 100644 profiles/hardened/linux/amd64/no-emul-linux-x86/parent diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 4f31dbe440dd..dbb27171bfd0 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9883 2015/03/28 21:50:37 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9884 2015/03/28 22:12:13 mgorny 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! + 28 Mar 2015; Michał Górny package.mask, profiles.desc: + emul-linux-x86 last rites. Remove no-emul-linux-x86 subprofiles that are now + redundant. + 28 Mar 2015; James Le Cuirot package.mask: Mask dev-java/jna-posix. diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog index 40a4180c5f0f..b667337537ed 100644 --- a/profiles/hardened/ChangeLog +++ b/profiles/hardened/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.79 2015/03/28 12:39:38 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.80 2015/03/28 22:11:55 mgorny Exp $ + + 28 Mar 2015; Michał Górny + -linux/amd64/no-emul-linux-x86/eapi, -linux/amd64/no-emul-linux-x86/parent: + emul-linux-x86 last rites. Remove no-emul-linux-x86 subprofiles that are now + redundant. 28 Mar 2015; Anthony G. Basile linux/musl/package.mask: Mask >sys-kernel/linux-headers-3.16 on musl profiles. Bug #544476. diff --git a/profiles/hardened/linux/amd64/no-emul-linux-x86/eapi b/profiles/hardened/linux/amd64/no-emul-linux-x86/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/hardened/linux/amd64/no-emul-linux-x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/hardened/linux/amd64/no-emul-linux-x86/parent b/profiles/hardened/linux/amd64/no-emul-linux-x86/parent deleted file mode 100644 index cb086629ddf6..000000000000 --- a/profiles/hardened/linux/amd64/no-emul-linux-x86/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../arch/amd64/no-emul-linux-x86 diff --git a/profiles/package.mask b/profiles/package.mask index c7de4c4c046d..0a4815e01e28 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16442 2015/03/28 21:50:37 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16443 2015/03/28 22:12:13 mgorny 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 @@ -30,6 +30,28 @@ #--- END OF EXAMPLES --- +# Michał Górny (14 Sep 2014) +# on behalf of gx86-multilib project +# Mask emul-linux-x86 packages along with unported old versions +# of reverse dependencies for removal in 60 days, bug #544876. +# Please use multilib ebuilds with abi_x86_32 instead. +app-emulation/emul-linux-x86-baselibs +app-emulation/emul-linux-x86-cpplibs +app-emulation/emul-linux-x86-db +app-emulation/emul-linux-x86-gstplugins +app-emulation/emul-linux-x86-gtklibs +app-emulation/emul-linux-x86-gtkmmlibs +app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-motif +app-emulation/emul-linux-x86-opengl +app-emulation/emul-linux-x86-qtlibs +app-emulation/emul-linux-x86-sdl +app-emulation/emul-linux-x86-soundlibs +app-emulation/emul-linux-x86-xlibs + (28 Mar 2015) # Formerly required by NetBeans. Upstream has been dead for # years. Removal in 30 days. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 45f8b8b1e7cb..96203216e8f0 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -24,14 +24,6 @@ amd64 default/linux/amd64/13.0/desktop/gnome/systemd stable amd64 default/linux/amd64/13.0/desktop/kde stable amd64 default/linux/amd64/13.0/desktop/kde/systemd stable amd64 default/linux/amd64/13.0/developer stable -amd64 default/linux/amd64/13.0/no-emul-linux-x86 dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/desktop dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/desktop/gnome dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/desktop/gnome/systemd dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/desktop/kde dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/desktop/kde/systemd dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/developer dev -amd64 default/linux/amd64/13.0/no-emul-linux-x86/selinux dev amd64 default/linux/amd64/13.0/no-multilib dev amd64 default/linux/amd64/13.0/x32 dev @@ -178,7 +170,6 @@ x86-fbsd default/bsd/fbsd/x86/10.1 dev # Hardened Profiles amd64 hardened/linux/amd64 stable -amd64 hardened/linux/amd64/no-emul-linux-x86 dev amd64 hardened/linux/amd64/selinux stable amd64 hardened/linux/amd64/no-multilib stable amd64 hardened/linux/amd64/no-multilib/selinux stable -- 2.26.2