Apply all various updates from kde-crazy and from lxnay. This closes bug #231338.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 172 insertions, 1 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index e53904fdded0..ef85ed23a923 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.216 2009/03/10 20:02:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.217 2009/05/19 17:41:47 scarabeus Exp $
+
+*k3b-1.0.5-r4 (19 May 2009)
+
+  19 May 2009; Tomas Chvatal <scarabeus@gentoo.org> +k3b-1.0.5-r4.ebuild,
+  +files/k3b-1.0.5-transcode-1.1.patch:
+  Apply all various updates from kde-crazy and from lxnay. This closes bug
+  #231338.
 
   10 Mar 2009; Steve Dibb <beandog@gentoo.org> k3b-1.0.5-r3.ebuild:
   Update transcode use flag check, move dvdread use flag to dvd use flag
diff --git a/app-cdr/k3b/files/k3b-1.0.5-transcode-1.1.patch b/app-cdr/k3b/files/k3b-1.0.5-transcode-1.1.patch
new file mode 100644
index 000000000000..dd7498189248
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-transcode-1.1.patch
@@ -0,0 +1,18 @@
+--- k3b-1.0.5.orig/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2008-05-27 10:24:20.000000000 +0200
++++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009-05-19 18:30:07.211821502 +0200
+@@ -206,10 +206,13 @@ void K3bVideoDVDTitleTranscodingJob::sta
+     *d->process << "--nice" << "19";
+ 
+   // we only need 100 steps, but to make sure we use 150
++  int progressRate = ( int )m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150;
++  if ( progressRate < 1)
++      progressRate = 1;
+   if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
+-      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(progressRate);
+   else
+-      *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++      *d->process << "--print_status" << QString::number(progressRate);
+ 
+   // the input
+   *d->process << "-i" << m_dvd.device()->blockDeviceName();
diff --git a/app-cdr/k3b/k3b-1.0.5-r4.ebuild b/app-cdr/k3b/k3b-1.0.5-r4.ebuild
new file mode 100644
index 000000000000..d39b00ecd1fd
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.5-r4.ebuild
@@ -0,0 +1,146 @@
+# 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-r4.ebuild,v 1.1 2009/05/19 17:41:47 scarabeus Exp $
+
+EAPI="2"
+inherit kde eutils multilib
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+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="
+	media-libs/libsamplerate
+	media-libs/taglib
+	>=media-sound/cdparanoia-3.9.8
+	alsa? ( media-libs/alsa-lib )
+	dvd? ( media-libs/libdvdread )
+	encode? ( media-sound/lame )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	flac? ( media-libs/flac[cxx] )
+	hal? ( sys-apps/hal )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	musicbrainz? ( media-libs/musicbrainz:1 )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	virtual/cdrtools
+	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
+	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"
+
+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"
+)
+
+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_install() {
+	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
+}