Combine ChangeLog entries with same day, same committer, and same issue.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

2 files changed, 21 insertions, 74 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4bdf2eb07afd..9ff08b259f02 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,34 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.632 2014/06/08 10:59:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.633 2014/06/08 11:30:24 ulm Exp $
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
   emacs-24.3-r6.ebuild:
-  Stable for x86, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for sparc, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for ppc, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for ppc64, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for ia64, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for alpha, wrt bug #509830
-
-  08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r11.ebuild,
-  emacs-24.3-r6.ebuild:
-  Stable for amd64, wrt bug #509830
+  Stable for alpha, amd64, ia64, ppc, ppc64, sparc, and x86, wrt bug #509830
 
   07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-21.4-r25.ebuild,
   -emacs-22.3-r12.ebuild, metadata.xml:
@@ -49,10 +25,8 @@
   Allow emul-linux-* as alternative dependency, since this is still stage I of
   the gx86-multilib roadmap. Stable on amd64 and x86, bug 510456. Remove old.
 
-  15 May 2014; Markus Meier <maekke@gentoo.org> emacs-24.3-r6.ebuild:
-  arm stable, bug #509830
-
-  15 May 2014; Markus Meier <maekke@gentoo.org> emacs-23.4-r10.ebuild:
+  15 May 2014; Markus Meier <maekke@gentoo.org> emacs-23.4-r10.ebuild,
+  emacs-24.3-r6.ebuild:
   arm stable, bug #509830
 
 *emacs-23.4-r11 (10 May 2014)
@@ -180,22 +154,10 @@
   Update dependency on virtual/jpeg.
 
   14 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for arm, wrt bug #476702
-
-  14 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for alpha, wrt bug #476702
-
-  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for x86, wrt bug #476702
-
-  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for amd64, wrt bug #476702
-
-  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for ppc64, wrt bug #476702
+  Stable for alpha and arm, wrt bug #476702
 
   13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
-  Stable for ppc, wrt bug #476702
+  Stable for amd64, ppc, ppc64, and x86, wrt bug #476702
 
   13 Jul 2013; Jeroen Roovers <jer@gentoo.org> emacs-24.3-r2.ebuild:
   Stable for HPPA (bug #476702).
@@ -218,28 +180,16 @@
   Stable for s390, wrt bug #469874
 
   18 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for alpha, wrt bug #469874
-
-  18 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for ia64, wrt bug #469874
-
-  16 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for arm, wrt bug #469874
+  Stable for alpha and ia64, wrt bug #469874
 
   16 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for ppc64, wrt bug #469874
-
-  16 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for ppc, wrt bug #469874
+  Stable for arm, ppc, and ppc64, wrt bug #469874
 
   15 May 2013; Jeroen Roovers <jer@gentoo.org> emacs-24.3-r1.ebuild:
   Stable for HPPA (bug #469874).
 
   15 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for x86, wrt bug #469874
-
-  15 May 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r1.ebuild:
-  Stable for amd64, wrt bug #469874
+  Stable for amd64 and x86, wrt bug #469874
 
 *emacs-23.4-r6 (06 Apr 2013)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e5a772c16e1c..9a3c80d7feca 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,22 +17,19 @@ EBUILD emacs-23.4-r11.ebuild 11183 SHA256 c2abcdf3818d7a9f935f566115c9e565c67806
 EBUILD emacs-23.4-r6.ebuild 10801 SHA256 b709e1eedfb142a0b62e70e917f5f41e10c932c8d92790bcf5e80953f4027efb SHA512 4d84c5bd07704c0541670f268c8ff69f4dcd2a3eb74d6210323a7c63b61fe8a6c4bab6521f84cd0aba0aea4b535e2510decbe46e735bdc79896d40229049145f WHIRLPOOL 4e83c5497e9b0f121de23a82b787270a7bf187c2ab43acfaa351f7eb963a4d355a21ee62af265b82b5fbb226dd65101ebcef1bc0cd65fadad8a27aa8ab50d7a4
 EBUILD emacs-24.3-r2.ebuild 10786 SHA256 24ee66757397c4c8ba91873575ca196edb67e4e31732144ad344e02e3777cad9 SHA512 47a49c1dac01279af2272aec81347ae9d9e40c7879e8ba25070f315c0d342daaddd4bea457fdd021b07c3bf2ab677185bf9c4ce92ae0d0cca4ce3e5f4eae73f6 WHIRLPOOL d5449aa8296057c805b2bb79ee067098ea6809154e31a027468beeee965246725c5378b9ea9c84343c5ea8d7fa8df056e6d5bff16f5a73026ba841a5ea7930aa
 EBUILD emacs-24.3-r6.ebuild 11077 SHA256 64ddd4f5dd1034033c43654eaa8f07f8864dcb560ba8f4b635ba6dd938494e4f SHA512 4e61f865046ab4a152f96809b11c648d96ce79ae4bc95fb97c6d743e677bde648775abb612b28f32312dbdba444f655441dc3320b601315c939ed7b8c5adb64c WHIRLPOOL 18607e47889e25cedfc6347ac78d131a58852f4b011aa73eca87283dfb86b4c5bfb99aed7d705bda04494cdc5f84bdf359783c7c697157895441f0521284068d
-MISC ChangeLog 88201 SHA256 0f398f44e233c348adfc20e72f5dbe6fd48ae4fdcd7973b38a8757b54ad7d360 SHA512 4015cccc01288e5c27cea2581c2300aa4a70e59a9c0e4705be8e1533daf05ccbb1ee810c01cd2b7eee67beb727015a20f5ce6c6ac181cef3ef083aa51abfba08 WHIRLPOOL b8daaa2cf591fde9e5881426825c134136fe51d2fa4d0c9a3b23f8d9266a3dcfbf77f7c5cd4a0a61a0543eb81451c680f7d390c44699421951ab033a6ae66b89
+MISC ChangeLog 86585 SHA256 55eae2f54f343de344c15b84b18156bbeebfd1f90c798a1259b68f8568638d3e SHA512 5edf226360ec42cb0eb25ce1ecf6eae550b053678af77faf7a6582fe35338d04bc232b39a082507ff000f24e860fc9ae12ff279fc37c0ef6221af20038a34c23 WHIRLPOOL 05975037824da59872e62fabdf3cddc5817b27e511252a7153196db62ec443105c27af23b337ee4e4e6a6393ac3bc787577f88560ede64dda3f8702260dd5e2d
 MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTlEIWAAoJELp701BxlEWfQ8UP/RpBxSx/jalMtEJ6inhZrnTG
-bNo2qqoFHB/z4yulULAuAvXO5yZr5qeyt9Xs1h+U+//TRzIVOEjQ0CTjp/bcXlu7
-lqscuU+81UEnhbfWoxDgvQCU2FyYk5pttgnO42GMxpnEzYPCvUEUaXYwDWuko/cx
-RTUuqWFDyuck+MMOq6zUeD9rY2IPkYXnXBXmjCeLTFdNZ8yHdHXyJRBzAuDdBpWG
-dV3qMICTnZ7YOIrzxRvpHa0zcoWcZQ3cABZlYDWcSjX1IJUvgXDdnu3YyE6NwPC3
-My58qaSx2MzKhIy1dvEZp5ulAo59JMAjqdXFWPj3iohOwHh07ocT0SkVwgpKjuI/
-PvFgOSuMbH/0KA15P+Hcqi88fUIhr+5YEaJcRjBaXxSuEPYePmuG4H/AJaKQnUUL
-ZPsPgBUh3dOQK2E0kCJ6JaRGztp+rRM+sm/IW9zRVAf98rzoctysRC32tZZUY0Hj
-u2pG3scuIGDfHoCzAUqbjgyN5ceOM52gaUsY7SFCQdlo2TwCTW+EEYyj9NjQ/Ve5
-3JnwnpoVQgVKjgfp3mtcguDYXqPZgN3XY3Qa6vtRzcdN1211iB3kOhNQ99bAeEUW
-yTgFCfCeJwut3wNQvcJvBWmWSfp2Z7vevCVHnGNMhAg8J+l4TZ9JZphkiMgxXCVu
-VcNQvV2TmYbHcM9rnxS6
-=1KCp
+iQGcBAEBCAAGBQJTlEmZAAoJEJQzkH1pP7W4krgL/0je3u7Ptj3AFExUB4Jez2aF
+Tx/HNlmZBCOQI4flZXdZA8cNVoaai8hkQICN92RtRjw5fRnLXjjU3wLleZhCFDRH
+HDZrnFCkxNkJx4IOpXG4Wu2jDw4v3pfQ/Pd9cl9BP04ixeMWL56wZF/15ZF0TIyN
+49R6iwfHO5FCM3dvo5khT6ZujWFRnsiX0iJYjZuBxHj1nTPsyEcLNKmpwf5pk1SO
+h8QmjzlYWcCaIA5yeRG06oXJBnJPjb63DuHtj9+uVkWIPbWVBn6tCFmCf6LuHphN
+emG9gcS96mA0nbcvgy+E3/LbXjFjZnkNEGjjUe1QZgxvEoE+TF9KJSH7/eCs+HeS
+Iy5tXZ54jqyyAYGQCBMS3uTeeMu8ivTjccevMBD3oh9rNwr1RcDgQ9neM5z1S+/Y
+DgvhZgMiF1rxMP7TYf3gamELTtreLz+6wgU1Ht1S7Lo40ZODwf3wOKVmvbU2cyGM
+xRGthsAJX1UUz1SfR0kiM31EMlUXQKVZ+0YEIjdWMg==
+=XVnu
 -----END PGP SIGNATURE-----