gentoo resync : 03.01.2018

12 files changed, 96 insertions, 159 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 54642d4fcd05..818947874e92 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
index 4595f341925f..98f6e758fa74 100644
--- a/media-sound/aacgain/Manifest
+++ b/media-sound/aacgain/Manifest
@@ -1,8 +1,8 @@
+AUX aacgain-1.9-derefptr.patch 589 BLAKE2B ea9de1b305955769e04d75f7cc0dcfded111700b04f3cffef66678c2a41e49bf05b5551a4f70786bdd0dadc45d759686e17863ea659d1a05dc832bcc7d8bd955 SHA512 41c3ba1c989194f2e714dbfdf7078fd17a1a54bc886485e6ac2eb10a22baa30d7f0c31c10f3c27fc7167e1fc2d490d8cccccca40a832be8a2ad69f62efdd536b
 AUX aacgain-1.9-patch-dotdot.patch 620 BLAKE2B 9ccd0cb4034e6c4ff4145afb48448ee97ba071a63b65e8edf5772f00f308a91a02f4594c2e58d79d738ff3b57239de8596c0f5190b3bf6552a9835aac6463f46 SHA512 aaf0f22c584b0bf82f0982862ff72e9a8bd21c2057669bf6c374fa8f2272477c83cb7fdf77624482b46dc59932b4a161d36220c09d7ca7fa5a5a8a5f252e5537
 DIST aacgain-1.9.tar.xz 52824 BLAKE2B ad3b3ffedf2a6831bb7a8563f6038fbfa140ba5e7eecbfd41e9e46ea814f222cb829ab6a6ae58ef658f293ba6e89989846f0fbef7cacccb328724801c18d8f13 SHA512 937c1c66feb13dfa869b8868415168c06b20e552577328957230a09b11f5e44ac53643da8e6fe91e476b54fe24c265a589c4a25dbde400f2fd43eebc5916f523
 DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
 DIST mp3gain-1_5_2-src.zip 129435 BLAKE2B 39ad12a09e58375c23602939097622fda0cb6b7487e95947d5443fce55f4d2163c15df619f96b1839acf99bba9ed8ad1990bab287e1392c30813d185d823d734 SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388
 DIST mp4v2-1.9.1.tar.bz2 432943 BLAKE2B 529ecc3ebd9192ab61febd0512704b5867abf29dc9755c5e61100522ebecc25189000886b152115c12fedbfbe5cc38bb36adb9281e6e60bbf43e86605432aae0 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8
-EBUILD aacgain-1.9-r1.ebuild 2020 BLAKE2B 17cc51968e122c0da7ca9d4d6fc709a629aff57508c99d878d668c450c38da2355b4637348e918ba850796d181377bd64be41449228998d1141e79bf87ef6616 SHA512 e5ec85e4cbb9568acd6a1be7c88bc71516247932df4d80013f1ffcf90ab98ff9bdafbd0e884dea3a6b618ecabfe35ab8f2ed408352984feea190f1a5eb828167
-EBUILD aacgain-1.9.ebuild 1989 BLAKE2B 477f1c651579c416a669a2f158e32d51084454a17b84b6b87956a2546e439caf7a88f4251795850212be5c5c66b35c5ea8da8d8a81b1d0199512cc0d413ae47c SHA512 cb9ac85128c4ca21d3176bf775d8838e988dbcb0024414dab81abb088ca96ed02e042d403ec09ee9d3b8a91c36df8bf030ce5ee8835691ca243d163b72c069ca
+EBUILD aacgain-1.9-r2.ebuild 2053 BLAKE2B 84ea0919e778c3380adeaf3c0d38a5f62130baf6685663e9bd0c399d462ec16c149c1cfbd84fbda45397326e57f7e5478a27f2fa659930df3371153b905c0e57 SHA512 5dd161a204bea4059173ea8a4c7d6e24a3b15fc1c8c53e7b855908839942cb92a6b3785d3cb7df93dc8112a9ec5905d257d2782ff97a33d1cd0db891d64bc4e1
 MISC metadata.xml 922 BLAKE2B a67adcc8e24f365e45bff633091b4c9c7f2b89cff71fec001e1164907040efacb46bb9b9b0beac965513d7e03c8e19cbf1c1cb0a0aedcbe1d021445f4f3df7e9 SHA512 66e05b9c17bf6c66bdcd0c26dec1f15e04c21b7d815df058739d969b6067026b15249bdd3d5813847030b5038fc5b15097479d2aafa60fa2fdf5fc3c2a21ece7
diff --git a/media-sound/aacgain/aacgain-1.9-r1.ebuild b/media-sound/aacgain/aacgain-1.9-r2.ebuild
index d278711d59b5..a08a2bfff469 100644
--- a/media-sound/aacgain/aacgain-1.9-r1.ebuild
+++ b/media-sound/aacgain/aacgain-1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
@@ -47,6 +47,7 @@ src_unpack() {
 PATCHES=(
 	${PN}/mp4v2.patch
 	"${FILESDIR}"/${P}-patch-dotdot.patch
+	"${FILESDIR}"/${P}-derefptr.patch
 )
 
 src_prepare() {
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
deleted file mode 100644
index d48172721789..000000000000
--- a/media-sound/aacgain/aacgain-1.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-FAAD2_PV="2.7"
-MP4V2_PV="1.9.1"
-MP3GAIN_PV="1.5.2"
-
-DESCRIPTION="AACGain normalizes the volume of music files using the Replay Gain algorithm"
-HOMEPAGE="http://aacgain.altosdesign.com/"
-SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	https://mp4v2.googlecode.com/files/mp4v2-${MP4V2_PV}.tar.bz2
-	mirror://sourceforge/mp3gain/mp3gain-${MP3GAIN_PV//./_}-src.zip
-	mirror://sourceforge/faac/faad2-${FAAD2_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS="${PN}/README"
-
-src_unpack() {
-	mkdir -p "${S}"
-	for X in ${A}; do
-		case "${X}" in
-			mp3gain*)
-				mkdir -p "${S}/${X%%-*}"
-				cd "${S}/${X%%-*}"
-				unpack "${X}"
-				;;
-			*)
-				cd "${S}"
-				unpack "${X}"
-				[ -d "${X%%-*}" ] || mv -f "${X%%-*}"-* "${X%%-*}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	sed -i -e 's:iquote :I:' faad2/libfaad/Makefile.am
-	sed -i -e 's:../\(mp4v2/\):\1:g' ${PN}/mp4v2.patch
-	sed -i -e 's:\(libmp4v2\|libfaad/libfaad\)\.la:README:g' \
-		-e 's:^\(autoreconf\|pushd\|popd\):# \1:g' aacgain/linux/prepare.sh
-
-	epatch ${PN}/mp4v2.patch
-	epatch "${FILESDIR}"/${P}-patch-dotdot.patch
-
-	cd "${S}/${PN}/linux"
-	sh prepare.sh || die "prepare failed!"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/faad2"
-	eautoreconf
-
-	cd "${S}/mp4v2"
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking"
-	local myconf2="${myconf} --disable-shared --enable-static"
-
-	cd "${S}/faad2"
-	econf ${myconf2} --without-xmms --without-mpeg4ip
-
-	cd "${S}/mp4v2"
-	econf ${myconf2} --disable-gch
-
-	cd "${S}"
-	econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}/faad2/libfaad"
-	emake
-
-	cd "${S}/mp4v2"
-	emake
-
-	cd "${S}"
-	emake
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "BACK UP YOUR MUSIC FILES BEFORE USING AACGAIN!"
-	ewarn "THIS IS EXPERIMENTAL SOFTWARE. THERE HAVE BEEN"
-	ewarn "BUGS IN PAST RELEASES THAT CORRUPTED MUSIC FILES."
-	ewarn
-}
diff --git a/media-sound/aacgain/files/aacgain-1.9-derefptr.patch b/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
new file mode 100644
index 000000000000..6973f36bf1be
--- /dev/null
+++ b/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
@@ -0,0 +1,11 @@
+--- aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:54:58.230117921 +0200
++++ aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:58:57.441883719 +0200
+@@ -345,7 +345,7 @@
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 0a3152eac7be..b9ab34706c82 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,5 @@
-DIST flacon-2.1.1.tar.gz 337500 BLAKE2B 0e199653da28eaf123e3b847eb37bca3e58bcf4ed541bcbb1cb92f23451506dd48b199b0cc565715da1ccdc3a1b294fcca04b431539c6f2a9a360d088321528b SHA512 ef145685770ce4e5cb5f09b42023b5f88feed90f9444dcdb7bb30839d4ee6a4526542b0c3a5595f2b43b99759c7ff6ff4d419b88780d1394baa3654163db20ec
 DIST flacon-3.1.1.tar.gz 431743 BLAKE2B 491919b31e0f19993c01c8a55145f1f6db7465e10112b7d3862ca2f66f15a534501248d682258fa944d0ac5de1d716c80a98f8329a4f62e22074dd397d9a03da SHA512 13b1abc2edba73e30c9a1b729650e8001a5b8de7e34fe2b599f28277c347539fb50679f8a0e608c87eb7feb1e05e26c7f71fbc3c696f0fa29ae8ae9e20e63cfd
