gentoo resync : 22.06.2019

3 files changed, 11 insertions, 38 deletions

diff --git a/media-sound/mp3check/Manifest b/media-sound/mp3check/Manifest
index f885d15ae6ab..3a4298b07d48 100644
--- a/media-sound/mp3check/Manifest
+++ b/media-sound/mp3check/Manifest
@@ -1,5 +1,5 @@
-DIST mp3check-0.8.4.tgz 71396 BLAKE2B fcc25d9dfc474753cf97ead6cde175c5d836ba99971490f8a9ade6726a7af70418339d2da580f402e8d708659a44c5af3024199a0854c66b90bd637f15dc0362 SHA512 383633e673ae124a7beccb4dc9fd4caeaedbddd7939284a7737f1d0f230424b24f1a967ad1d380800d4345e7bbf6f7796cdd9a9816251180e25723a2e24903b5
+AUX mp3check-0.8.7-fix-buildsystem.patch 351 BLAKE2B 434f3b8cc626576d8ae21b3b1683bd0af917e8dfd974acc51ff486e4d4ad4535897fe2c5d2dece4425ef83c3a4d1f4fa94c410a34ed3b9e4bf8bcd1b9cd2e02f SHA512 bfe66d2d4e1664a4e322452c919af28d6ef70b6dc3503ec904a508ab45abf6d97a3710ddbedfee7a379fa3c413914d1afcb9b0f2f7d62eb1f65d7c80e994ee14
+AUX mp3check-0.8.7-fix-c++14-operator-delete.patch 759 BLAKE2B 25d15e48f7ca1b7e6d7e153f37b66d5feb5e77a5b65aa84fc3bff67979b7cd36c580201bd47b95f28f989ad54c3b295b87b0960099d0826f7ed97cb48248b017 SHA512 e97d139bfefa737ef05c177760df0b255991dcdc97675efe7092383721d6a71323baec23e7afcede6b3beebd4d9b954245c04ff84a28b8f33135162d8a251e8e
 DIST mp3check-0.8.7.tgz 71629 BLAKE2B 2ba73374fd9935b39aeca8f9a1e72e95d449309fed8e667b15808a548e34a75d71d811b725654bc590e8ada0f2a65f29b8f8174d614a8626e77281c0ea322eb5 SHA512 5b5c9bde0cc7fd9dc02de53e4ccc3e403001547c06121be57f8f693b9224302d24f0c84f928b329b0f69c67dd4fb51fa3b60368f57a9446476d8344417bd09fd
-EBUILD mp3check-0.8.4.ebuild 549 BLAKE2B 50f08fde2e6061700188c497ff9bf9cabbe4496e5914ba97fdb704ecfccb2aa648abdd03d0ce88583f483573e4a36a1eca7b0a5279f1394492cb7ad5abb39df1 SHA512 e208519149247b01b282fcbca17475315d3ae491fd075bb0988630db24b090f0abdf452bce4417f0c0774e2368118ffcfc3e403ac30df9fedcc65a822cff7ac2
-EBUILD mp3check-0.8.7.ebuild 749 BLAKE2B bb06bd0fae693aa612d5a4562a52dbe11d25e7f9798b3079f3990177fcd9c9036cf88ffb34ebb4b589a9a6d857a66925b32a1d41bf98aa3c2bc7b1972b26c0bc SHA512 4948fe0313a7a932fb3716411e09b7a5838d53feff15a1e107ae12efdb4e09dde448518a3ae8e906d609a5e6b75c88b17864b09ffc7c91db16c38df2db684be1
+EBUILD mp3check-0.8.7.ebuild 751 BLAKE2B 2dbeb155b1cf77f3e8b1cfd22689b6e2fcaf81b7eb965ccd6849dd86c08fb7e5dabb4e4d7a4802df2cd3374edc699d63c244eb9453f093dae0179388392ee859 SHA512 fc27a1640825ccfe7d889b996c15beb0ef9d1e42fc862b0bd598a13b3df7fead4f68aef42c44077a355e217808fb2cb4e7db3f2d25a4d7566d550ff9112e5604
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3check/mp3check-0.8.4.ebuild b/media-sound/mp3check/mp3check-0.8.4.ebuild
deleted file mode 100644
index 98d0ca55455c..000000000000
--- a/media-sound/mp3check/mp3check-0.8.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
-HOMEPAGE="http://jo.ath.cx/soft/mp3check/index.html"
-SRC_URI="http://jo.ath.cx/soft/mp3check/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "/^WARN/s/-g//" Makefile || die
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin mp3check
-}
diff --git a/media-sound/mp3check/mp3check-0.8.7.ebuild b/media-sound/mp3check/mp3check-0.8.7.ebuild
index ee78058978c7..97e7d314e0c2 100644
--- a/media-sound/mp3check/mp3check-0.8.7.ebuild
+++ b/media-sound/mp3check/mp3check-0.8.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
@@ -11,20 +12,18 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-src_prepare() {
-	sed -i -e '/^WARN/s:-g::' Makefile || die
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.7-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-0.8.7-fix-c++14-operator-delete.patch
+)
 
 src_configure() {
 	# tfiletools.h:59:50: warning: dereferencing type-punned pointer will break
 	# strict-aliasing rules [-Wstrict-aliasing]
 	append-cxxflags -fno-strict-aliasing
-}
 
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
+	tc-export CXX
 }
 
 src_install() {