Use transition package media-libs/libmpcdecsv7 instead of media-libs/libmpcdec for Musepack support.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 207 insertions, 2 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 59682006b09f..f3275002515a 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.224 2009/07/04 14:18:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.225 2009/07/26 15:16:34 ssuominen Exp $
+
+*k3b-1.0.5-r6 (26 Jul 2009)
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +k3b-1.0.5-r6.ebuild,
+  +files/k3b-1.0.5-libmpcdecsv7.patch:
+  Use transition package media-libs/libmpcdecsv7 instead of
+  media-libs/libmpcdec for Musepack support.
 
   04 Jul 2009; Brent Baude <ranger@gentoo.org> k3b-1.0.5-r5.ebuild:
   Marking k3b-1.0.5-r5 ppc64 for bug 272551
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 0a78913a2e47..926a9d9aa5ce 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,9 +1,11 @@
 AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
 AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21
 AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b828bfdd571eccb95936 SHA1 270f19b05ce7ca35aee0dd7009556fec9b66f90c SHA256 e99f6b309e6c20d085860c495c2aa9d34d6d69a864e0be11aac01e0b3a6ac67d
+AUX k3b-1.0.5-libmpcdecsv7.patch 1452 RMD160 a471ea325226e5ced0c84d6a9ea1f27dcbc21e17 SHA1 6f09c5a943416d1652f6a5ffa7bb99d3ee576dba SHA256 7c9061027d7c49f637d768b4a45039f0a653895929e35c16ea04a5da936f75a7
 AUX k3b-1.0.5-transcode-1.1.patch 1097 RMD160 08fcc3769803a400bc5d00be223b9f37fdc7e7d0 SHA1 68547f4e312dc30c6440bed126a4408716b78e13 SHA256 8317afcf5e26dd5195065f2eb3b062e41804c46afe9d3c906012dee6249290f4
 DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
 EBUILD k3b-1.0.5-r5.ebuild 3832 RMD160 13740138cbb9f2a24c0a0e09548918417b96e9b6 SHA1 3f2baf1dc9c9a0dc438cce39af25526cba176569 SHA256 8832b7c3b3832310d39ead980050edbc9c3df8b18b23c8797b7f8c217042c35f
-MISC ChangeLog 32718 RMD160 79d120a185eba026cbdf418b2f2968edab7b151c SHA1 78d569a85410e2e77550d4acaa5022e5d14201cd SHA256 dc45f29e4f0bc4ad73b1de4cf5f1f8044689634a679ba74039fe4fc0b19ad086
+EBUILD k3b-1.0.5-r6.ebuild 3881 RMD160 bdd58797cf6e6fa90ebc508836ecfa76058b2a3e SHA1 96f59d48791538f54dd638c5219eaa70050a4880 SHA256 17fb7f0a980198f601bc2bf3418597d25d154cecb1ea633b8c159d1b797e48d6
+MISC ChangeLog 32971 RMD160 ac2b655630a9976296370ffd1c00b562ae7065e6 SHA1 22fbf0ad4e216a2f5c1c7ec85e7d030ce0e35b4f SHA256 c675ec0348475165810f51fe4771183edee46aec85f8ff122a2a1d7bcbcf82cf
 MISC metadata.xml 265 RMD160 59c880c9c5efb9521978dbd903168505b105564a SHA1 c7ff34e4da0ae454589f8ae79f0c074915754879 SHA256 017dbf66cb3b0c2b77f42714c7544570e19f9605bb260245094b3678a6a34324
