gentoo new year resync : 01.01.2021

4 files changed, 12 insertions, 78 deletions

diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 885e5c578c18..53af1258d6a5 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,8 +1,6 @@
-AUX C99-fix.patch 581 BLAKE2B b32c33cf78b2cdd290b1c9f74425acf43b1000d235032a8286d6363e0305f7d9cc1f10fa8d18ea853b813b97de0763b51fca9c9c1493ac621091c37f4603bbaf SHA512 4bcef29b0f4ab5d7e575a7637a62bdb2309ee6e1ac6fd5d1402433c065f0495351b2f30258b0a7b6bb77c68ac18ab6e2c0d359c10d19562f6f08424aa2ca6eeb
+AUX dwdiff-2.1.3-C99-fix.patch 581 BLAKE2B b32c33cf78b2cdd290b1c9f74425acf43b1000d235032a8286d6363e0305f7d9cc1f10fa8d18ea853b813b97de0763b51fca9c9c1493ac621091c37f4603bbaf SHA512 4bcef29b0f4ab5d7e575a7637a62bdb2309ee6e1ac6fd5d1402433c065f0495351b2f30258b0a7b6bb77c68ac18ab6e2c0d359c10d19562f6f08424aa2ca6eeb
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-DIST dwdiff-2.1.2.tar.bz2 79282 BLAKE2B c938c9684d6ee1abacd77c1570b88157548e217e1837758f6c45266e29abc3857c6d4275d72126c29cc361e484722fe1d8c85a3714ac909b35a06d8390fb6506 SHA512 e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
 DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
 EBUILD dwdiff-2.1.1.ebuild 826 BLAKE2B 56666408fce2fa065675d12e372b29601281b5c7ea1f7fa0a677ade24f843bdb863d5b5727cba9144352137e6007dde190702d67fb6822b69178ea79feeded01 SHA512 d3d7c79ead64fd11fa55a134d7027295bcabe0e5419c1fdad3c35c490d2f6dc9513cd40498db1e05dec6131d26ba44fbb8fa28f46c54f815fbdf827078292817
-EBUILD dwdiff-2.1.2.ebuild 898 BLAKE2B 3e5d049d08ea81929edf87fce2cef1dced4e121466d6b9b3edb3222d036e0c64001762b691dd800351df1fe643f3eb6b6501eb3d212de80d6c1a6134715291a9 SHA512 3103653d4df9ffeeeb31a86c2d9a2930297b036c87f8a8444ad43acf091a105f83b181d6421a9841cd38e85a5199b3ddad708167a78e592de18734b68ac55ebe
-EBUILD dwdiff-2.1.3.ebuild 896 BLAKE2B 39fa74da91142ba33468846731f4274a0df13177ea9f5fd8fff8bda1fb4c1b831ef7f2eed976e294cb69de3aefe2904f6890cfb3af52844114901cbc61eff254 SHA512 5c019fca8b0a81583c79d192c6d4e476af5930559bf3241b7088df9469671c2ae2678d80315877c698a8acbd81008062f637cea317d8ef96eba394b7a539791b
+EBUILD dwdiff-2.1.3.ebuild 773 BLAKE2B 5cde752bb3161f0e68e7615035fe8e3f2d3d94ad32bbf5caec79182044ee8208fe7f4206ceecb41073bd0e56c321a77f5e3608c968fdf8b7b1c04094f0284dbd SHA512 0eb14e8b0efa94d82cb6442870c4ab510ac7270493d975d3eee0b2b874a0ffbaf62f5dac5e65600e4c7f9626bbe9dbde411ccf7e4bbb91854ccd70c3bf2eae3f
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.2.ebuild b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
deleted file mode 100644
index 5c70c554fffb..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/diffutils"
-
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/C99-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die "./configure error"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
index bb6ab9abc95d..973e44885e76 100644
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
@@ -11,41 +11,28 @@ SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="nls"
 
-CDEPEND="dev-libs/icu:="
-
 RDEPEND="
-	${CDEPEND}
+	dev-libs/icu:=
 	sys-apps/diffutils"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/C99-fix.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
+	sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
 }
 
 src_configure() {
 	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die "./configure error"
+		--prefix="${EPREFIX}"/usr \
+		$(use_with nls gettext) || die
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
index 9d6d9ae2bca5..9d6d9ae2bca5 100644
--- a/dev-util/dwdiff/files/C99-fix.patch
+++ b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch