gentoo resync : 23.09.2020

4 files changed, 21 insertions, 106 deletions

diff --git a/app-i18n/bidiv/Manifest b/app-i18n/bidiv/Manifest
index 779d749a89e3..d6ad13178ea9 100644
--- a/app-i18n/bidiv/Manifest
+++ b/app-i18n/bidiv/Manifest
@@ -1,7 +1,4 @@
-AUX bidiv-1.5-fribidi.patch 1164 BLAKE2B 50a0a3a35ea7d7b526552fe0b4f1f99bd5ca52b1b42dd76a5dbad2127de2cdf40c1553263902d946d3ea8f7bfae1464de37737eb5af768a2767020b17f272f3c SHA512 0f2bbf5b2f337c335c009cf4672b896ff7b7dcdc94a839544aa5af1f80d43d64b373387b49e21f5bbd5111fc7f7014e0f058973a70154f1ad913ba8d7228c1be
-DIST bidiv-1.5.tgz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
 DIST bidiv_1.5-4.debian.tar.gz 5863 BLAKE2B b91f6756156815bd12b6c6e56a058a63db5be805cab2c5fb29e47f0e66bf8ba8638bdca2ed83c63117144c2f9912ed4ba79bb1b143f3bd2f6c4fef33397225e2 SHA512 63e998cae38e08181cf4e40a54119b9b4b5ab3ede7fcfbf852a1a7ad51a671d14d4094b3af8b89574eef51f8c6ee34f2eab6242bf69e77d954826931a801e8b1
 DIST bidiv_1.5.orig.tar.gz 13865 BLAKE2B 9f289a2674b3d5ce895e65f6068252d78eafea735783ca8947be446d0830166708474fda041bea85adcc8930ec615d68978d7f8151afdcd645640b9941be009c SHA512 f8ddaa4a7ae6e7b723eb6e4f5dc91bd2e189c02e116ecd1fb02d300f12e913e9dbf328d65f40ef8c2e7d8e822d1a612966fe0f59f44129fd5dc7ece26c021cc2
-EBUILD bidiv-1.5-r1.ebuild 631 BLAKE2B 22ff8101240d213b4593214b6c18481d6ea236c9d187367473401708bb71b43b008b6273351a329c783460f7f47cdf75b415ea63c5e03022140504dcccc58600 SHA512 89f0a57e7f3bb741e41d4c416cef6d3ef76dcfe1b3bccf314f71b325d3703945e4e7e898fdbc2ce4699c0b5243c0809c97e29e13fae9471744b69a0a9cbd2f1b
-EBUILD bidiv-1.5_p4.ebuild 1061 BLAKE2B c9c181238c39eaef6bab6a0af6e58953415487b51dc025f7c456f980d5ad4bc1174220161160b8cb1c52bc0269f0576c618d182573b63b35967f91ebf94dd138 SHA512 c86d3fdd1a5b924acef7a1588e5abdb786849d7ada0ab2535116a3a3cbb2d70ca2fd12db419d02512ab732050244881e2e382cc14a008cf115fe9cc3bbf02e34
+EBUILD bidiv-1.5_p4.ebuild 1110 BLAKE2B c7d76c8af02b97eb3afb7bac40f51b7570a8b98418355df6ea9c39efaec1ef6af0ca8ba7ce6d4d6a8d6236db4bd6669681ae7892b5ff1b2de51fe95145765d52 SHA512 64ce715b0dd99fc72a64fcd96f04e105a200352641f5617763c3a5b9457f8b16d604553dde1490c816830dbb518af0d8ce9efc78e1030b1f792ad1aef8cbf060
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/bidiv/bidiv-1.5-r1.ebuild b/app-i18n/bidiv/bidiv-1.5-r1.ebuild
deleted file mode 100644
index 86d05fe04bf0..000000000000
--- a/app-i18n/bidiv/bidiv-1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A BiDirectional Text Viewer"
-HOMEPAGE="http://www.ivrix.org.il"
-SRC_URI="http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fribidi.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin bidiv
-	dodoc README WHATSNEW
-	doman bidiv.1
-}
diff --git a/app-i18n/bidiv/bidiv-1.5_p4.ebuild b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
index 9635bec349c9..73aafaeb98cd 100644
--- a/app-i18n/bidiv/bidiv-1.5_p4.ebuild
+++ b/app-i18n/bidiv/bidiv-1.5_p4.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 PATCH_LEVEL=4
 
 DESCRIPTION="A commandline tool displaying logical Hebrew/Arabic"
 HOMEPAGE="https://packages.qa.debian.org/b/bidiv.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PATCH_LEVEL}.debian.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND=">=dev-libs/fribidi-0.19.2-r2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+DEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_prepare() {
+PATCHES=(
 	# Use order from "series" file:
-	local ddir=${WORKDIR}/debian/patches
-	epatch \
-		"${ddir}"/try_utf8_fix \
-		"${ddir}"/makefile \
-		"${ddir}"/fribidi_019 \
-		"${ddir}"/hyphen_minus \
-		"${ddir}"/term_size_get \
-		"${ddir}"/type_fix \
-		"${ddir}"/cast_fix
-}
+	"${WORKDIR}"/debian/patches/try_utf8_fix
+	"${WORKDIR}"/debian/patches/makefile
+	"${WORKDIR}"/debian/patches/fribidi_019
+	"${WORKDIR}"/debian/patches/hyphen_minus
+	"${WORKDIR}"/debian/patches/term_size_get
+	"${WORKDIR}"/debian/patches/type_fix
+	"${WORKDIR}"/debian/patches/cast_fix
+)
 
 src_compile() {
 	tc-export CC
@@ -41,7 +40,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${PN}
-	doman ${PN}.1
+	dobin bidiv
+	doman bidiv.1
 	dodoc README WHATSNEW "${WORKDIR}"/debian/changelog
 }
diff --git a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch b/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
deleted file mode 100644
index 0223329cbe5e..000000000000
--- a/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- bidiv.c
-+++ bidiv.c
-@@ -172,7 +172,7 @@
- 		}
- #ifndef TRY_UTF8
- 		in[len]='\0';
--		fribidi_iso8859_8_to_unicode(in, unicode_in);
-+		fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_ISO8859_8, in, unicode_in);
- #endif
- 
- 		/* output the line */
-@@ -201,10 +201,10 @@
- 			rtl_line=0;
- 
- 		if(out_utf8)
--			fribidi_unicode_to_utf8(unicode_out, len,
-+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
- 					     out);
- 		else
--			fribidi_unicode_to_iso8859_8(unicode_out, len,
-+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
- 						     out);
- 		/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
- 		   entire width, we need to pad with spaces. Maybe in the
---- Makefile
-+++ Makefile
-@@ -1,16 +1,14 @@
- PREFIX=/usr/local
- BIN_DIR=$(PREFIX)/bin
- MAN_PATH=$(PREFIX)/man
--CC_OPT_FLAGS=-O2 -Wall
- 
--
--CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
--LDFLAGS=`fribidi-config --libs`
-+CFLAGS+=`pkg-config fribidi --cflags` -Wall
-+LIBS=`pkg-config fribidi --libs`
- 
- all: bidiv
- 
- bidiv: bidiv.o
--	$(CC) -o bidiv bidiv.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
- 
- clean:
- 	rm -f bidiv.o *~