gentoo resync : 24.12.2018

5 files changed, 77 insertions, 26 deletions

diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index b6ace0ecc2c3..b9fe1b28cc36 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,5 +1,7 @@
-AUX cdw-0.8.0-uclibc.patch 740 BLAKE2B d546a26870f9beba9b9c7471d94d5e3a5c9e23e88064356f06890683615e73651b3acf90b835b5fe2a3fa24c88cc24b28a471083a035d6b11e53ef76f067355d SHA512 1b2a1101037d7999f361b686685509745d71e953ce45dcd33cb52d73510ee684faaea1b6715627a2944068ebacf5130b9a881bbc73061714c4d1643233042c93
+AUX cdw-0.8.0-uclibc.patch 671 BLAKE2B 3bf516aa30dabdf8fa8df948628055b9bd0c0fe49997c7bcebad19c8ea385ae35d2dd7b46aea2cad8fe56331dfa17c536573fdc09adf6c0efbce02348f9833a2 SHA512 b9c696f8e95f3370b3d9e325dbd9f07958231943e56e3ce8500f4655efc9327af1231b8c156db6cf8a526f9c6c3e1ec53fb959b74f8e90bfbb6c55d845e85bd7
 DIST cdw-0.8.0.tar.gz 849851 BLAKE2B 395a8cf527c676da6056dd5b887625c2d6a7ac214651351e6412e846cb435c179785c406a9e4306a72c9a7982eb8e1a0600719ca481307a8efdee5da6e626089 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0
-EBUILD cdw-0.8.0.ebuild 638 BLAKE2B 84e0b4074f75b011d6e688229d9456d93254c2311fcb1c8f55654fe30e9ecdfcf5b8a1b22188b66e570dcd86e6fa03dd54ea8369700309aa874ffdc1be8be791 SHA512 eafd53379d69dd7f4755ebe950cd63100dd9dabe65983dbd82b332742868a4e764f16e93bd287293d3751a5703b24edd86f5d7f2f0cb78be948ebd9854324b82
-EBUILD cdw-9999.ebuild 728 BLAKE2B 27aec6e24d07a7709b3e243c30239708eab935b96d901a181006f08f929d5e5510f6ae6ed4dde4476d35e6fec825498934382c6cdab8c8f0faf8242316dad19c SHA512 201717df85037d106db0670b4ff528147851ed8e2502665484577f188b1164f7cfc99fd66c1e85d4f365a7b0bf63f98bc6a7e52b6988d741a596bbaee30f7599
+DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
+EBUILD cdw-0.8.0.ebuild 727 BLAKE2B 6f90feeb567f493714299b680768d0a115db30d0020e88a37187ab0748289a6c8dcc64c846019920bce21c8154942b1ad08ce84bb15999d3dea96b319d2d60aa SHA512 a91e425b9ce6f4d4045178359ef0f4db3baf8bcd9ca728a1bdd4103ffc78a3cafa0fd9db04b700a4c02c059a3149ee40d3c72b1778c16d71995f72de5635b426
+EBUILD cdw-0.8.1.ebuild 684 BLAKE2B 951a91e1d95be33a7b67472dda73250db359dd97258359c69e89337622536ca074e1188ba8f3fa5e998e3861829816885cbeb0bfc5642eabd9f8622e839bc0b8 SHA512 3b0fa3fde2e171823c81b53129252fbe448d8e4353549866f6d0db74822bdbeabd1d036bb895065340d7b4e0ee56d5aba5997648d44d56073dcdcda767123c6f
+EBUILD cdw-9999.ebuild 839 BLAKE2B d08609e2dd4d4a34b388d9c62ff65d0e4244d60597e507b405b0354e2c9f54c0e7555cc5f84f50d54d02a051129d3342b3babad69f9f8133f4aacd9bf9b332fe SHA512 270c68410afffa822a0ab785b297b97da44f7cfebf2f17335029bd5cbf4463b5dc4c1f2bf5bca5cbb9b6e64dd3463c3c8538b81e48fffe68dcbd3037c82a3dcc
 MISC metadata.xml 240 BLAKE2B 0afeda9a0f5f12f46f814e39da9b888116a752948c98603475a0745af8489c5c88b9ace8956a58c4d6699d382a05e683f2798867068e0c58a28c31ed8898d494 SHA512 ff094d0df1386eff97f6a48bd936826782717d38a8f51d4c1d06a066ce95b4ebe275ae23c7229d5bb7467c03a38fa85e23c04a7b65cbb89d8f3ef56a64dd1664
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
index 2bcc1069a8b0..e716ed75db54 100644
--- a/app-cdr/cdw/cdw-0.8.0.ebuild
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
@@ -11,17 +11,24 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-DEPEND="virtual/cdrtools
+RDEPEND="
+	virtual/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
+	sys-libs/ncurses:*[unicode]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uclibc.patch
+src_configure() {
+	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
 
 src_install() {
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
new file mode 100644
index 000000000000..fb8dc807d6e8
--- /dev/null
+++ b/app-cdr/cdw/cdw-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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="
+	virtual/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 68ab7c086d59..e1a1792a140d 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
 
-inherit autotools eutils cvs
+inherit autotools cvs toolchain-funcs
 
 MY_P=${PN}_${PV}
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
@@ -15,21 +15,29 @@ HOMEPAGE="http://cdw.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-DEPEND="virtual/cdrtools
+RDEPEND="
+	virtual/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
-
+	sys-libs/ncurses:*[unicode]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 S=${WORKDIR}/${ECVS_MODULE}
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
+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/files/cdw-0.8.0-uclibc.patch b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
index eedf7e13642b..a639e21713d9 100644
--- a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
+++ b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
@@ -1,5 +1,5 @@
---- cdw-0.8.0/src/main.c
-+++ cdw-0.8.0-uclibc/src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -44,7 +44,9 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -10,8 +10,8 @@
  #include <signal.h> /* sig_atomic_t */
  
  #include <dirent.h> /* PATH_MAX */
---- cdw-0.8.0/src/tasks/cdw_create_image.c
-+++ cdw-0.8.0-uclibc/src/tasks/cdw_create_image.c
+--- a/src/tasks/cdw_create_image.c
++++ b/src/tasks/cdw_create_image.c
 @@ -21,6 +21,7 @@
  
  #include <inttypes.h>
@@ -20,8 +20,8 @@
  
  #include "cdw_file_manager.h"
  #include "gettext.h"
---- cdw-0.8.0/src/utilities/cdw_utils.c
-+++ cdw-0.8.0-uclibc/src/utilities/cdw_utils.c
+--- a/src/utilities/cdw_utils.c
++++ b/src/utilities/cdw_utils.c
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>