Patch that resolves problems with kernel-headers 2.4.21. Thanks to Martin Hajduch in bug 34922.

5 files changed, 74 insertions, 6 deletions

diff --git a/app-cdr/cdbakeoven/ChangeLog b/app-cdr/cdbakeoven/ChangeLog
index b530eddab88a..dacf631e41e4 100644
--- a/app-cdr/cdbakeoven/ChangeLog
+++ b/app-cdr/cdbakeoven/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdbakeoven
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/ChangeLog,v 1.15 2004/02/24 02:43:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/ChangeLog,v 1.16 2004/02/25 02:55:45 pylon Exp $
+
+  25 Feb 2004; Lars Weiler <pylon@gentoo.org> cdbakeoven-2.0_beta2.ebuild:
+  Patch that resolves problems with kernel-headers 2.4.21. Thanks to Martin
+  Hajduch in bug 34922.
 
   23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   cdbakeoven-1.8.9-r1.ebuild, cdbakeoven-1.8.9.ebuild,
diff --git a/app-cdr/cdbakeoven/Manifest b/app-cdr/cdbakeoven/Manifest
index 1fc0c34211e3..cee76169b3d7 100644
--- a/app-cdr/cdbakeoven/Manifest
+++ b/app-cdr/cdbakeoven/Manifest
@@ -1,8 +1,10 @@
-MD5 6abc6e056286ea6fdfe112235a4f2ab5 cdbakeoven-2.0_beta2.ebuild 679
-MD5 57c755b2d5c30bf9fd8d2b94903fe44b cdbakeoven-1.8.9.ebuild 571
-MD5 090a04d072ca804d3c91bd634c3196ab ChangeLog 2357
 MD5 919b38941e1f32cf5e2898953b2b72d2 cdbakeoven-1.8.9-r1.ebuild 656
-MD5 8725876c2ae2d57eb096781fedbc5b7a files/digest-cdbakeoven-2.0_beta2 72
+MD5 57c755b2d5c30bf9fd8d2b94903fe44b cdbakeoven-1.8.9.ebuild 571
+MD5 e4047124ad0fb4947d37aead70217ecd cdbakeoven-2.0_beta2.ebuild 821
+MD5 58b838966d288b3bd04ee3de8af78358 ChangeLog 2533
 MD5 acc871661c249571c0efc2e6f593a6cb files/cdbakeoven-1.8.9-gcc3-gentoo.patch 620
 MD5 97eee34a1ed98a2f41468df3b202b156 files/digest-cdbakeoven-1.8.9 69
 MD5 97eee34a1ed98a2f41468df3b202b156 files/digest-cdbakeoven-1.8.9-r1 69
+MD5 8725876c2ae2d57eb096781fedbc5b7a files/digest-cdbakeoven-2.0_beta2 72
+MD5 82e8c93fdb28d03cb09c6c9e9189a747 files/acinclude.m4-2.0_beta2.patch 1841
+MD5 044422e049dbedb2ef7b4a3c87135700 files/configure-2.0_beta2.patch 1635
diff --git a/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild b/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
index 5e8ba8deb72e..f0c6c527b609 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild,v 1.10 2004/02/24 02:43:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild,v 1.11 2004/02/25 02:55:45 pylon Exp $
 
 inherit kde
 
@@ -22,3 +22,10 @@ newdepend ">=media-libs/libogg-1.0_rc2
 	>=app-cdr/cdrtools-1.11
 	>=kde-base/kdebase-3.1.1
 	>=kde-base/kdemultimedia-3.1.1"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+	epatch ${FILESDIR}/configure-2.0_beta2.patch
+	epatch ${FILESDIR}/acinclude.m4-2.0_beta2.patch
+}
diff --git a/app-cdr/cdbakeoven/files/acinclude.m4-2.0_beta2.patch b/app-cdr/cdbakeoven/files/acinclude.m4-2.0_beta2.patch
new file mode 100644
index 000000000000..134dd8f22c44
--- /dev/null
+++ b/app-cdr/cdbakeoven/files/acinclude.m4-2.0_beta2.patch
@@ -0,0 +1,26 @@
+--- cdbakeoven-2.0beta2/acinclude.m4	2003-02-17 12:47:21.000000000 +0100
++++ cdbakeoven-2.0beta2/acinclude.m4.my	2004-02-08 23:24:03.000000000 +0100
+@@ -2763,7 +2763,7 @@
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+     if test "$kde_use_debug_code" != "no"; then
+       if test "$CXX" = "KCC"; then
+-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="+K0 -Wall -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -2801,12 +2801,12 @@
+       if test "$GCC" = "yes"; then
+         case $host in
+           *-*-linux-gnu)	
+-            CFLAGS="-ansi -W -Wall -pedantic -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"; CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+           ;;
+         esac
+-        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="-Wall -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+         KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
diff --git a/app-cdr/cdbakeoven/files/configure-2.0_beta2.patch b/app-cdr/cdbakeoven/files/configure-2.0_beta2.patch
new file mode 100644
index 000000000000..64436a931ace
--- /dev/null
+++ b/app-cdr/cdbakeoven/files/configure-2.0_beta2.patch
@@ -0,0 +1,29 @@
+--- cdbakeoven-2.0beta2/configure	2003-02-17 12:47:31.000000000 +0100
++++ cdbakeoven-2.0beta2/configure.my	2004-02-08 23:25:13.000000000 +0100
+@@ -3546,7 +3546,7 @@
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+     if test "$kde_use_debug_code" != "no"; then
+       if test "$CXX" = "KCC"; then
+-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="+K0 -Wall -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -3818,7 +3818,7 @@
+       if test "$GCC" = "yes"; then
+         case $host in
+           *-*-linux-gnu)
+-            CFLAGS="-ansi -W -Wall -pedantic -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ 
+ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+@@ -3901,7 +3901,7 @@
+ 
+           ;;
+         esac
+-        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="-Wall -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+ 
+ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+ echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6