gentoo resync : 07.04.2018

6 files changed, 43 insertions, 32 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3a96ca3568ec..1737902a1c92 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index ea9bbfb017d6..e8ae572deaf6 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,4 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
+EBUILD lesspipe-1.83-r1.ebuild 1134 BLAKE2B 0593da935bf18e040e0d9859e051d867fde05644ba39b7c71bf8ac6a60e9a5581deb74fcb3884c0370e7947f23a6b8802bb6c53685dd2c772139bda286252d49 SHA512 dd9ef9aab18b1b1b3ce69436963ccd577fba41c9e6dedbf69aabf7c61093bb04c0b2ea3bf9e62e25304f8008ea81730407fe410c208a85aece54e6d4a05c400c
 EBUILD lesspipe-1.83.ebuild 1147 BLAKE2B a6d4741acd7713b6231dbaedaacef655a2ac1cb0bf1df903dc771318e42cecb5e6001d3aff9c8d46c344514e9d00112d469aa65e785b7f474be520e671acff67 SHA512 a20258832d481689afaae1a9ac9234ce407e6d5746617a159bb49452bf82965f25039cfd5e65c79175039808a08de30aef7d3c8898ac9a5ca548d838b2489085
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
new file mode 100644
index 000000000000..92d625cc3641
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/rnv/Manifest b/app-text/rnv/Manifest
index f12f385b5ce8..9404d1a8d19e 100644
--- a/app-text/rnv/Manifest
+++ b/app-text/rnv/Manifest
@@ -1,5 +1,3 @@
 DIST rnv-1.7.11.tar.xz 140904 BLAKE2B 01b4400cb5bcfbc850f58d5b59ab8259532926f436ddfa20c63ab35cab30a30ae8429b82be0c589b694a12a9558436a1a3c445a42734af84ca6b66e5f6cf6796 SHA512 e706ae6cc9b55032b23c0ce4ce728f426727c20d0291f9ea4369221c5b3d59f29ad477c6da4992a9bda7c583078498faabc06a9865081517aeac81b2d2fec212
-DIST rnv-1.7.11.zip 211316 BLAKE2B f73026b2f2a2f1856944daebaa1c35bdc34a93e5216fa291b4d26977d129ce37b74e051a553673e9713de82eb703307359272a128db5e85c8225dd5a773b19ed SHA512 0d9457015e35177144eb88f6d6234e8d94c3a5a45f26f961b4aaba892bf92c0ddcaf0e037cf3fbbeecf110399760e182c20973e6ba32d1223d2f82600582a28e
-EBUILD rnv-1.7.11-r1.ebuild 656 BLAKE2B ac79b8875e9102dc4e2f26b6e050f44a96fc7192913b354f468ac6810e8e6a641bdc345d76c9b3dfcf88c8479753ed068145a8d26ff36bf639ff493f3e6a8186 SHA512 e7ca81277f29dc00fe8ac7571aa4af7e86f21111eeb9ceb490f5537d32c56a59f7710fd206b8cc80f5713990c8cc37b89dac942b7675907aa2092a281bc231de
-EBUILD rnv-1.7.11.ebuild 571 BLAKE2B 72b673ae1e9446d7be1289470bad13f4ae3317bd96e955dc9988c7909560c04341878f68a67f5faf644525b045294c49cb13d097a62eea2b52b2977fbcaba10d SHA512 4ed203e7747a2c3ea0da330cddc83e28eb177de7a8e709f5c894a7b052d998b02e53fb46c49b3d41c9e1b2d921d9c8bc0679f265ece88ebe4eb9816e0ae099ed
+EBUILD rnv-1.7.11-r1.ebuild 655 BLAKE2B 2a8928f2bc8e0de300bd5f1145f647edd4915dcf2952204915790b61468dff6aca45200747995851e0a89d932ed07b28e6021811e5071aff44b2ec6a10f71ae9 SHA512 bb16825fd60d75691432910e5fbaa732b7bf9186e06c1ac9c0353df55a7bfa4ecb6cd5e36ed4603a973567df5ad9372fc5da73830213a1ccc2bac9e81185d7ff
 MISC metadata.xml 239 BLAKE2B 8d54adc4713f80a925ad0590e17bb5d790690254160804e1d05bd2d257843af2a9f7793f041c140e76727f9bfea187a41933b9e4fb6b76bc889ff8bcdfc443b8 SHA512 7eb6bf1beffa771eee5c4de5dcf2ba3966398fcf6ea009eaeaa1d73cbdfc3d38907b8fd3c711144089b2ae506bcfa394f76ffd66238fd7df8e2f95589bb2f5f9
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
index 4321037e0b79..1ca31dcce3d1 100644
--- a/app-text/rnv/rnv-1.7.11-r1.ebuild
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/rnv/rnv-1.7.11.ebuild b/app-text/rnv/rnv-1.7.11.ebuild
deleted file mode 100644
index dc233fcb9c40..000000000000
--- a/app-text/rnv/rnv-1.7.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
-HOMEPAGE="http://www.davidashen.net/rnv.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-		app-arch/unzip"
-
-src_prepare() {
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
-}
-
-src_install() {
-	dobin rnv rvp arx
-	dodoc readme.txt
-}