15 files changed, 19 insertions, 86 deletions
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 9a01293e78eb..a36bd3ab1bd7 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.55 2004/01/16 19:25:31 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.56 2004/01/19 03:48:01 caleb Exp $
+
+*kdeedu-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.0.4.ebuild,
+  kdeedu-3.1.2.ebuild, kdeedu-3.2.0_beta1.ebuild, kdeedu-3.2.0_beta2.ebuild,
+  kdeedu-3.2.0_rc1.ebuild, files/kdeedu-3.2.0_beta2-sparc-lx200.patch:
+  New version, removing older versions
 
   16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeedu-3.1.5.ebuild:
   Marked stable on hppa.
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index eed6847fbef1..80ad56797bf7 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,19 +1,10 @@
-MD5 d44d8848829eef79b6bbedc674d76e50 kdeedu-3.2.0_beta1.ebuild 308
 MD5 388e82fdb654be0de4d2c74655b9a3cc kdeedu-3.1.5.ebuild 433
-MD5 28a156d34db2bc5b1aad866a8ac0ba7a kdeedu-3.0.4.ebuild 625
-MD5 e6f8898ad014937dcb471d34de6f30f5 kdeedu-3.2.0_rc1.ebuild 426
-MD5 de35a085f99bd298af98c1368dc53b73 kdeedu-3.1.2.ebuild 423
+MD5 ed375f7ba525956403a744871be9d145 kdeedu-3.2.0_rc1.ebuild 322
 MD5 27b3ea34c54b6235a6a57a85e4dc2605 kdeedu-3.1.4.ebuild 431
-MD5 e20d4c8fa80c290a424f2a640e7fa7e4 kdeedu-3.0.5b.ebuild 634
-MD5 92ae49acf696ac659c54982c2b657c69 ChangeLog 6859
+MD5 6666974802c5767902a6cab0056adb11 kdeedu-3.0.5b.ebuild 631
+MD5 86402af2de3eef369b911a9dbd0c1fe3 ChangeLog 7147
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 e6f8898ad014937dcb471d34de6f30f5 kdeedu-3.2.0_beta2.ebuild 426
-MD5 eca6b4f1ec74cbce0a0c9a54d1a5f8cb files/kdeedu-3.2.0_beta2-sparc-lx200.patch 670
 MD5 e5cc833cf9395a8fdb5aa2ee18943e17 files/digest-kdeedu-3.0.5b 211
-MD5 e0195da79028c5c29a10ae40e33c64dd files/digest-kdeedu-3.2.0_beta1 68
-MD5 c797692559023f45c19cab50b6a4ab90 files/digest-kdeedu-3.2.0_beta2 68
 MD5 523a839e67ceab98b6edc502f83e6382 files/digest-kdeedu-3.2.0_rc1 68
-MD5 0c79179c373ac6bcb1623c57d87ce229 files/digest-kdeedu-3.0.4 66
-MD5 cd5a6b52f6412f8c1e0f5549e00c2340 files/digest-kdeedu-3.1.2 67
 MD5 78c0a58b06517e4a79380ed934510f91 files/digest-kdeedu-3.1.4 67
 MD5 b7e131f3c6e455cce46d298409a97c5c files/digest-kdeedu-3.1.5 67
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.0.4 b/kde-base/kdeedu/files/digest-kdeedu-3.0.4
deleted file mode 100644
index e063cf62defc..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 141cea8c0186d6c75fdb4f7a069a48d9 kdeedu-3.0.4.tar.bz2 9104479
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.1.2 b/kde-base/kdeedu/files/digest-kdeedu-3.1.2
deleted file mode 100644
index 81b6985a4c08..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba2a96454b7d2a7d92c991b08d932242 kdeedu-3.1.2.tar.bz2 20028913
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta1 b/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta1
deleted file mode 100644
index ec039fd93758..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da93dc2ea5e6c9e6728788b9927306ce kdeedu-3.1.93.tar.bz2 22267181
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta2 b/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta2
deleted file mode 100644
index 4b1590e93f07..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c0fbb6fa9d743a6c42261b29a8813f6 kdeedu-3.1.94.tar.bz2 22214558
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.2.0_rc1 b/kde-base/kdeedu/files/digest-kdeedu-3.2.0_rc1
new file mode 100644
index 000000000000..75b169bec066
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.2.0_rc1
@@ -0,0 +1 @@
+MD5 20984fb3c8317056120153398011860a kdeedu-3.1.95.tar.bz2 22337546
diff --git a/kde-base/kdeedu/files/kdeedu-3.2.0_beta2-sparc-lx200.patch b/kde-base/kdeedu/files/kdeedu-3.2.0_beta2-sparc-lx200.patch
deleted file mode 100644
index b015a1dccddb..000000000000
--- a/kde-base/kdeedu/files/kdeedu-3.2.0_beta2-sparc-lx200.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: lx200driver.c
-===================================================================
-RCS file: /home/kdecvs/kde/kdeedu/kstars/kstars/indi/lx200driver.c,v
-retrieving revision 1.11
-diff -u -3 -p -r1.11 kstars/kstars/indi/lx200driver.c
---- lx200driver.c	3 Sep 2003 18:34:41 -0000	1.11
-+++ kstars/kstars/indi/lx200driver.c	21 Dec 2003 16:34:51 -0000
-@@ -955,8 +955,8 @@ int openPort(const char *portID)
-    ttyOptions.c_cflag &= ~PARENB;
- 
-    /* set baud rate */
--   ttyOptions.c_ispeed = B9600;
--   ttyOptions.c_ospeed = B9600;
-+   cfsetispeed(&ttyOptions, B9600);
-+   cfsetospeed(&ttyOptions, B9600);
- 
-   /* set input/output flags */
-   ttyOptions.c_iflag = IGNBRK;
diff --git a/kde-base/kdeedu/kdeedu-3.0.4.ebuild b/kde-base/kdeedu/kdeedu-3.0.4.ebuild
deleted file mode 100644
index 7e2caacbb6b0..000000000000
--- a/kde-base/kdeedu/kdeedu-3.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.0.4.ebuild,v 1.6 2003/02/13 12:27:00 vapier Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE $PV - educational apps"
-KEYWORDS="x86 ppc alpha"
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/klettres/klettres
-}
-
-src_compile() {
-
-	kde_src_compile myconf configure
-
-	# build fails with -fomit-frame-pointer optimization in kgeo
-	kde_remove_flag kgeo -fomit-frame-pointer
-	kde_remove_flag kgeo/kgeo -fomit-frame-pointer
-
-	kde_src_compile make
-}
diff --git a/kde-base/kdeedu/kdeedu-3.0.5b.ebuild b/kde-base/kdeedu/kdeedu-3.0.5b.ebuild
index d2f4618777f5..1f66d76c98d3 100644
--- a/kde-base/kdeedu/kdeedu-3.0.5b.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.0.5b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.0.5b.ebuild,v 1.3 2003/07/16 16:31:06 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.0.5b.ebuild,v 1.4 2004/01/19 03:48:01 caleb Exp $
 inherit kde-dist
 
 IUSE=""
diff --git a/kde-base/kdeedu/kdeedu-3.1.2.ebuild b/kde-base/kdeedu/kdeedu-3.1.2.ebuild
deleted file mode 100644
index 8d3445b44311..000000000000
--- a/kde-base/kdeedu/kdeedu-3.1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.1.2.ebuild,v 1.5 2003/07/22 21:04:12 gmsoft Exp $
-inherit kde-dist flag-o-matic
-
-IUSE=""
-DESCRIPTION="KDE educational apps"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-if [ "`gcc -dumpversion`" == "2.95.3" ]; then
-	filter-flags "-fomit-frame-pointer"
-fi
diff --git a/kde-base/kdeedu/kdeedu-3.2.0_beta1.ebuild b/kde-base/kdeedu/kdeedu-3.2.0_beta1.ebuild
deleted file mode 100644
index 2504e646ec62..000000000000
--- a/kde-base/kdeedu/kdeedu-3.2.0_beta1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.0_beta1.ebuild,v 1.1 2003/11/04 02:01:29 caleb Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE educational apps"
-KEYWORDS="~x86"
diff --git a/kde-base/kdeedu/kdeedu-3.2.0_beta2.ebuild b/kde-base/kdeedu/kdeedu-3.2.0_rc1.ebuild
index 4cdcd7106c6f..e56a46864796 100644
--- a/kde-base/kdeedu/kdeedu-3.2.0_beta2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.2.0_rc1.ebuild
@@ -1,14 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.0_beta2.ebuild,v 1.4 2004/01/17 11:20:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:48:01 caleb Exp $
 inherit kde-dist
 
 IUSE=""
 DESCRIPTION="KDE educational apps"
 KEYWORDS="~x86 ~sparc ~amd64"
 
