From 179fc62059dcc7aed012d8e3e0d591e917991b8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Tue, 31 Mar 2015 20:40:17 +0000 Subject: [PATCH] Remove duplicate app-admin/eselect-* entries, following package move. --- profiles/ChangeLog | 6 +++++- profiles/package.mask | 3 +-- profiles/prefix/sunos/solaris/5.9/package.use.force | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 28a6277888db..35619409bb42 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.9893 2015/03/31 20:32:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9894 2015/03/31 20:40:16 ulm 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! + 31 Mar 2015; Ulrich Müller package.mask, + prefix/sunos/solaris/5.9/package.use.force: + Remove duplicate app-admin/eselect-* entries, following package move. + 31 Mar 2015; Ulrich Müller updates/1Q-2015: Package move app-admin/eselect-* to app-eselect/eselect-*. diff --git a/profiles/package.mask b/profiles/package.mask index cde1e97caa69..0a66a59721c5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16452 2015/03/31 17:05:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16453 2015/03/31 20:40:16 ulm 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 @@ -866,7 +866,6 @@ dev-ruby/weakling # Matti Bickel (22 Apr 2014) # Masked slotted lua for testing -app-admin/eselect-lua app-eselect/eselect-lua =dev-lang/lua-5.1.5-r2 =dev-lang/lua-5.1.5-r100 diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.force b/profiles/prefix/sunos/solaris/5.9/package.use.force index e35cf7b2f690..af2bd0abd669 100644 --- a/profiles/prefix/sunos/solaris/5.9/package.use.force +++ b/profiles/prefix/sunos/solaris/5.9/package.use.force @@ -1,7 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/package.use.force,v 1.2 2015/03/31 17:05:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/package.use.force,v 1.3 2015/03/31 20:40:17 ulm Exp $ # still need scandir() from gnulib on solaris2.9 -app-admin/eselect-python gnulib app-eselect/eselect-python gnulib -- 2.26.2