[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/files/, sys-libs/readline/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     0b8bb23ef469bbbf88a695582219c0a79fa19ba9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 09:02:52 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 09:03:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8bb23e

sys-libs/readline: Bump to version 7.0_p1. Removed old.

We already had the issue fixed in 7.0-r1 that 7.0_p1 is fixing but now we have
the official patch.

Package-Manager: portage-2.3.2

 sys-libs/readline/Manifest                         |  1 +
 .../files/readline-7.0-history-alloclist.patch     | 29 ----------------------
 ...adline-7.0-r1.ebuild => readline-7.0_p1.ebuild} |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 22a0b3d..296f740 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -35,3 +35,4 @@ DIST readline63-005 1664 SHA256 877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b4
 DIST readline63-006 1982 SHA256 5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556 SHA512 e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c WHIRLPOOL 7b88ad9fcad9eee0762d881307d2f865c66a9ee246bc1a648d6203677fc307759ca7ee216fb632114d3da76ca27a67222aefd830bcf99ee9a96d1ba2f2105290
 DIST readline63-007 1428 SHA256 4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea SHA512 abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854 WHIRLPOOL fc9d866a6e0f0c2a2f752c65e6fcae56a1b0e1b5cef45154ff51b5d1b49fc75ffaa30bdf90c221fb6493381b9d67eb20168bdfd273fa0dd89602f18680bb3e5f
 DIST readline63-008 1452 SHA256 3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c WHIRLPOOL 94d9371e6ca35e72565c1990e0ec8bedf8a141f0a3d061e4928f6184c3ef4a4b472f4278d443b990a53977ad6f3f7bdbf41e51a999202b48414df3a946bb9796
+DIST readline70-001 1777 SHA256 9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec WHIRLPOOL 3f52c3e5b0c5a600585e58ed2e013cdba2dee47f3604e7db96b811d715618f19fd75835a5cd9790f582493a32f54993cbac69ee04fa6c73775f14741c215fd65

diff --git a/sys-libs/readline/files/readline-7.0-history-alloclist.patch b/sys-libs/readline/files/readline-7.0-history-alloclist.patch
deleted file mode 100644
index 73faa60..00000000
--- a/sys-libs/readline/files/readline-7.0-history-alloclist.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/597006
-https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00010.html
-
-*** ../bash-4.4/lib/readline/history.c	2015-12-28 13:50:31.000000000 -0500
---- lib/readline/history.c	2016-09-30 14:28:40.000000000 -0400
-***************
-*** 58,61 ****
---- 58,63 ----
-  #define DEFAULT_HISTORY_INITIAL_SIZE	502
-  
-+ #define MAX_HISTORY_INITIAL_SIZE	8192
-+ 
-  /* The number of slots to increase the_history by. */
-  #define DEFAULT_HISTORY_GROW_SIZE 50
-***************
-*** 308,312 ****
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
---- 310,316 ----
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-! 				? MAX_HISTORY_INITIAL_SIZE
-! 				: history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;

diff --git a/sys-libs/readline/readline-7.0-r1.ebuild b/sys-libs/readline/readline-7.0_p1.ebuild
similarity index 98%
rename from sys-libs/readline/readline-7.0-r1.ebuild
rename to sys-libs/readline/readline-7.0_p1.ebuild
index aecaa1c..56fddcb 100644
--- a/sys-libs/readline/readline-7.0-r1.ebuild
+++ b/sys-libs/readline/readline-7.0_p1.ebuild
@@ -54,7 +54,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
 	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
 	epatch "${FILESDIR}"/${PN}-7.0-headers.patch
-	epatch "${FILESDIR}"/${PN}-7.0-history-alloclist.patch #597006
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558