-src_unpack() {
-	kde_src_unpack
-	use sparc && epatch ${FILESDIR}/kdeedu-3.2.0_beta2-sparc-lx200.patch
-}
 
diff --git a/kde-base/kdegames/Manifest b/kde-base/kdegames/Manifest
index b209d5ea1bd0..0dad3b021c2c 100644
--- a/kde-base/kdegames/Manifest
+++ b/kde-base/kdegames/Manifest
@@ -4,6 +4,7 @@ MD5 d9164e76dfb045ccf9e60fd29b2f8bae kdegames-3.1.2.ebuild 1051
 MD5 e2cfb99a87ffd63e60cbc7645f0cc294 kdegames-3.0.5b.ebuild 360
 MD5 fe079db220e1ea64078a80ff4e767d8a kdegames-3.2.0_beta2.ebuild 336
 MD5 dfceda9cd8acc408be9fbb6a366efbb4 kdegames-3.1.4.ebuild 1128
+MD5 fe079db220e1ea64078a80ff4e767d8a kdegames-3.2.0_rc1.ebuild 336
 MD5 77724a97937715127c5ba29bb3f2f07c ChangeLog 7073
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 3e6cdefe07a8652e7becdb4d5205b235 kdegames-3.2.0_beta1.ebuild 323
@@ -14,4 +15,5 @@ MD5 73a3b61ff37f70ff995d3eaf9ae3e7d5 files/digest-kdegames-3.0.4 68
 MD5 cb8d2367fb5d185f5ed5a4be4740e40c files/digest-kdegames-3.1.2 68
 MD5 b1b7eb1ed81f80133b5d6b5530bfcbba files/digest-kdegames-3.1.4 68
 MD5 5ab4efd4e815e8257d53a92a2a8eac4a files/digest-kdegames-3.1.5 68
+MD5 16175d1caf5711f26372952094811d21 files/digest-kdegames-3.2.0_rc1 69
 MD5 726d8204b4760054fba2739aad24a7e4 files/digest-kdegames-3.0.5b 286
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 55b421f5b678..4f49bea0f681 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,5 +1,6 @@
 MD5 1ed9ae31d5ccf9983fa5a031594f8d86 kdegraphics-3.1.4.ebuild 1053
 MD5 d8b0ff86e19478f71ae5863b9d03cafe kdegraphics-3.2.0_beta1.ebuild 1144
+MD5 c265791a1794182a907e5aa084205a18 kdegraphics-3.2.0_rc1.ebuild 1090
 MD5 3394eb4c86a2982feaf88495fe8088d6 kdegraphics-3.0.5b.ebuild 1483
 MD5 d971d845e1c6f1ef72adb8e504f42f46 kdegraphics-3.1.5.ebuild 1054
 MD5 c265791a1794182a907e5aa084205a18 kdegraphics-3.2.0_beta2.ebuild 1090
@@ -16,3 +17,4 @@ MD5 2eb5733acffb2f31465f4badc38088fb files/digest-kdegraphics-3.1.4 71
 MD5 78ab0a172f24863df0ba35300e95a890 files/digest-kdegraphics-3.1.5 71
 MD5 fcdc3bd9bfe2c49726ccc6d61cfb7fd4 files/digest-kdegraphics-3.0.5b 72
 MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5b-kghostviewrc 335
+MD5 2e352451ddba494e9ec9b28bae40a551 files/digest-kdegraphics-3.2.0_rc1 72