Updates for the releasev2.2.12

2 files changed, 33 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 43d1797c2..4923bb91f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 News (mainly features/major bug fixes)
 
+portage-2.2.12
+
+* New emaint module "merges"  for finding and fixing failed merges
+  If a pkg fails to merge to the live filesystem correctly, that pkg may
+  not work correctly if at all.  This module scans the installed pkg database
+  for those failures and can re-emerge those packages.
+
 portage-2.2.1
 -------------
 
@@ -160,7 +167,7 @@ portage-2.1.3
   RDEPEND.  This makes PDEPEND more useful for breaking the dependency cycles
   that are sometimes triggered by RDEPEND and DEPEND.
 * Enable "echo" and "save_summary" elog modules by default
-* Fix -* handling in package.keywords to work as intended (reset the accepted 
+* Fix -* handling in package.keywords to work as intended (reset the accepted
   keywords list), also see RELEASE-NOTES.
 * Make elog functionality available to python code
 
@@ -183,9 +190,9 @@ portage-2.1.2
   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}.
-* Development: Extend PYTHONPATH support to allow overriding the hardcoded 
+* Development: Extend PYTHONPATH support to allow overriding the hardcoded
   /usr/lib/portage/pym for development/testing purposes
-* New "finalize" hook for elog modules enabling modules to perform actions on 
+* New "finalize" hook for elog modules enabling modules to perform actions on
   shutdown (like dispatching collected messages).
 * New elog modules mail_summary and save_summary that act like the mail/save
   modules except that they merge messages from multiple packages in a single
@@ -203,7 +210,7 @@ portage-2.1.1
 portage-2.1 (ongoing via pre releases)
 ------------
 
-* FEATURES="confcache" integration; global caching to speed up configure calls, 
+* FEATURES="confcache" integration; global caching to speed up configure calls,
   requires dev-util/confcache
 * elog framework and accompanying modules for logging ebuild warnings, errors
   and general notices. Collects eerror/ewarn/elog/einfo messages.
@@ -213,7 +220,7 @@ portage-2.1 (ongoing via pre releases)
 * config files as directories enabling more flexible settings management.
 * Addition of an register_die_hook method that allows ebuild/eclasses to
   register functions to be called for better debugging on errors.
-* Addition of pre and post user hookable functions for each ebuild phase, accessible 
+* Addition of pre and post user hookable functions for each ebuild phase, accessible
   via portage bashrc.  Example would be pre_src_unpack .
 * cache refactoring- runtime improvement from 35% -> 65%.
 * Intelligently handle and display USE_EXPAND-based IUSE variables.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 63dbfad09..9b4cbb777 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,27 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.2.12
+==================================
+* Bug Fixes:
+    - Bug # 519074 fix invalid locale setting
+    - Repoman: fix atom.blocker checks
+    - Bug # 519124 properly decode formatted number for localized_size()
+    - Revert an incorrect test fix from 2.2.11 which broke mime type detection
+    - Bug # 518968 Fix and incorrect userquery change
+    - QA systemd warning check for using /etc/conf.d
+    - QA Use pngfix to find broken PNG files
+    - Bug # 512578 Prepend '=' to unmerge atoms
+    - Repoman: Do not report DESCRIPTION.punctuation warning for "etc."
+    - Fix a py2/py3 discrepency involing integer division causing number output
+      to be inconsistent
+    - Fix an unicode-decode error in a gettaddrinfo() error message
+* New emaint module "merges"  for finding and fixing failed merges
+  If a pkg fails to merge to the live filesystem correctly, that pkg may
+  not work correctly if at all.  This module scans the installed pkg database
+  for those failures and can re-emerge those packages.
+
+
 portage-2.2.11
 ==================================
 * Bug Fixes: