version bump, removed beta ebuilds

10 files changed, 18 insertions, 172 deletions

diff --git a/app-misc/krusader/ChangeLog b/app-misc/krusader/ChangeLog
index 13d837477414..fa321f685f8b 100644
--- a/app-misc/krusader/ChangeLog
+++ b/app-misc/krusader/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/krusader
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.25 2004/07/01 11:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/ChangeLog,v 1.26 2004/07/22 11:20:45 carlo Exp $
+
+*krusader-1.40 (22 Jul 2004)
+
+  22 Jul 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/krusader-1.40_beta1-gcc34-goodness.diff, +krusader-1.40.ebuild,
+  -krusader-1.40_beta1-r1.ebuild, -krusader-1.40_beta1.ebuild,
+  -krusader-1.40_beta2.ebuild:
+  version bump, removed beta ebuilds
 
   01 Jul 2004; Aron Griffis <agriffis@gentoo.org> krusader-1.30.ebuild,
   krusader-1.40_beta1-r1.ebuild, krusader-1.40_beta1.ebuild,
diff --git a/app-misc/krusader/Manifest b/app-misc/krusader/Manifest
index 58591d488ee1..67570bfe328e 100644
--- a/app-misc/krusader/Manifest
+++ b/app-misc/krusader/Manifest
@@ -1,11 +1,7 @@
+MD5 389c9e3511310d16fec8cac3502d1d17 tags 213
 MD5 a14f3ffb9cd41c97a4ba150d1683f780 krusader-1.30.ebuild 448
-MD5 084913f12d336ba793b79fb3021f3def krusader-1.40_beta2.ebuild 1226
-MD5 6b65fb769d15a8c79e94a3e134a25993 krusader-1.40_beta1-r1.ebuild 785
-MD5 ee3cd1eb88efee6b3b1b77d9c9cd7790 krusader-1.40_beta1.ebuild 550
+MD5 7e3d4cba3bbf0bc89197dbce36147973 krusader-1.40.ebuild 972
 MD5 a1ec9bfe227f540fef6516cfd6d46335 ChangeLog 3346
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 0be45cea59f67b9492a3a2cce6505b62 files/digest-krusader-1.40_beta1 72
-MD5 702d7fa164a7fd9796b0ae6e17b3d430 files/digest-krusader-1.40_beta2 72
-MD5 0be45cea59f67b9492a3a2cce6505b62 files/digest-krusader-1.40_beta1-r1 72
 MD5 2d23b6de67a78f8d2c2b8f4c050301b7 files/digest-krusader-1.30 66
-MD5 439ebc62e6f041f9f6937d7fc236859f files/krusader-1.40_beta1-gcc34-goodness.diff 4534
+MD5 49275a58f3cced10d296042c331d833e files/digest-krusader-1.40 66
diff --git a/app-misc/krusader/files/digest-krusader-1.40 b/app-misc/krusader/files/digest-krusader-1.40
new file mode 100644
index 000000000000..99814f8a25db
--- /dev/null
+++ b/app-misc/krusader/files/digest-krusader-1.40
@@ -0,0 +1 @@
+MD5 9fe6f4ccdd9b8a5a1ff2e331ba449ff8 krusader-1.40.tar.gz 2630534
diff --git a/app-misc/krusader/files/digest-krusader-1.40_beta1 b/app-misc/krusader/files/digest-krusader-1.40_beta1
deleted file mode 100644
index 45ebf56749ae..000000000000
--- a/app-misc/krusader/files/digest-krusader-1.40_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d8fa3749f9d19a9fd967eb8d663286d krusader-1.40-beta1.tar.gz 2362959
diff --git a/app-misc/krusader/files/digest-krusader-1.40_beta1-r1 b/app-misc/krusader/files/digest-krusader-1.40_beta1-r1
deleted file mode 100644
index 45ebf56749ae..000000000000
--- a/app-misc/krusader/files/digest-krusader-1.40_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d8fa3749f9d19a9fd967eb8d663286d krusader-1.40-beta1.tar.gz 2362959
diff --git a/app-misc/krusader/files/digest-krusader-1.40_beta2 b/app-misc/krusader/files/digest-krusader-1.40_beta2
deleted file mode 100644
index a18c849758c3..000000000000
--- a/app-misc/krusader/files/digest-krusader-1.40_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8665b65b13ca53dcf03ae24c059ca2b2 krusader-1.40-beta2.tar.gz 2548454
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
deleted file mode 100644
index 37802d4af615..000000000000
--- a/app-misc/krusader/files/krusader-1.40_beta1-gcc34-goodness.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-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_beta2.ebuild b/app-misc/krusader/krusader-1.40.ebuild
index 96e725112d01..a4c52458a2db 100644
--- a/app-misc/krusader/krusader-1.40_beta2.ebuild
+++ b/app-misc/krusader/krusader-1.40.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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_beta2.ebuild,v 1.2 2004/07/01 11:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-1.40.ebuild,v 1.1 2004/07/22 11:20:45 carlo Exp $
 
-inherit kde eutils flag-o-matic
+inherit kde
 
 MY_P=${P/_/"-"}
 S=${WORKDIR}/${MY_P}
@@ -18,19 +18,8 @@ IUSE=""
 
 need-kde 3
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P/beta2/beta1}-gcc34-goodness.diff
-}
-
 src_compile() {
-	cd ${S}
-
-	if [ ${ARCH} = "amd64" ] ; then
-		append-flags -fPIC
-	fi
-
+	use amd64 && append-flags -fPIC
 	kde_src_compile configure make
 }
 
@@ -44,4 +33,4 @@ pkg_postinst() {
 	einfo "command to install the more uncommon ones in the *nix world:"
 	einfo "`emerge app-arch/{arj,unarj,rar,unrar,zip,unzip,unace}`"
 	einfo ""
-}
+}
\ No newline at end of file
diff --git a/app-misc/krusader/krusader-1.40_beta1-r1.ebuild b/app-misc/krusader/krusader-1.40_beta1-r1.ebuild
deleted file mode 100644
index dabc1e36b359..000000000000
--- a/app-misc/krusader/krusader-1.40_beta1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/07/01 11:58:30 agriffis Exp $
-
-inherit kde eutils flag-o-matic
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE=""
-
-need-kde 3
-
-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
-}
diff --git a/app-misc/krusader/krusader-1.40_beta1.ebuild b/app-misc/krusader/krusader-1.40_beta1.ebuild
deleted file mode 100644
index 51ba9168b2a4..000000000000
--- a/app-misc/krusader/krusader-1.40_beta1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-1.40_beta1.ebuild,v 1.5 2004/07/01 11:58:30 agriffis Exp $
-
-inherit kde
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-IUSE=""
-
-need-kde 3