-EBUILD flacon-2.1.1.ebuild 2517 BLAKE2B cdac24475d5531a88b7f3498801f55b5af35bfa9ac2b11df08816d5dfc175e7291150f1b5bf64f0a5e562e1e6f894f0884a633557a17a6a9bb5f8c9975c2f786 SHA512 df3251b54f9fc32d3188d135e7fa3b5d00ed1ee470d810abc5483cdf07bd2cb3752395b4e2f5ca190f5f1cf4222e082c815fde26924d7b56ce5bfe20166ade87
+DIST flacon-4.0.0.tar.gz 1294289 BLAKE2B 3afadc3545493558a5eadb7720509410fb448fed1e1fc5511f0ce477ea0e6e876d19e3038d5eb77191b449f730f50e6f1e3e4eacf546b064868863ed918acdee SHA512 64efc3369f11a7345d106a253873bcaf64ff0bbfb045e3554fecdc48a86ee5d150bef06643a5bf481d6e139a45a2bfdee91e730f9aa1354a4772f0d994297b78
 EBUILD flacon-3.1.1.ebuild 2611 BLAKE2B 4aa79f517e9519e72e0016e8223ab4d9cf594151e8659e7e995e7d9a466c40bfbd563fe9ab71d300c8c41f59d61219f8706fc2428e6c52f2cc312694cd739c09 SHA512 09e2ae615acc0d69861ef1eaf8ed6a45b5548a5fb09191ee4f32200d0b0ff61db90f2e7212636183b1d250fb1207ed4b5d041d17173b8a8c1e9a029e13ea6a24
+EBUILD flacon-4.0.0.ebuild 2451 BLAKE2B 0dd9d03c1dfc0507faed4a8bbc136eb1917fc0c85ad95c6727acafcd9e7d7228f4f074722bb9dacf9912ceb7f9ef9e7202526c9350441bd5aad8b8a361730d9c SHA512 6d5dbc2569092301b74e4cc5eb34781afd5f2f5f72ba3ad711d6f402dea5b6c60adab48d31110bf1dcd79f80357a187226ff7d66ef34328cb0ca656725b26b1c
 MISC metadata.xml 505 BLAKE2B 95e22c79d22d438696eaca5a304e1ac5660b049511a59bf6ed79aeedf9039b24fcd4de3ee3babc4c34b9e471a615ffcc1a36a9156350e430dc6fa6ca6bbd9923 SHA512 6979e575ee4e5230e7674fa77ece86fc27b983af03c1dfd938c3b3ca9e8f0e89f7ab2c99eaecdd1f512e70fd9d1004963669bfefa68176d40c6460272ac334dc
diff --git a/media-sound/flacon/flacon-2.1.1.ebuild b/media-sound/flacon/flacon-4.0.0.ebuild
index 451179740b77..70447e6e15f4 100644
--- a/media-sound/flacon/flacon-2.1.1.ebuild
+++ b/media-sound/flacon/flacon-4.0.0.ebuild
@@ -5,44 +5,47 @@ EAPI=6
 
 # Ignore rudimentary et, uz@Latn, zh_TW translation(s).
 PLOCALES="cs cs_CZ de es es_MX fr gl hu it ja_JP lt nb nl pl pl_PL pt_BR pt_PT ro_RO ru sr sr@latin tr uk zh_CN"
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
 
-inherit cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
+inherit check-reqs cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
 
 DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
 HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5 test"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
-COMMON_DEPEND="
+RDEPEND="
 	app-i18n/uchardet
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/shntool
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/linguist-tools:5
 	test? (
+		dev-qt/qttest:5
+		media-libs/flac
+		media-sound/mac
 		media-sound/shntool
-		virtual/ffmpeg
-		!qt5? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
+		media-sound/ttaenc
+		media-sound/wavpack
 	)
 "
 
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -60,10 +63,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_QT4="$(usex !qt5)"
-		-DUSE_QT5="$(usex qt5)"
-		-DTEST_DATA_DIR="${S}/tests/data/"
-		-DBUILD_TESTS="$(usex test 'Yes')"
+		-DBUILD_TESTS="$(usex test)"
 	)
 	cmake-utils_src_configure
 }
@@ -72,10 +72,6 @@ src_test() {
 	virtx "${BUILD_DIR}/tests/${PN}_test"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	elog "${PN} optionally supports formats listed below."
 	elog "(List will be empty if all extra packages are installed.)"
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 77b446b09f8b..6d4ea6a86270 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -1,6 +1,7 @@
-DIST pamix-1.4.1.tar.gz 15900 BLAKE2B 127467ae6cf2d380f78ab2ccd0e990a11ad1747adfe82411f05ba08403ebfc3d91ab10f931dfe46451755a350a830643abbf0165744eefa57ee4e3ed25f8f426 SHA512 2b33f384760f7706a10879ba51f027fd47e46f53c7a784feae0adf18f0badd7826a19a6ed75886a0c78afa115ca0725ddf7e319e55565f5b05081578310512d2
+AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
 DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
-EBUILD pamix-1.4.1.ebuild 776 BLAKE2B 8a1be6f76c7b186c6cc51dd7545fd86e8c47af2f465d21a8cbcec5a8216401397ee083dfe445f2eb25aaff85820cb7677f3b9cf90fa4d3eb497dc6f30dcfd438 SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72
-EBUILD pamix-1.5.ebuild 775 BLAKE2B 1189c963951039c25bce9b1cebfe01cbefa0f18fc683276be48c5c2cbaf17fd3b709c4a011ecf68434d317896e05b65f0a80eef8182e16dcba48b4799366abb9 SHA512 a550d7a541050ee64b1b391d5b5eda0ec3eab2b780b86066e22696599ea490ba561415915c403e66ec79284eed3133470f7b2aaf70d63d2aac703b136df26976
-EBUILD pamix-9999.ebuild 953 BLAKE2B 6abf863b3890234bd02acaef9df44655225fc586ccfa3dec890651a1ad16322ae1dcec7ea03242f69b181dae85bd6e64fb306e0d57b0169728d6790af6d9b75a SHA512 83498e726fa224d15c66a82f8fc36dc19274621565a89774dd714778f4d55ad8dd3e44db9e67914c390cac29ab5aeae3ec4f31093c6cd1da98211a69bd746661
+DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
+EBUILD pamix-1.5.ebuild 773 BLAKE2B 57ab9145fcb6998a9c03ae50109cb9a65dbdae0e2a7578dfdf8f3287deea336948774c37059bf4f6ae39cee5e71d66c1827eb0c09b6adf0c1377a9915be79865 SHA512 4041efab6a1ee3d34d39a8dfd2f4353516eec4dcb937d334c6e7113700a9ceb3cb82b8f29a834093732c9b97f37f92509313eefd38ecbe0cfbd779f9e90a963d
+EBUILD pamix-1.6.ebuild 850 BLAKE2B 845af8b7c774e977b9bebb96d83dd6dda7463c5a1f388bdb22283d8ed4a7a35e2da62a0eca3f1fe539158a9e8f54cafc13754e39a1a48490a5de1f05f2e1770a SHA512 ab2020f427bb9175b282ed59611de4b291372617afdc6d4c5b4106a593ee123d2673aba34e16e42aebce9da25be8b4adcc0f26842309474a5f36471e4220544c
+EBUILD pamix-9999.ebuild 794 BLAKE2B d0bbf1bb4375d6bbd7d50fcd344dd9175a3ea4519f85a328cfdfa4a233aee5c83723b7584b7ff8263f88f59370d7a2c2d30748123fc1d54e94c6efab98cb7dcd SHA512 c098a7473d9f3852a66a04d395cea32ac9a528ae6031e503f53db4487c952157fb26f17a4623c5cc0280d43ceea8d0a8ed9031600e1c41f05eed85f1fde7d212
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch b/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch
new file mode 100644
index 000000000000..c05977166797
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch
@@ -0,0 +1,34 @@
+From 90bd2ead3d88b5b24093cb76f9500b69bb0221dd Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 2 Jan 2018 21:24:05 +0100
+Subject: [PATCH] Use pkg-config to reliably find ncurses lib.
+
+Otherwise linking might fail when ncurses was built with separate tinfo lib.
+---
+ CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38605f2..c7da94e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,11 +17,14 @@ file(GLOB_RECURSE pamix_SRC
+ include_directories("include")
+ link_libraries("pulse" "pthread")
+ 
++find_package(PkgConfig REQUIRED QUIET)
+ IF (WITH_UNICODE)
+-    link_libraries("ncursesw")
++    pkg_search_module(NCURSESW REQUIRED ncursesw)
++    link_libraries(${NCURSESW_LDFLAGS})
+     add_definitions(-DFEAT_UNICODE)
+ ELSE ()
+-    link_libraries("ncurses")
++    pkg_search_module(NCURSES REQUIRED ncurses)
++    link_libraries(${NCURSES_LDFLAGS})
+ ENDIF ()
+ 
+ add_executable(pamix ${pamix_SRC})
+-- 
+2.16.0.rc0
+
diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild
index 1efd5b465935..261d33492f6d 100644
--- a/media-sound/pamix/pamix-1.5.ebuild
+++ b/media-sound/pamix/pamix-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
 else
 	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/PAmix-${PV}"
 fi
 
diff --git a/media-sound/pamix/pamix-1.4.1.ebuild b/media-sound/pamix/pamix-1.6.ebuild
index 05816380caad..dbeb0e57cc75 100644
--- a/media-sound/pamix/pamix-1.4.1.ebuild
+++ b/media-sound/pamix/pamix-1.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 SCM=""
 [[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit autotools ${SCM}
+inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="A PulseAudio NCurses mixer"
@@ -17,7 +17,7 @@ IUSE="+unicode"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
 else
-	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/PAmix-${PV}"
 fi
@@ -28,11 +28,13 @@ DEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig
 	${RDEPEND}"
 
-src_prepare() {
-	default
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}/${P}-ncurses_pkgconfig.patch"
+)
 
 src_configure() {
-	econf $(use_enable unicode)
+	local mycmakeargs=(
+		-DWITH_UNICODE="$(usex unicode)"
+	)
+	cmake-utils_src_configure
 }
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index acdf22771d05..a3da8fcc45fe 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,14 +28,6 @@ DEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig
 	${RDEPEND}"
 
-src_prepare() {
-	default
-
-	# ugly hackaround for split tinfo ncurses libs
-	sed '/link_libraries.*ncurses/s@\(")\)@" "tinfo\1@' \
-		-i CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_UNICODE="$(usex unicode)"