diff --git a/app-cdr/k3b/files/k3b-1.0.5-libmpcdecsv7.patch b/app-cdr/k3b/files/k3b-1.0.5-libmpcdecsv7.patch
new file mode 100644
index 000000000000..4128495d5ece
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-libmpcdecsv7.patch
@@ -0,0 +1,42 @@
+diff -ur k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in	2008-05-27 11:34:23.000000000 +0300
++++ k3b-1.0.5/configure.in	2009-07-26 18:07:39.000000000 +0300
+@@ -770,13 +770,13 @@
+ 
+   dnl - search for both the new and the old naming -
+ 
+-  KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+-  	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++  KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++  	AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+   		have_mpc=yes
+-		MPC_LIBS="-lmpcdec"
++		MPC_LIBS="-lmpcdecsv7"
+ 		AC_DEFINE(
+ 			MPC_HEADER_FILE, 
+-			<mpcdec/mpcdec.h>, 
++			<mpcdecsv7/mpcdec.h>, 
+ 			[The header to include for MPC decoding.])
+ 		],
+ 		[], [], [])
+diff -ur k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in k3b-1.0.5/plugins/decoder/musepack/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in	2008-05-27 11:23:36.000000000 +0300
++++ k3b-1.0.5/plugins/decoder/musepack/configure.in.in	2009-07-26 18:00:10.000000000 +0300
+@@ -14,13 +14,13 @@
+ 
+   dnl - search for both the new and the old naming -
+ 
+-  KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+-  	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++  KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++  	AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+   		have_mpc=yes
+-		MPC_LIBS="-lmpcdec"
++		MPC_LIBS="-lmpcdecsv7"
+ 		AC_DEFINE(
+ 			MPC_HEADER_FILE, 
+-			<mpcdec/mpcdec.h>, 
++			<mpcdecsv7/mpcdec.h>, 
+ 			[The header to include for MPC decoding.])
+ 		],
+ 		[], [], [])
diff --git a/app-cdr/k3b/k3b-1.0.5-r6.ebuild b/app-cdr/k3b/k3b-1.0.5-r6.ebuild
new file mode 100644
index 000000000000..604b9416a1b4
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.5-r6.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r6.ebuild,v 1.1 2009/07/26 15:16:34 ssuominen Exp $
+
+EAPI=2
+inherit kde eutils multilib
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${P/_}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa css dvd dvdr encode emovix ffmpeg flac hal mp3 musepack musicbrainz
+	sndfile vcd vorbis"
+
+COMMON_DEPEND="!<app-cdr/k3b-1.0.5-r5
+	media-libs/libsamplerate
+	media-libs/taglib
+	media-sound/cdparanoia
+	alsa? ( media-libs/alsa-lib )
+	dvd? ( media-libs/libdvdread )
+	encode? ( media-sound/lame )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	flac? ( media-libs/flac[cxx] )
+	hal? ( sys-apps/hal )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdecsv7 )
+	musicbrainz? ( media-libs/musicbrainz:1 )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${COMMON_DEPEND}
+	app-cdr/cdrdao
+	media-sound/normalize
+	virtual/cdrtools
+	dvdr? ( >=app-cdr/dvd+rw-tools-7 )
+	css? ( media-libs/libdvdcss )
+	encode? ( media-sound/sox
+		media-video/transcode[dvd] )
+	emovix? ( media-video/emovix )
+	vcd? ( media-video/vcdimager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop-entry.diff"
+	"${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-API.patch"
+	"${FILESDIR}/${P}-ffmpeg-0.4.9_p20081014-API.patch"
+	"${FILESDIR}/${P}-transcode-1.1.patch"
+	"${FILESDIR}/${P}-libmpcdecsv7.patch"
+)
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation
+LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it
+	ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk
+	uz zh_CN zh_TW"
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_unpack() {
+	kde_src_unpack
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		cd "${WORKDIR}/${I18N}"
+		for X in ${LANGS}; do
+			use linguas_${X} || rm -rf "${X}"
+		done
+		rm -f configure
+	fi
+	rm -f "${S}"/configure
+}
+
+src_configure() {
+	local myconf="--with-external-libsamplerate
+		--without-resmgr
+		--without-cdrecord-suid-root
+		--without-k3bsetup
+		--with-qt-dir=${QTDIR}
+		--enable-mt
+		--with-qt-libraries=${QTDIR}/$(get_libdir)
+		--disable-dependency-tracking
+		--without-arts
+		$(use_enable debug)
+		$(use_with hal)
+		$(use_with encode lame)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with vorbis oggvorbis)
+		$(use_with sndfile)
+		$(use_with mp3 libmad)
+		$(use_with musepack)
+		$(use_with musicbrainz)
+		$(use_with dvd libdvdread)
+		$(use_with alsa)"
+
+	# Build process of K3b
+	kde_src_configure
+
+	# Build process of K3b-i18n
+	if [[ -d "${WORKDIR}/${I18N}" ]]; then
+		myconf="--with-qt-dir=${QTDIR}
+			--with-qt-libraries=${QTDIR}/$(get_libdir)
+			--disable-dependency-tracking
+			--without-arts
+			$(use_enable debug)"
+
+		KDE_S="${WORKDIR}/${I18N}"
+		kde_src_configure
+	fi
+}
+
+src_compile() {
+	KDE_S="${S}"
+	kde_src_compile
+
+	if [[ -d "${WORKDIR}/${I18N}" ]]; then
+		KDE_S="${WORKDIR}/${I18N}"
+		kde_src_compile
+	fi
+}
+
+src_install() {
+	KDE_S="${S}"
+	kde_src_install
+	dodoc FAQ KNOWNBUGS PERMISSIONS || die "dodoc failed"
+
+	if [[ -d "${WORKDIR}/${I18N}" ]]; then
+		KDE_S="${WORKDIR}/${I18N}"
+		kde_src_install
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}