emul-linux-x86 last rites. Remove no-emul-linux-x86 subprofiles that are now redundant.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4f31dbe440dd6c61e3277375d0474f18788e1e57..dbb27171bfd0ffadacd9d7c76e85b55b2598ad05 100644 (file)
--- 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 <mgorny@gentoo.org> 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 <chewi@gentoo.org> package.mask:
   Mask dev-java/jna-posix.
 

diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog
index 40a4180c5f0fa8f2233a0704198ecaa2b39083dd..b667337537ed1c2bdebc1710ff606dff1c8ecb5a 100644 (file)
--- 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 <mgorny@gentoo.org>
+  -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 <blueness@gentoo.org> 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 (file)
index 7ed6ff8..0000000
--- 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 (file)
index cb08662..0000000
--- 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 c7de4c4c046d7014030a5deba67d07c026510099..0a4815e01e280055a2934dce83ecd2c95d26e37c 100644 (file)
--- 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 <mgorny@gentoo.org> (14 Sep 2014)
+# on behalf of gx86-multilib project <multilib@gentoo.org>
+# 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
+<app-emulation/emul-linux-x86-jna-20140508-r1
+<app-emulation/wine-1.6.1
+<x11-drivers/ati-drivers-14
+
 # James Le Cuirot <chewi@gentoo.org> (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 45f8b8b1e7cb2a08f3e08af157ee4a89405caadf..96203216e8f0bbab9cc24343fa578d3a23ea77d4 100644 (file)
--- 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