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

Package-Manager: portage-2.1

4 files changed, 113 insertions, 15 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/Manifest b/kde-base/kdemultimedia/Manifest
index 483ff7fd3706..f7d57bec9b69 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX artsplugin-akode-3.5.2-memleak.patch 797 RMD160 593b8a40af0b373259d37410f57989cdfb9ec568 SHA1 40e58675d2417c92bcb1e0351489da7ab17a82ae SHA256 1a6d341f130430ca7faef4188899e4fe98c4ba808ea9702d352a9b28eb2b3642
 MD5 d860129d92634080c3f7368ed282e098 files/artsplugin-akode-3.5.2-memleak.patch 797
 RMD160 593b8a40af0b373259d37410f57989cdfb9ec568 files/artsplugin-akode-3.5.2-memleak.patch 797
@@ -31,6 +28,7 @@ RMD160 4b72fcf4253e201e3c0760fb34c3fdc4ca664d82 files/kdemultimedia-64bit.patch
 SHA256 19b133440b23f10ee54f11962f120f6d27c1720c87680506f2f028b1105d2e7b files/kdemultimedia-64bit.patch 634
 DIST kdemultimedia-3.3.2.tar.bz2 5384470 RMD160 b41cfeb8b410e1da1fb128e928c8aecaf66c8b00 SHA256 cc1db51f4a5a716cf90a7ace8035711d2b03c0d8b319df6e140cb97722969250
 DIST kdemultimedia-3.4.3.tar.bz2 5495757 RMD160 318ebd3149019ec2e5d98b57a548d3ef350a7924 SHA256 adc29df6c427b505c3b1559c2ea393e9a65c3120dfce5207419ba5dd16aa2d4e
+DIST kdemultimedia-3.5-patchset-01.tar.bz2 1434 RMD160 021a379c8a11e0a463889b77e3b62d665683ce78 SHA1 97fcb3ba126633079e098b6bec1c866db70c0621 SHA256 edcbc4727d962368d64c809a969b024feeb0bbe0627912d1c95adc0dacf85d38
 DIST kdemultimedia-3.5.2.tar.bz2 6272386 RMD160 4f6fcb790e63f4af7a309677babd5e2ed938514f SHA1 68e5e24709a2c06777bb3f12fc76e733f5896c5d SHA256 01562af68008c10c04346a94d0dea7cedcb77673c0b7cd5cfc74360bf309a2f8
 DIST kdemultimedia-3.5.3.tar.bz2 6276838 RMD160 2ae4ba9266b84b972e3bcd106896b6ea0124aa32 SHA1 2a75ba49bbc513b4ab5cb0d039949984742f94f5 SHA256 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f
 EBUILD kdemultimedia-3.3.2.ebuild 1757 RMD160 d3cfc2b850b63f279df05130628c04efb78c625c SHA1 e2a42d8f8c770bb20e80b43960eed0574569bab7 SHA256 6696e9fa10b1fcde27506aeef2daa179363493db4d915288458c0425f05bbe68
@@ -45,14 +43,18 @@ EBUILD kdemultimedia-3.5.2-r2.ebuild 3001 RMD160 f3d432d800aceb32df7e7d89ca3f45e
 MD5 c7de19a4af0ce3e6fcbf3f35b4d51508 kdemultimedia-3.5.2-r2.ebuild 3001
 RMD160 f3d432d800aceb32df7e7d89ca3f45e8001c3e0e kdemultimedia-3.5.2-r2.ebuild 3001
 SHA256 f4229900d75d1a74ff047eb61b58f405faf70e13e94f1ebbd39550f006a89380 kdemultimedia-3.5.2-r2.ebuild 3001
