[gentoo-commits] repo/gentoo:master commit in: media-sound/musepack-tools/files/, media-sound/musepack-tools/

[Andreas Sturmlechner]

commit:     fcbf78674e63023e1e657a9c3a95df7978acff5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 20:11:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 20:12:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcbf7867

media-sound/musepack-tools: EAPI-6 bump, https

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 .../musepack-tools/files/musepack-tools-465-gentoo.patch |  8 ++++----
 media-sound/musepack-tools/musepack-tools-465-r1.ebuild  | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index a93b5ebddad..51df2991074 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -15,10 +15,6 @@
  
  add_definitions(-DFAST_MATH -DCVD_FASTLOG)
@@ -11,8 +11,8 @@
  add_subdirectory(libmpcdec)
  add_subdirectory(libmpcpsy)
  add_subdirectory(libmpcenc)
---- libmpcdec/CMakeLists.txt
-+++ libmpcdec/CMakeLists.txt
+--- a/libmpcdec/CMakeLists.txt
++++ b/libmpcdec/CMakeLists.txt
 @@ -1,7 +1,22 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
  if(SHARED)

diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index f4f7e4eb510..ebfe9885e1a 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 # svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
 # tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
 
 DESCRIPTION="Musepack SV8 libraries and utilities"
-HOMEPAGE="http://www.musepack.net"
+HOMEPAGE="https://www.musepack.net"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
@@ -16,10 +17,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
+DEPEND="
+	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
 	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7"
-DEPEND="${RDEPEND}"
+	!media-libs/libmpcdecsv7
+"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )