gentoo resync : 03.11.2018

3 files changed, 5 insertions, 28 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index bbd26c35f402..c7916e87a1eb 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,12 +1,11 @@
-AUX README.Gentoo 823 BLAKE2B d4920f827b4c0c210715f4f05c1365c3388b01ca41e8e08add41f6784c89e9f26296ca2b71d0bcc22f58a773c602dac4bd9a7361bd6173501db4ceb24a9a3926 SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b
 DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
-DIST less-537.tar.gz 341608 BLAKE2B 87425a8c0779f88d6f9029ae7ffde944d68f095dc4113a07839a523f76c96cb29bc1c076b6a0a64685ed75f86b37b47e75102663fef014027dcf1e8459c97b18 SHA512 2c4b8d2fb76843c68ee4401c373d3c01cce591a425d002d885f208b8dd4c822c5f2ee52b2fde29a5c366ed1f48cd73679c70a8329acd1cb2866a76a58b4e2063
 DIST less-538.tar.gz 341589 BLAKE2B ce2c451da4f25e1fd93c738817f92fb12453b3091b34f8162ff11645a0bc223ca158ed3facb5eac611799117c8d20c14597abd5a0924a4f39d1ac18cd4afb638 SHA512 55012727f855de1c5e451dead0533e0d8505c0c829ff4f624bfadee998278ca372f201e1f58c23f09e0c4a2d424a17fcce6d3ebb18dd1c3bb757f5ccd8aaa330
+DIST less-540.tar.gz 342724 BLAKE2B d5184ae3e44ea111d9a3fc87166779cf19ac63b26b25ff149610fd5728e20457c9469fff885759a1230b831b0c306569179c2a1e25c6c15c85604855726e3153 SHA512 1cee065b9a16db74ef0ccdffa149071bf66dd40d82c3d5581b0a7706f75ed4afaf4beca9e5d928d20605e390d5b0a6c1b346a67d8abb90d93bf140cbe03d435d
 EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a
 EBUILD less-531.ebuild 1408 BLAKE2B 70268fa7b95805f7c8d5837537e378a881b383c104d5c264b2113554a926659319e1457c470eb6ce1d2215fb2409e2d296643086ff7ca5666c4aa54b996050dd SHA512 7c4b7197acf8d0bc99fb4b3ed5fae4d1a85517d9e70b051fe093597eea640346f03107d0e383bd1e4f23359d2eddf5d6081099b68c103a8146dcd20611ed119c
-EBUILD less-537.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
 EBUILD less-538.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
+EBUILD less-540-r1.ebuild 1420 BLAKE2B eb6835cbf7f1874c6ac461d1e8f506bb010f8acaa9eb075d28c67b910ea4209f508a9c5de372cbbe65da1b809e89fdd2112f2c3178990e3a348daba5525a0c08 SHA512 cd357d2d6a5b63121fa7bd3265ab5d85bf171afd71bd384d6f4aa6d8789c061ad3e39988144777dbe340e3ef6123eaf2b6238a48b89e7b3e45a98d332cd853a3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/files/README.Gentoo b/sys-apps/less/files/README.Gentoo
deleted file mode 100644
index dca832808f1e..000000000000
--- a/sys-apps/less/files/README.Gentoo
+++ /dev/null
@@ -1,22 +0,0 @@
-This version of less comes with some Gentoo enhancements:
-	- default lesspipe.sh script to "view" files
-	- colorization support
-
-To see what file types are supported, just read the /usr/bin/lesspipe.sh
-script (it's just a plain text bash script).
-
-Colorization support is disabled by default.  To enable it, export the
-LESSCOLOR variable to "yes":
-	$ export LESSCOLOR=yes
-
-We also provide a colorization script, 'code2color', that is used by
-default.  If you wish to use another script, simply export the LESSCOLORIZER
-variable to name of the script:
-	$ export LESSCOLORIZER=some-other-script
-
-If you want to use the code2color script and the default color schemes are
-not acceptable, you can develop your own schemes and save them in one of
-the following places:
-	/etc/code2color
-	~/.code2color
-	CODE2COLOR_CONFIG env var
diff --git a/sys-apps/less/less-537.ebuild b/sys-apps/less/less-540-r1.ebuild
index c4d58efa2269..3bc3bf389320 100644
--- a/sys-apps/less/less-537.ebuild
+++ b/sys-apps/less/less-540-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,14 @@ IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre )"
+	pcre? ( dev-libs/libpcre2 )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	local myeconfargs=(
-		--with-regex=$(usex pcre pcre posix)
+		--with-regex=$(usex pcre pcre2 posix)
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 	)
 	econf "${myeconfargs[@]}"