Minor gcc 3.4 fixes and KEYWORDS ~amd64.

5 files changed, 139 insertions, 4 deletions

diff --git a/app-misc/krusader/ChangeLog b/app-misc/krusader/ChangeLog
index 86dc85eac949..d40b58bf3b87 100644
--- a/app-misc/krusader/ChangeLog
+++ b/app-misc/krusader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/krusader
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.21 2004/06/02 21:38:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.22 2004/06/22 20:22:08 absinthe Exp $
+
+*krusader-1.40_beta1-r1 (22 Jun 2004)
+
+  22 Jun 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/krusader-1.40_beta1-gcc34-goodness.diff,
+  +krusader-1.40_beta1-r1.ebuild:
+  Minor GCC 3.4 fixes and KEYWORDS ~amd64.
 
   02 Jun 2004; David Holm <dholm@gentoo.org> krusader-1.40_beta1.ebuild:
   Added to ~ppc.
diff --git a/app-misc/krusader/Manifest b/app-misc/krusader/Manifest
index d2c65386801c..161d119a92d9 100644
--- a/app-misc/krusader/Manifest
+++ b/app-misc/krusader/Manifest
@@ -1,6 +1,9 @@
-MD5 7d91bb057d09b7cb198ec4f094cb67be ChangeLog 2670
-MD5 7d96a9a5452f01733cbff30c00ca86a6 krusader-1.30.ebuild 469
+MD5 e9c0d1eb697aaf01079631e66352c678 ChangeLog 2669
+MD5 131e01503fa37e36bffbf7b7463f94dc krusader-1.30.ebuild 468
+MD5 156e4f22474589c3accb3a878efa9fc8 krusader-1.40_beta1.ebuild 545
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 c98d6354430a0b70688c6840a4645dea krusader-1.40_beta1.ebuild 546
+MD5 f26e738b1f279b046751db919c706c79 krusader-1.40_beta1-r1.ebuild 757
 MD5 2d23b6de67a78f8d2c2b8f4c050301b7 files/digest-krusader-1.30 66
 MD5 0be45cea59f67b9492a3a2cce6505b62 files/digest-krusader-1.40_beta1 72
+MD5 0be45cea59f67b9492a3a2cce6505b62 files/digest-krusader-1.40_beta1-r1 72
+MD5 439ebc62e6f041f9f6937d7fc236859f files/krusader-1.40_beta1-gcc34-goodness.diff 4534
diff --git a/app-misc/krusader/files/digest-krusader-1.40_beta1-r1 b/app-misc/krusader/files/digest-krusader-1.40_beta1-r1
new file mode 100644
index 000000000000..45ebf56749ae
--- /dev/null
+++ b/app-misc/krusader/files/digest-krusader-1.40_beta1-r1
@@ -0,0 +1 @@
+MD5 6d8fa3749f9d19a9fd967eb8d663286d krusader-1.40-beta1.tar.gz 2362959
diff --git a/app-misc/krusader/files/krusader-1.40_beta1-gcc34-goodness.diff b/app-misc/krusader/files/krusader-1.40_beta1-gcc34-goodness.diff
new file mode 100644
index 000000000000..37802d4af615
--- /dev/null
+++ b/app-misc/krusader/files/krusader-1.40_beta1-gcc34-goodness.diff
@@ -0,0 +1,91 @@
+diff -ur krusader/MountMan/kmountman.h krusader.new/MountMan/kmountman.h
+--- krusader/MountMan/kmountman.h	2004-03-05 15:05:23.000000000 -0500
++++ krusader.new/MountMan/kmountman.h	2004-06-22 15:13:34.895991680 -0400
+@@ -231,6 +231,6 @@
+ 
+   };
+ 
+-};
++}
+ 
+ #endif
+diff -ur krusader/MountMan/kmountmangui.h krusader.new/MountMan/kmountmangui.h
+--- krusader/MountMan/kmountmangui.h	2003-12-30 15:39:32.000000000 -0500
++++ krusader.new/MountMan/kmountmangui.h	2004-06-22 15:26:32.357799520 -0400
+@@ -80,5 +80,5 @@
+   QTimer *watcher;
+ };
+ 
+-};
++}
+ #endif
+--- acinclude.m4	2004-04-12 07:55:22.000000000 -0400
++++ acinclude.m4.new	2004-06-22 16:03:05.877333864 -0400
+@@ -2818,7 +2818,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 -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -2856,12 +2856,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 -pedantic -Wchar-subscripts -Wshadow -Wpointer-arith -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 -pedantic -W -Wpointer-arith -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"])
+@@ -3269,7 +3269,7 @@
+    AC_CACHE_VAL(kde_cv_func_stpcpy,
+    [
+    kde_safe_cxxflags=$CXXFLAGS
+-   CXXFLAGS="-Wmissing-prototypes -Werror"
++   CXXFLAGS="-Werror"
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([
+--- aclocal.m4	2004-04-12 07:55:26.000000000 -0400
++++ aclocal.m4.new	2004-06-22 16:03:40.007145344 -0400
+@@ -2830,7 +2830,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 -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -2868,12 +2868,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 -pedantic -Wchar-subscripts -Wshadow -Wpointer-arith -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 -pedantic -W -Wpointer-arith -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"])
+@@ -3281,7 +3281,7 @@
+    AC_CACHE_VAL(kde_cv_func_stpcpy,
+    [
+    kde_safe_cxxflags=$CXXFLAGS
+-   CXXFLAGS="-Wmissing-prototypes -Werror"
++   CXXFLAGS="-Werror"
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([
diff --git a/app-misc/krusader/krusader-1.40_beta1-r1.ebuild b/app-misc/krusader/krusader-1.40_beta1-r1.ebuild
new file mode 100644
index 000000000000..67472ed848f3
--- /dev/null
+++ b/app-misc/krusader/krusader-1.40_beta1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-1.40_beta1-r1.ebuild,v 1.1 2004/06/22 20:22:08 absinthe Exp $
+
+IUSE=""
+
+inherit kde
+need-kde 3
+
+MY_P=${P/_/"-"}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE 3.x with many extras"
+HOMEPAGE="http://krusader.sourceforge.net/"
+SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34-goodness.diff
+}
+
+src_compile() {
+	cd ${S}
+
+	if [ ${ARCH} = "amd64" ] ; then
+		append-flags -fPIC
+	fi
+
+	kde_src_compile configure make
+}