+EBUILD kdemultimedia-3.5.3-r1.ebuild 2887 RMD160 771cdceb893d4d7c1bdd33b50c3e0a17924a04b7 SHA1 ffdca3e32f3b4a43914a16a6f5caf7f959b04f36 SHA256 d294efc82d94fb0b13940e5cb0ebf7d11cd46c0597165122c7d6c1ada70032df
+MD5 7c0718821d4788ed68532905e8c54ff9 kdemultimedia-3.5.3-r1.ebuild 2887
+RMD160 771cdceb893d4d7c1bdd33b50c3e0a17924a04b7 kdemultimedia-3.5.3-r1.ebuild 2887
+SHA256 d294efc82d94fb0b13940e5cb0ebf7d11cd46c0597165122c7d6c1ada70032df kdemultimedia-3.5.3-r1.ebuild 2887
 EBUILD kdemultimedia-3.5.3.ebuild 2913 RMD160 c52b5dab2039298d6dc32824cfe87491bc77549d SHA1 839152dc00f0d09e23bdb36551f1b3e3de05daa6 SHA256 efac526950dfba6640c09e3baabe5e4d264cb6f2a667b798b9740077707abd19
 MD5 3638f1492750a054acd32dfde7645727 kdemultimedia-3.5.3.ebuild 2913
 RMD160 c52b5dab2039298d6dc32824cfe87491bc77549d kdemultimedia-3.5.3.ebuild 2913
 SHA256 efac526950dfba6640c09e3baabe5e4d264cb6f2a667b798b9740077707abd19 kdemultimedia-3.5.3.ebuild 2913
-MISC ChangeLog 30566 RMD160 6e00726d2b1850cff64fedfc5a02a9efc29ec000 SHA1 619eac7361f8318dd2684df631543f323fc3181e SHA256 2a698881b772c4490ffac9ec62fca29eb62f445ae9f48d09e0707c0085f43c19
-MD5 c86e24709945912933cfa11da08769be ChangeLog 30566
-RMD160 6e00726d2b1850cff64fedfc5a02a9efc29ec000 ChangeLog 30566
-SHA256 2a698881b772c4490ffac9ec62fca29eb62f445ae9f48d09e0707c0085f43c19 ChangeLog 30566
+MISC ChangeLog 30745 RMD160 32007ad106b0f0adf1d19fd45d3dca57fd70dca3 SHA1 6c2874acc2628ad8491ec28b2d7878bc4d949d49 SHA256 02d83af6f3fb6db08f7ec8cf275bf42314374069a2ffa1269423160a6f6b4f7d
+MD5 0070a967f2b420e381b75f7db7a3986a ChangeLog 30745
+RMD160 32007ad106b0f0adf1d19fd45d3dca57fd70dca3 ChangeLog 30745
+SHA256 02d83af6f3fb6db08f7ec8cf275bf42314374069a2ffa1269423160a6f6b4f7d ChangeLog 30745
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -69,10 +71,6 @@ SHA256 da5960a94d94974711cce49b9e15a2465e392feb2dd48db846adce8d9e02d864 files/di
 MD5 ce67ee8c3e2975ac7bc343af2f0ef87f files/digest-kdemultimedia-3.5.3 265
 RMD160 1dedc9e07392c66c424497d1e686c3af8ec30ff5 files/digest-kdemultimedia-3.5.3 265
 SHA256 40d78b21ca110b497ec4b7377ae5dff2436e974a675297ec5d269b4a747f7920 files/digest-kdemultimedia-3.5.3 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhzF3AiZjviIA2XgRAtiEAJ9QcGgbL8iGlvZ4HD1FH1X0cYvsZQCeKYD6
-p32KTv6Sva2/O9f3wD3A5IU=
-=SMfl
------END PGP SIGNATURE-----
+MD5 b380caa8da24fb2fb619c3781f53236b files/digest-kdemultimedia-3.5.3-r1 551
+RMD160 f892707feac612fd8020d5d1a3176fd01139a876 files/digest-kdemultimedia-3.5.3-r1 551
+SHA256 d8516c75f1c8cce69b073cb8c98d8a0a7c8212920042e67b89c5ec66cc1d58c5 files/digest-kdemultimedia-3.5.3-r1 551
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
+}