Restore fix for bug #128574. Missing return value checks.

(Portage version: 2.1)

3 files changed, 101 insertions, 1 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index d9ac3fb26271..0a0a8aad9a76 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.212 2006/06/07 20:05:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.213 2006/06/15 00:41:43 carlo Exp $
+
+*kdemultimedia-3.5.3-r1 (15 Jun 2006)
+
+  15 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
+  +kdemultimedia-3.5.3-r1.ebuild:
+  Restore fix for bug #128574. Missing return value checks.
 
   07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdemultimedia-3.5.2-r2.ebuild:
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.3-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.3-r1
new file mode 100644
index 000000000000..084f8cc4699e
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 2484cdd588665a5cb3d6090afea1737c kdemultimedia-3.5-patchset-01.tar.bz2 1434
+RMD160 021a379c8a11e0a463889b77e3b62d665683ce78 kdemultimedia-3.5-patchset-01.tar.bz2 1434
+SHA256 edcbc4727d962368d64c809a969b024feeb0bbe0627912d1c95adc0dacf85d38 kdemultimedia-3.5-patchset-01.tar.bz2 1434
+MD5 61bd938c564e3280034944338955712b kdemultimedia-3.5.3.tar.bz2 6276838
+RMD160 2ae4ba9266b84b972e3bcd106896b6ea0124aa32 kdemultimedia-3.5.3.tar.bz2 6276838
+SHA256 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f kdemultimedia-3.5.3.tar.bz2 6276838
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..36bd618e8c6b
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.3-r1.ebuild,v 1.1 2006/06/15 00:41:43 carlo Exp $
+
+inherit kde-dist flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdemultimedia-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE multimedia apps: Noatun, KsCD, Juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="akode alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	akode? ( media-libs/akode )
+	>=media-libs/taglib-1.2
+	audiofile? ( media-libs/audiofile )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( =media-libs/gstreamer-0.8*
+	             =media-libs/gst-plugins-0.8* )
+	musicbrainz? ( media-libs/tunepimp
+	               media-libs/musicbrainz )
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-sound/vorbis-tools )
+	          flac? ( media-libs/flac ) )
+	!arts? ( !gstreamer? ( media-libs/akode ) )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
+		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+		               =media-plugins/gst-plugins-vorbis-0.8* )
+		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
+
+pkg_setup() {
+	kde_pkg_setup
+	if ! use arts && ! use gstreamer && ! use akode ; then
+		ewarn "No audio backend chosen. Defaulting to media-libs/akode."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-cdparanoia --with-taglib
+	              --with-akode $(use_with alsa)
+	              $(use_with audiofile) $(use_with gstreamer)
+	              $(use_with xine) $(use_with theora)
+	              $(use_with musicbrainz)"
+
+	# encoding can happen through:
+	# - kio_audiocd (based on libflac for flac,
+	#   on libvorbis for vorbis, on the lame binary for mp3)
+	# - kaudiocreator (based on the flac binary for flac,
+	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	# - krec (based on libvorbis for vorbis,
+	#   on libmp3lame for mp3)
+	if use encode; then
+		myconf="${myconf} $(use_with mp3 lame)
+	                $(use_with vorbis) $(use_with flac)"
+	else
+		myconf="${myconf} --without-lame
+	                --without-vorbis --without-flac"
+	fi
+
+	if ! use arts && ! use gstreamer ; then
+		myconf="${myconf} --with-akokde"
+	else
+		if ! use akode ; then
+			# work around broken configure
+			export include_akode_ffmpeg_FALSE='#'
+			export include_akode_mpc_FALSE='#'
+			export include_akode_mpeg_FALSE='#'
+			export include_akode_xiph_FALSE='#'
+		fi
+		myconf="${myconf} $(use_with akode)"
+	fi
+
+	# fix bug 128884
+	filter-flags -fomit-frame-pointer
+
+	# Not used anymore and scheduled for removal.
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
+
+	rm configure
+	kde_src_compile
+}