fixes from bug #25249

5 files changed, 91 insertions, 2 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index bc5d1ae9bb91..c614fcf3bd45 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.22 2003/09/08 02:00:39 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.23 2003/10/02 15:41:15 caleb Exp $
+
+*k3b-0.9-r1 (02 Oct 2003)
+
+  02 Oct 2003; Caleb Tennis <caleb@gentoo.org> k3b-0.9-r1.ebuild,
+  files/mp3decoder_fix.diff:
+  add a fix for compilation problems
 
   07 Sep 2003; Caleb Tennis <caleb@gentoo.org> k3b-0.9.ebuild:
   Mark as x86 stable
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index b876d8015757..9e2b5b6a97f7 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,5 +1,8 @@
 MD5 96c9e162f6292e38ee3ff018862cba0e k3b-0.9.ebuild 1321
 MD5 8a7c1216879b82cde9cbc9a59847c71c k3b-0.8.1-r1.ebuild 934
-MD5 fb09cecdf6dc6eb2d22fca24282171d0 ChangeLog 3243
+MD5 76f2d6c12c58cabb56e236c70b0c5ddb k3b-0.9-r1.ebuild 1606
+MD5 e1f7152c080510f4d09fa34a6d3d4857 ChangeLog 3403
+MD5 c549a5d24aece143a2693361b98742c1 files/mp3decoder_fix.diff 731
 MD5 4f97636cdaf97e2394166286641f5742 files/digest-k3b-0.8.1-r1 62
 MD5 bd8dd88243b4b87472986447644ce855 files/digest-k3b-0.9 60
+MD5 bd8dd88243b4b87472986447644ce855 files/digest-k3b-0.9-r1 60
diff --git a/app-cdr/k3b/files/digest-k3b-0.9-r1 b/app-cdr/k3b/files/digest-k3b-0.9-r1
new file mode 100644
index 000000000000..4af88e013c7a
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.9-r1
@@ -0,0 +1 @@
+MD5 cac0c1e80862070e9b0da2ead5ff4521 k3b-0.9.tar.gz 2952798
diff --git a/app-cdr/k3b/files/mp3decoder_fix.diff b/app-cdr/k3b/files/mp3decoder_fix.diff
new file mode 100644
index 000000000000..6a389d0f7086
--- /dev/null
+++ b/app-cdr/k3b/files/mp3decoder_fix.diff
@@ -0,0 +1,20 @@
+--- src/audio/input/mp3/k3bmp3module.cpp	2003-05-27 03:43:45.000000000 -0500
++++ src/audio/input/mp3/k3bmp3module_1.cpp	2003-08-31 06:46:57.000000000 -0500
+@@ -425,7 +425,7 @@ unsigned int K3bMp3Module::resampleBlock
+ 
+     while (step < MAD_F_ONE) {
+        *target++ = step ?
+- 	last + mad_f_mul(*source - last, step) 
++ 	last + __extension__ mad_f_mul(*source - last, step) 
+  	: last;
+ 
+        step += m_madResampledRatio;
+@@ -442,7 +442,7 @@ unsigned int K3bMp3Module::resampleBlock
+     step = mad_f_fracpart(step);
+ 
+     *target++ = step ?
+-      *source + mad_f_mul(source[1] - source[0], step) 
++      *source + __extension__ mad_f_mul(source[1] - source[0], step) 
+       : *source;
+ 
+     step += m_madResampledRatio;
diff --git a/app-cdr/k3b/k3b-0.9-r1.ebuild b/app-cdr/k3b/k3b-0.9-r1.ebuild
new file mode 100644
index 000000000000..2d4912fa1ba6
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.9-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.9-r1.ebuild,v 1.1 2003/10/02 15:41:15 caleb Exp $
+
+inherit kde-base
+need-kde 3.1
+
+MY_P=${P/_/""}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://k3b.sourceforge.net/"
+SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="debug"
+
+newdepend ">=media-sound/mpg123-0.59
+	>=media-sound/cdparanoia-3.9.8
+	>=media-libs/id3lib-3.8.0_pre2
+	>=media-sound/mad-0.14.2b
+	media-libs/libvorbis"
+
+RDEPEND="$RDEPEND sys-apps/eject
+	>=app-cdr/cdrtools-1.11
+	>=app-cdr/cdrdao-1.1.5
+	media-sound/normalize
+	dvd? ( media-video/transcode media-libs/xvid )"
+
+myconf="$myconf --enable-sso"
+[ `use debug` ] \
+	&& myconf="$myconf --enable-debugging --enable-profiling" \
+	|| myconf="$myconf --disable-debugging --disable-profiling"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_compile()
+{
+	econf $myconf
+	sed 's:-pedantic::' src/audio/input/mp3/Makefile > src/audio/input/mp3/Makefile.temp
+	cp src/audio/input/mp3/Makefile.temp src/audio/input/mp3/Makefile
+	emake
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/mp3decoder_fix.diff
+}
+
+pkg_postinst()
+{
+	einfo "The k3b setup program will offer to change some permissions and"
+	einfo "create a user group.  These changes are not necessary.  We recommend"
+	einfo "that you clear the two check boxes that let k3b make changes for"
+	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
+	einfo "running k3b setup."
+}