Don't symlink include/mpc/ to include/mpcdec/ since it will break API detection in...

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index fde75ee18cd1fbb2b8ca0a31cf0f826d03c74467..2006d0411681e05329d121caf21980dad846fd8b 100644 (file)
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.52 2010/02/03 09:59:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.53 2010/03/05 22:49:54 ssuominen Exp $
+
+*musepack-tools-444-r1 (05 Mar 2010)
+
+  05 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +musepack-tools-444-r1.ebuild, musepack-tools-458.ebuild:
+  Don't symlink include/mpc/ to include/mpcdec/ since it will break API
+  detection in media-sound/moc. Block both libmpcdec and libmpcdecsv7.
 
   03 Feb 2010; Fabian Groffen <grobian@gentoo.org>
   musepack-tools-458.ebuild:

diff --git a/media-sound/musepack-tools/musepack-tools-444.ebuild b/media-sound/musepack-tools/musepack-tools-444-r1.ebuild
similarity index 72%
rename from media-sound/musepack-tools/musepack-tools-444.ebuild
rename to media-sound/musepack-tools/musepack-tools-444-r1.ebuild
index 8fddf3a9062f60eb7d8dcf73b0fe923f815b7eb3..14ac5d95b60925bde8ed8aedec1d301fa6bf83b5 100644 (file)
--- a/media-sound/musepack-tools/musepack-tools-444.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-444-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-444.ebuild,v 1.17 2009/10/01 16:09:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-444-r1.ebuild,v 1.1 2010/03/05 22:49:54 ssuominen Exp $
 
 inherit cmake-utils
 
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-libs/libcuefile-${PV}
-       >=media-libs/libreplaygain-${PV}"
-DEPEND="${RDEPEND}
-       !media-libs/libmpcdec"
+DEPEND=">=media-libs/libcuefile-${PV}
+       >=media-libs/libreplaygain-${PV}
+       !media-libs/libmpcdec
+       !media-libs/libmpcdecsv7"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
 
@@ -29,7 +29,6 @@ pkg_setup() {
 
 src_install() {
        cmake-utils_src_install
-       dosym mpc /usr/include/mpcdec || die "dosym failed"
        # Forgot to remove .svn directories from snapshot.
        rm -rf "${D}"/usr/include/mpc/.svn || die "rm -rf failed"
 }

diff --git a/media-sound/musepack-tools/musepack-tools-458.ebuild b/media-sound/musepack-tools/musepack-tools-458.ebuild
index 6bc7bd73f3b449b8e0a08c0135f7e126e39ae26f..75d2885a2116604563c6c31fe590b813b430ec7b 100644 (file)
--- a/media-sound/musepack-tools/musepack-tools-458.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-458.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-458.ebuild,v 1.4 2010/03/01 17:21:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-458.ebuild,v 1.5 2010/03/05 22:49:54 ssuominen Exp $
 
 inherit cmake-utils
 
@@ -18,6 +18,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 IUSE=""
 
 DEPEND=">=media-libs/libcuefile-${PV}
-       >=media-libs/libreplaygain-${PV}"
+       >=media-libs/libreplaygain-${PV}
+       !media-libs/libmpcdec
+       !media-libs/libmpcdecsv7"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )