gentoo resync : 24.12.2018

14 files changed, 79 insertions, 768 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index a883173f1f16..b49a12aa3edf 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 14859b3d4144..a57b6d96a876 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,12 +1,5 @@
-AUX cdrdao-1.2.3-ax_pthread.patch 16862 BLAKE2B 657da0dd5107302c97b2eb2096e61326d4aacfab3c7adf881ae40fde1b6bf0ede3860105f117b2d0b29966aeed3e7002ad8ed12edcc5ae01b663eddd7b7ab5f3 SHA512 ae881b74fbf8ae80ad1f5742bc57034f8edf99bd8972b69202d026a8df5b6645710f7b96fef85469c34a72ee4d0fda3d48abe3dce9585de65a2ba66992195f00
-AUX cdrdao-1.2.3-glibc212.patch 260 BLAKE2B 6f84d32fc4b3e2254c61453f6e0a77c99b6fb5de7622ab1ce444348f9ae9fccde3450023421ef54a55e248b8280b1177373b632abb543908c6d728d2ee66b03b SHA512 3954d77f301beb1063292000f7f0bc07b1f1f8908bbc7dc31717e3ad0afbe51e398157edff943c8679155000e6f494e396527b02419191036bdfcd549f94d04d
-AUX cdrdao-1.2.3-lame-3.100.patch 737 BLAKE2B 63765fe4b6a689705bc9eaf08ce823e3b8e0f004d1d5141c65d133e743c58b52bfcd599e950d6114450f12230b3c932a76ae903a54c2d1a77ffe803654af52a8 SHA512 bf6aa3cba34317c87a008c2c6b698be51a7e544a28bb6f7d5d42719a71e78e08903a89e7544ffd54b8d7d9d01d1f996e6d599263f0f10a4f043e33b1b45e8913
-AUX cdrdao-1.2.3-unsigned-char.patch 1119 BLAKE2B e5e52f03541d77740dd4a61f6b275e2f6edf0045c1671539745d42b60c11fda623e3b983801efa6979bdea1fdefad23293d2156ebbce37d7fdf39d20eb7f98f1 SHA512 77227662a86f17a10841e4b3085d9c40067f7a1c46694e188371018e200ec8bd94ae2fdd86143bba9cc345211abfdaf197e4aa2dd8cb1b1749b954ef70055cf2
-AUX cdrdao-1.2.3-wformat-security.patch 6279 BLAKE2B dabab6d2575e24b5bfcf690daa634cfbd795d18930e03fc9acfcf630408fcb6e60af077053a577507725365a23083c273f43f5efea65f8c58189279085a2e472 SHA512 aff829cf227658ac1a11975c818385999ee91582f239bd70ad440021cd08554cf80c29470683f55ca9d50aef05e33b326e853ba022ecfa9e7eae84fb4c51acd3
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
-DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
-EBUILD cdrdao-1.2.4.ebuild 1290 BLAKE2B 41b676feef649573584a4e36cb0948790554b80bd600ed363c71141af40cd39123adfcb7e7b00e903b56eed0166c85edbbfbc4ac01d46e4cc5bd708ae3e923d3 SHA512 2fcb96514e0c9719bed727a44a74928a35b425b2e81bf518aed70b289756862343002bda5a2b9d5646937f5977c13849677eb2db8456711686bdbfc8390dd982
+EBUILD cdrdao-1.2.4.ebuild 1289 BLAKE2B 3c0dabf1b62adf469d1de919d2d28d2ecb7c8ebf9d9a3dc14b2dc48fd28a2ddad426b1663526bd16dea4be778c9f7227cb23bc972efcd4128b554dd3f44a1c78 SHA512 5e999168da00262af7e73803f70724e3f397fe3b48ed70c99011a350767197f7341b4c0b93f7c948c647251b15058edc968e7ea1cbf875660570c971bba4b4d8
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
deleted file mode 100644
index cc00a1346b4d..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-if [[ ${PV/*_rc*} ]]
-then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="encode mad vorbis"
-
-COMMON_DEPEND="
-	virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-	)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc212.patch"
-	"${FILESDIR}/${P}-unsigned-char.patch"
-	"${FILESDIR}/${P}-ax_pthread.patch"
-	"${FILESDIR}/${P}-wformat-security.patch"
-	"${FILESDIR}/${P}-lame-3.100.patch"
-)
-
-S="${WORKDIR}/${P/_}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Fix building with latest libsigc++
-	append-cxxflags -std=c++11
-	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
-
-	econf \
-		--without-xdao \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index dcf0167925a8..c62238f3ea1c 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
deleted file mode 100644
index c20a73dd64a6..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
-to CFLAGS, CXXFLAGS and LIBS.
-Also use AM_PROG_AR to detect proper ar
-See also: https://bugs.gentoo.org/show_bug.cgi?id=548004
-
---- cdrdao-1.2.3/configure.ac
-+++ cdrdao-1.2.3/configure.ac
-@@ -2,6 +2,7 @@
- AC_REVISION($Revision: 1.25 $)dnl
- 
- AC_INIT(cdrdao, 1.2.3)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_SRCDIR(dao/main.cc)
- AM_INIT_AUTOMAKE
-@@ -32,7 +33,7 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_CHECK_PROG(AR,ar,ar)
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- 
-@@ -113,7 +114,10 @@
- fi
- 
- if test "$use_pthreads" = yes; then
--  AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
-+  AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
-+  LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
-+  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+  CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
- 
-   if test "$have_pthread_std" = yes; then
-     AC_DEFINE(USE_POSIX_THREADS,1,"")
---- cdrdao-1.2.3/m4/ax_pthread.m4
-+++ cdrdao-1.2.3/m4/ax_pthread.m4
-@@ -0,0 +1,332 @@
-+# ===========================================================================
-+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also link it with them as well. e.g. you should link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threads programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 21
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test x"$ax_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case ${host_os} in
-+        solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+        ;;
-+
-+        darwin*)
-+        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# Clang doesn't consider unrecognized options an error unless we specify
-+# -Werror. We throw in some extra Clang-specific options to ensure that
-+# this doesn't happen for GCC, which also accepts -Werror.
-+
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-+save_CFLAGS="$CFLAGS"
-+ax_pthread_extra_flags="-Werror"
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-+                  [AC_MSG_RESULT([yes])],
-+                  [ax_pthread_extra_flags=
-+                   AC_MSG_RESULT([no])])
-+CFLAGS="$save_CFLAGS"
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+        case $flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $flag])
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                if test x"$ax_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$flag])
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+                        static void routine(void *a) { a = 0; }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+                [ax_pthread_ok=yes],
-+                [])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = xyes; then
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+        AC_MSG_CHECKING([for joinable pthread attribute])
-+        attr_name=unknown
-+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                           [int attr = $attr; return attr /* ; */])],
-+                [attr_name=$attr; break],
-+                [])
-+        done
-+        AC_MSG_RESULT([$attr_name])
-+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-+                               [Define to necessary symbol if this constant
-+                                uses a non-standard name on your system.])
-+        fi
-+
-+        AC_MSG_CHECKING([if more special flags are required for pthreads])
-+        flag=no
-+        case ${host_os} in
-+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-+            osf* | hpux*) flag="-D_REENTRANT";;
-+            solaris*)
-+            if test "$GCC" = "yes"; then
-+                flag="-D_REENTRANT"
-+            else
-+                # TODO: What about Clang on Solaris?
-+                flag="-mt -D_REENTRANT"
-+            fi
-+            ;;
-+        esac
-+        AC_MSG_RESULT([$flag])
-+        if test "x$flag" != xno; then
-+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+        fi
-+
-+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+            [ax_cv_PTHREAD_PRIO_INHERIT], [
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        # More AIX lossage: compile with *_r variant
-+        if test "x$GCC" != xyes; then
-+            case $host_os in
-+                aix*)
-+                AS_CASE(["x/$CC"],
-+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                  [#handle absolute path differently from PATH based program lookup
-+                   AS_CASE(["x$CC"],
-+                     [x/*],
-+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                ;;
-+            esac
-+        fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
---- cdrdao-1.2.3/m4/gconf-2.m4
-+++ cdrdao-1.2.3/m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
deleted file mode 100644
index c37fd5d0c37d..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/332237
-
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc
-@@ -30,6 +30,7 @@
- #include <asm/param.h>
- #include <scsi/scsi.h>
- #include <scsi/sg.h>
-+#include <sys/stat.h>
- 
- #include "ScsiIf.h"
- #include "sg_err.h"
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
deleted file mode 100644
index c712de2394c7..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/utils/toc2mp3.cc
-+++ b/utils/toc2mp3.cc
-@@ -143,8 +143,8 @@
- 
-   message(0, "LAME encoder version: %s", get_lame_version());
-   message(0, "Supported bit rates: ");
--  for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) {
--    message(0, "%d ", bitrate_table[1][i]);
-+  for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) {
-+    message(0, "%d ", lame_get_bitrate(1, i));
-   }
-   message(0, "");
- }
-@@ -238,8 +238,8 @@
-   lame_global_flags *lf;
-   int bitrateOk = 0;
- 
--  for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) {
--    if (bitrate == bitrate_table[1][i])
-+  for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) {
-+    if (bitrate == lame_get_bitrate(1, i))
-       bitrateOk = 1;
-   }
- 
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch
deleted file mode 100644
index 18c60830ba30..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/69344
-https://sourceforge.net/p/cdrdao/patches/26/
-
-patch by qbt937@gmail.com
-
---- a/dao/CdrDriver.cc
-+++ b/dao/CdrDriver.cc
-@@ -495,7 +495,7 @@
-   0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
- };
- 
--char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
-+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
- 
- 
- /* Maps a string to the corresponding driver option value 
---- a/dao/CdrDriver.h
-+++ b/dao/CdrDriver.h
-@@ -440,7 +440,7 @@
-   bool fullBurn_;
- 
-   static unsigned char syncPattern[12];
--  static char REMOTE_MSG_SYNC_[4];
-+  unsigned static char REMOTE_MSG_SYNC_[4];
- 
-   static int speed2Mult(int);
-   static int mult2Speed(int);
---- a/xdao/CdDevice.cc
-+++ b/xdao/CdDevice.cc
-@@ -255,10 +255,10 @@
- 
- bool CdDevice::updateProgress(Glib::IOCondition cond, int fd)
- {
--  static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
-+  unsigned static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
-   fd_set fds;
-   int state = 0;
--  char buf[10];
-+  unsigned char buf[10];
-   struct timeval timeout = { 0, 0 };
- 
-   if (process_ == NULL)
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch
deleted file mode 100644
index c5cfad840c15..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Fix -Werror=format-security errors
-Also fix incorrect printf() format specifiers
-https://bugs.gentoo.org/show_bug.cgi?id=520988
-
-* gen.c: In function 'genHdr':
-* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security]
-
---- cdrdao-1.2.3/pccts/antlr/bits.c
-+++ cdrdao-1.2.3/pccts/antlr/bits.c
-@@ -574,13 +574,13 @@
- 	else
- 		fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
- 	if ( name!=NULL ) {
--		fprintf(ErrFile, "SetWordType %s%s[%d] = {",
-+		fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
- 				name,
-                 suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
-+		fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
-@@ -642,20 +642,20 @@
- 	esetnum++;
- 
- 	if ( name!=NULL ) {
--		fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
-+		fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
- 				CurrentClassName,
- 				name,
- 				suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
- 				CurrentClassName,
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
-+		fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 
-@@ -788,7 +788,7 @@
- 
- 	/* Build constructors */
- 	fprintf(Parser_c, "\n%s::", CurrentClassName);
--	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
-+	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
- 						CurrentClassName,
- 						(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
- 						OutputLL_k,
-@@ -913,7 +913,7 @@
- #ifdef DUM
- 	if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
--	fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
- 	if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
- 	fprintf(ErrFile, "#include \"antlr.h\"\n");
- 	if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
---- cdrdao-1.2.3/pccts/antlr/fset2.c
-+++ cdrdao-1.2.3/pccts/antlr/fset2.c
-@@ -2210,7 +2210,7 @@
-       if (p->ntype != nToken) continue;
-       tn=(TokNode *)p;
-       if (depth != 0) fprintf(stdout," ");
--      fprintf(stdout,TerminalString(tn->token));
-+      fprintf(stdout,"%s",TerminalString(tn->token));
-       depth++;
-       if (! MR_AmbAidMultiple) {
-         if (set_nil(tn->tset)) {
---- cdrdao-1.2.3/pccts/antlr/gen.c
-+++ cdrdao-1.2.3/pccts/antlr/gen.c
-@@ -159,7 +159,7 @@
- #define gen6(s,a,b,c,d,e,f)	{tab(); fprintf(output, s,a,b,c,d,e,f);}
- #define gen7(s,a,b,c,d,e,f,g)	{tab(); fprintf(output, s,a,b,c,d,e,f,g);}
- 
--#define _gen(s)			{fprintf(output, s);}
-+#define _gen(s)			{fprintf(output, "%s", s);}
- #define _gen1(s,a)		{fprintf(output, s,a);}
- #define _gen2(s,a,b)	{fprintf(output, s,a,b);}
- #define _gen3(s,a,b,c)	{fprintf(output, s,a,b,c);}
-@@ -3911,7 +3911,7 @@
- 	}
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */
-       _gen("#define zzTRACE_RULES\n");  /* MR20 */
-@@ -4125,7 +4125,7 @@
- 	if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
-       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
---- cdrdao-1.2.3/pccts/antlr/lex.c
-+++ cdrdao-1.2.3/pccts/antlr/lex.c
-@@ -706,7 +706,7 @@
- /* MR26 */			if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break;
- /* MR26 */		}
- /* MR26 */	}
--/* MR26 */	fprintf(output,strBetween(pSymbol, t, pSeparator));
-+/* MR26 */	fprintf(output,"%s",strBetween(pSymbol, t, pSeparator));
- 
-     *q = p;
-     return (*pSeparator  == 0);
-@@ -771,7 +771,7 @@
- 				  &pValue,
- 				  &pSeparator,
- 				  &nest);
--	fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+	fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- }
- 
- /* check to see if string e is a word in string s */
-@@ -852,9 +852,9 @@
- 					  &pSeparator,
- 					  &nest);
- 		fprintf(f,"\t");
--		fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+		fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- 		fprintf(f," ");
--		fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator));
-+		fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator));
- 		fprintf(f,";\n");
-     }
- 	fprintf(f,"};\n");
---- cdrdao-1.2.3/pccts/antlr/set.c
-+++ cdrdao-1.2.3/pccts/antlr/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.3/pccts/dlg/set.c
-+++ cdrdao-1.2.3/pccts/dlg/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.3/pccts/h/set.h
-+++ cdrdao-1.2.3/pccts/h/set.h
-@@ -55,7 +55,7 @@
- /* make arg1 a set big enough to hold max elem # of arg2 */
- #define set_new(a,_max) \
- if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
--        fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
-+        fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \
-         (a).n = NumWords(_max);
- 
- #define set_free(a)									\
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>