gentoo resync : 18.08.2019

3 files changed, 13 insertions, 175 deletions

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 224ce2436108..14067120dec7 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -43,11 +43,11 @@ DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479
 DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385
 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
 DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
+DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
 EBUILD readline-4.3_p5.ebuild 1535 BLAKE2B 626e1d99e3f42b9d4ee863b64c6bf013c45e71d4441255ac3fd069880796829fa8e17b00a2f175b34ef46cd1c8662dd84c9ada5d01fb72a3b4e857df4c2227f5 SHA512 d11c9b5046aa86ecc6e8b59e8e18dfd34f649192a3cbe0cfd054d3d05bdd7f197a63610c14a578bdbef00c9ef47527a729d1a3780f1f8b3374dac77465a68f33
 EBUILD readline-5.2_p14.ebuild 1592 BLAKE2B e93c757eef8ee119694e15c59723e77caba29346451703b892bd14587bdf9c40d6aae273dc812575f55ac074ef43f6a6b90fee28278eec339416f4363b94cd2c SHA512 67c02062b1a08fa8fd8345de9826676cee2aacead0fa8210c75657401ea7049eea124d649cae5650e04da2877d58f507adc9bf0f12c7fa19a7f6348586a86b38
 EBUILD readline-6.3_p8-r3.ebuild 4390 BLAKE2B 2121e1c1d5b045fa0ae14db133a80e4b5290e0ce37e8a5e0406c7245a1cb21455573d1468221def3830c4290c49b0cb1189c020727f0292c3c639e82d9f9e7ac SHA512 90c7643acf92343a49ede4f776c23e16c8070018d912a2872cd555a88ea9f56b6b207cc415f451d1a1341e2c64aa41a7b126938f5436c9e866b4c2a7ee3ae3bb
-EBUILD readline-7.0_p3-r1.ebuild 4849 BLAKE2B 6e7e2a82ddec8d5c4bc276a1bbb3584875cd7ae8f911fe95526b2a6a1c11d0523aaa8b75199203a7487c17daf4f909043714b379da4845b37783281aac8f6d92 SHA512 aacb95e3dca7e61dcf324028c7e0b08a3d987cd07760d6c2445ffde7f19ec5e06f3deed30cd20c03f2c20cd0430e05496c13f3ed7ad3dd012a7b1b6bb60c9402
-EBUILD readline-7.0_p3.ebuild 4604 BLAKE2B 252619a2d1215fcebec7c1a251b1c07184766b1d28c3c7e9d5fcb28b9e0da3713c22f87bb69d5670751828f9aa50c0ccf653709ed170fa5f6fe012acb7c18c35 SHA512 0b3ec2b7a873209b61afbb70344b1b03ceccd3c6820fbd7e42d4c5f8085e17610936b5c1bb29b31301c5fbdfe0e27ba7d9e5b34435330389c5e1547f5295c1c1
 EBUILD readline-7.0_p5.ebuild 4843 BLAKE2B 77f5eca75e11a2a2c3de59020a3030593670e402c2c58efe786507a3cbbda015f9714f187434d53eeb13b9d47a3fb8ae9f2a032c67272326e076fe56c44333cb SHA512 b116fd9a52913d615845f23ab5d37bca0b478b03779ed7aa229dc929565e47bcd757625f636088788721debd43171e133ea5f40e685918f6df519dd670e7db78
 EBUILD readline-8.0.ebuild 4812 BLAKE2B 34c5b37ae51086570439f333067a8276f2160c9ab7d2b6e1a4639164ce9d199b253689dd69beba935231b251729b8af36ee938c12bba03d1440ae463b8f8f128 SHA512 c1afbacd9c1297570a6c8a116faad750a3236e25b7ec30bf2861492e0c3578d2002e9995c11aa9cce86c88cb5567c89c6f9b6343fc4d57f98a5edf5bb8e83c3b
+EBUILD readline-8.0_p1.ebuild 4826 BLAKE2B 289b16beca550658cffc74a87847620fa05ce8c0c91098715f3f568e3e8fdb5c5382bc7867d289179d44734e56f237b4093b01e2149135a84fe82b30496ab788 SHA512 358225d5c31629f8f21ed7e47d05e1c73a3a5eda761e2da070fa52697bcbb4c23292606e2f546d4c9d6a307d3c54d5e814d84f574674e1d99861bf0d7c254744
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/readline-7.0_p3.ebuild b/sys-libs/readline/readline-7.0_p3.ebuild
deleted file mode 100644
index 551fc0f5d3e5..000000000000
--- a/sys-libs/readline/readline-7.0_p3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-case ${PV} in
-*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	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-missing-echo-proto.patch
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--with-curses \
-		$(use_enable static-libs static)
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE=${S}/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
-			ln -sf ../../lib${l}.a lib${l}.a
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc USAGE
-	dohtml -r doc/.
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
-}
diff --git a/sys-libs/readline/readline-7.0_p3-r1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
index 97d60560590b..7e6b19160ad4 100644
--- a/sys-libs/readline/readline-7.0_p3-r1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
 
@@ -40,22 +40,23 @@ case ${PV} in
 esac
 
 LICENSE="GPL-3"
-SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0/8"  # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
 	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
 	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch
-	"${FILESDIR}"/${PN}-7.0-mingw.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
 )
 
 # Needed because we don't want the patches being unpacked
@@ -166,9 +167,9 @@ multilib_src_install_all() {
 pkg_preinst() {
 	# bug #29865
 	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
 }