Merged from trunk 3795:4674

svn path=/main/branches/prefix/; revision=4682

diff --git a/NEWS b/NEWS
index c126c32115242968aa122fe845c0586003ed35b1..07a3ba83c4f4ca3db1f65f22607288836d267633 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,25 @@
 News (mainly features/major bug fixes)
 
+portage-2.1.2
+------------
+
+* Profiles support multiple inheritance.
+* CONFIG_PROTECT and CONFIG_PROTECT_MASK both support files (not just
+  directories).
+* Collision protection handles symlinks properly.
+* Dependencies can be satisfied by installed packages that do not have matching
+  ebuilds in the portage tree or overlay.
+* Emerge automatically ignores blockers that are made irrelevant by an upgrade.
+* Emerge builds a complete dependency graph in order to ensure correct merge
+  order and detection of circular dependencies.
+* The world and system sets allow automatic update of all installed slots.
+* DEPEND atoms support SLOT dependencies of the form ${CATEGORY}/${PN}:${SLOT}.
+
+portage-2.1.1
+------------
+
+* Profiles support use.force, package.use.force, and package.use.mask files.
+
 portage-2.1 (ongoing via pre releases)
 ------------
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0e6753b12a1949f0247db22d1f5d49fd3f3bfe82..c15f922bafd16f995af4cce4951f2eed9819aaa9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,21 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.1.2
+==================================
+
+* emerge does not necessarily update build time dependencies that are not
+  strictly required.  See the --with-bdeps option in the emerge(1) man page.
+
+portage-2.1.1
+==================================
+
+* emerge --search doesn't use regular expressions now anymore by default, so
+  emerge --search dvd+rw-tools now works as expected. Regular expressions can be enabled
+  by prefixing the search string with %. 
+* emerge --depclean algorithm is much safer than the old one.
+* emerge --newuse detects changes in IUSE that previously went undetected.
+
 portage-2.1
 ==================================
 
@@ -18,3 +33,9 @@ portage-2.1
   variable or use the emerge --ignore-default-opts option.
 * rsync option handling has been redesigned, instead of RSYNC_* variables
   use PORTAGE_RSYNC_EXTRA_OPTS from now on.
+* autouse (use.defaults) has been deprecated by specifying USE_ORDER in make.defaults
+  Users may still turn this back on by specifying USE_ORDER="env:pkg:conf:auto:defaults"
+  in make.conf.  Interested in figuring out what use flags were turned off?  Check out
+  /usr/portage/profiles/base/use.defaults and other use.defaults files that correspond 
+  to your profile.
+