gentoo resync : 28.04.2021

4 files changed, 7 insertions, 41 deletions

diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 913da6f24a7e..33776894cd52 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,6 +1,5 @@
 AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B 21f23121e6a768553ba716406f5f6a85f2439ae89f72d3c544be6da81804966a2df259c22470608a50183afbff0dc3e612eda3915481eb7bf696806a1a2da9df SHA512 4a638e201cc290a51223f48eaf82a46b05e50ace89bf881952ab0e76e66fa38077d84dd8359e8a133bd53774110f83b2d6949f349629cd1b7ee774e37d7f1f1d
-EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 7db6d921230dc4e4ef268c3d20399c428de148f5a1293593530f6f651736d3ecc9b6ae203d209a490890d4379e54e34f06e9857901e809bccf7108020bf79213 SHA512 4c0447b1797904aeb82b6137d1cb5be39a37510171dc5c7457ab796168ab6fa1a5560ad41fb3db5bde9420e415101e1b8eba12e2796f33e9c70f71f546a96bd6
-EBUILD cdw-9999.ebuild 849 BLAKE2B 90d2548a91d97e58118ab8d1bdd5ba50a36742c3ec35b8e163c3c35d46eff7d095c9a823a34c29cc1bff3447fe2c0234f6984da2ddaabbcbf55c1406ff81108d SHA512 a21229cfe723712d29c76746a3613c214ba6098ba13b3672096a2e756d203362fa4afb91c9a230d8e9f79328a3d59406159ed0713e9e3add5421f06ee6b2984f
+EBUILD cdw-0.8.1-r1.ebuild 772 BLAKE2B 4b06ec3921e5325cc14cc9927d4eeeaaf6306a12a073497387aa27010a349463d6c59f655ea9fd3699b8533bc4647a3b68c13359f7eafce0b7ad749a30864a15 SHA512 4ad309ca6f42f8ee3381b62be47b6536999bdd5fa83d52929d8144c2b64186ef4754d86163052538503b9905f5902c65e51bb90bd56b5feac6e40554afe184fb
+EBUILD cdw-9999.ebuild 849 BLAKE2B 1b3cec67333b8b9e3d252bb73e61bd3e29ded12e9e40ddb218a5a9776449ece9b199815408b0d5a257fc6c6e7c54b09f12e79dbe923397a235df39374a9f8e10 SHA512 69640a53715ab78d789874dc59eda68a433f39ed134da645fcf78e60a3b03e0007c3e38ceeb36e3aabd9f0c203cc12af8ac59b3bbcd3c067a9631e7a9cc86757
 MISC metadata.xml 476 BLAKE2B 37ecd4660e4f625f24214e7475616787265a19c2799e727834201fc9f4ab7d369a33d5e554e37daa4052c2250abd237edcc42fcf965a26a7827e1fa3cd85e23c SHA512 93c7458dd0ece6cc43f8cfed098a22d32e5032aaf92d48fa92f6be2c01f3a2c74f0edba1adcc035ed87e7a5d06be31197827432ea37e3df4ff70c7e8f17bb5d1
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index 317cc629ee9f..a059a13f7d59 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	app-cdr/cdrtools
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
deleted file mode 100644
index b4597335f09b..000000000000
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
-HOMEPAGE="http://cdw.sourceforge.net"
-SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses:*[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 1e52c861c848..0c9539fc86eb 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
-
 inherit autotools cvs toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"