gentoo resync : 02.03.2018

7 files changed, 4 insertions, 202 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 8a006cf85c63..e6c2eb0fad15 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 16cbe39c11d6..9039f9d4b6f4 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -4,8 +4,5 @@ AUX cdrdao-1.2.3-lame-3.100.patch 737 BLAKE2B 63765fe4b6a689705bc9eaf08ce823e3b8
 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
 DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
-EBUILD cdrdao-1.2.3-r1.ebuild 1225 BLAKE2B 7a5d890a09f3a5995d41c8c1c526ea1f8953cb3b522257e7e99b3475dca955c2cdcbb12f573821ee5d868e0c6a8a786523df8e59ae1df90e55e6f636a0cbdf4b SHA512 064815cc5707df6b5df51ebae19ad2307f51718880aa7e34a96cd9debd29cee48dd567c4cd76972b1a3094a3e41d2e6a3e8b221daf6bfad74aea810a70c7bc31
-EBUILD cdrdao-1.2.3-r2.ebuild 1488 BLAKE2B af92997633e6fed178f50c7bd42ffc636875e59e55e4ae4425b06f258551aa2a7f349c30ff063db6ac606de01e6534c5353c25c79b707b3725f0099f2413cd40 SHA512 90fc2a859b0c426eb055c63331f2f704e870cfe5df9d6c35a0ebbe063d87639cca8b183e2b1b4a92d359b816f5f47519641c22353171bed293094cfa22312187
-EBUILD cdrdao-1.2.3-r3.ebuild 1431 BLAKE2B 51e0bd15ea6471255ec6847cd36d48c3de1d92c1a483ae4c46cf3161b8b16e5656f0530b7aa14b7467ea4e49acb0b849c47042560fea28cab0574f34367c448e SHA512 0e890720a5a0b899fa1f1dd3289dfd73b95c199fb4ec7b8ab262428aef008dac771e55b2f19f7b4b5cc5465ccca6d8dfb6caa4838904a1c1e8dea380d39f13bd
-EBUILD cdrdao-1.2.3-r4.ebuild 1365 BLAKE2B 15f7e0c655dfa07f4a74f4d5d4c2a3cc1bf1c890b86be788f1f77324087d85e45f186cd4041cbff3df0d80dfff2e7b6667fe57888bd4c96d0a41ffd737373e57 SHA512 d313d5117a4ba54a9e3464aeb2f5e5e656dcedff2ab9ff062cf4dfa66d728fb2ea1524ca4c1b58e946110c9f30d129f6a2586507ce0486518ab955c5e3890126
-MISC metadata.xml 678 BLAKE2B d065904d63e9c6ccaa7a7d46f6c20b1051594c6ec18351307a3f59b3d94af52018238c849e6e30a8b886e44b770a091f13aa4fec75bb96c11023c2691287298c SHA512 5598ac76955fb431c81541c0cb1a4921cda0d835493434f54f9ea0bc2bd19cb20a0b625d4cf4cba99b19d34162cad80e0e8a4c641b508129e6f33a83f4a910fc
+EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
+MISC metadata.xml 590 BLAKE2B 1bbd0aa3df866bcc4c95e31b82e14d8329d5f2d8b6127694b6cd8acbd70590a48767e8f9d6e9839c96ec1bb30476708b26ece50e2ee98cb89faaca26b4b8d277 SHA512 039365c68647d7338fe71e313ff0aa2b423e5fc1151a9a151e0cf7c36b93ddf2c74a17d3f64e49304ca1bde011408e5442e66f4addd24d70142756fa928552dd
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
deleted file mode 100644
index 836672f12732..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-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 hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode mad vorbis"
-
-RDEPEND="virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	gcdmaster? (
-		dev-libs/libsigc++:2
-		>=dev-cpp/gtkmm-2.4:2.4
-		>=dev-cpp/libgnomeuimm-2.6:2.6
-		media-libs/libao
-		)
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-		)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-		)
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with gcdmaster xdao) \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
deleted file mode 100644
index b3f48258331e..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-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 hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode mad vorbis"
-
-RDEPEND="virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	gcdmaster? (
-		>=dev-libs/libsigc++-2.6:2
-		>=dev-cpp/gtkmm-2.4:2.4
-		>=dev-cpp/libgnomeuimm-2.6:2.6
-		media-libs/libao
-		)
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-		)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-		)
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc212.patch
-	epatch "${FILESDIR}"/${P}-unsigned-char.patch #569344
-}
-
-src_configure() {
-	# Make sure we use a sane default `ar`.
-	tc-export AR
-
-	# Fix building with latest libsigc++
-	append-cxxflags -std=c++11
-	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
-
-	econf \
-		$(use_with gcdmaster xdao) \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r3.ebuild
deleted file mode 100644
index 4cd70db0b683..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gcdmaster encode mad vorbis"
-
-RDEPEND="virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	gcdmaster? (
-		>=dev-libs/libsigc++-2.6:2
-		>=dev-cpp/gtkmm-2.4:2.4
-		>=dev-cpp/libgnomeuimm-2.6:2.6
-		media-libs/libao
-		)
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-		)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-		)
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}/${P}-glibc212.patch"
-	"${FILESDIR}/${P}-unsigned-char.patch"
-	"${FILESDIR}/${P}-ax_pthread.patch"
-	"${FILESDIR}/${P}-wformat-security.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 \
-		$(use_with gcdmaster xdao) \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
index 84c4f7794079..cc00a1346b4d 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r4.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
@@ -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/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 0981f4cab9a5..d31754f982bc 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -13,9 +13,6 @@
 	CD command line recording, ripping and copying tool.	Especially ISOs- and
 	bin/cue-files are handled very well.
 	</longdescription>
-	<use>
-		<flag name="gcdmaster">Enable building of gcdmaster application</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">cdrdao</remote-id>
 	</upstream>