add _rc1, remove _beta1

6 files changed, 22 insertions, 34 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 055885b1348d..31d9417c2d93 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 6a194af472fe..35ae5a5e7825 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,12 +1,12 @@
 MD5 b94e9822234ab9cd1985465fc2c3cde0 kdepim-3.2.0-r2.ebuild 817
-MD5 f9049d980674aeedde2b3eb573fcec38 kdepim-3.3.0_beta1.ebuild 743
 MD5 7c4a7a6d20b2d286487dc73308fd13d5 kdepim-3.1.5.ebuild 789
 MD5 ba6bda455b0e875f86471c6a5970b091 kdepim-3.2.3.ebuild 744
 MD5 9b804c502e4f3943f9321f8e1455675d kdepim-3.2.2.ebuild 763
 MD5 30fbae85658c0fd14f243181b42a2d67 kdepim-3.3.0_beta2-r1.ebuild 560
 MD5 c7250f8ffdcb75cf9f7a42a9020aa2be kdepim-3.3.0_beta2.ebuild 743
-MD5 83ad05c4055bd6d041660c9865741df9 ChangeLog 12059
+MD5 b7db63958b8944a5e7b8a2e64d520439 ChangeLog 12191
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 49916569666920ecfbdd93ae5df78a3a kdepim-3.3.0_rc1.ebuild 555
 MD5 3df6e3d6d47af72ca3d907200f819709 kdepim-3.2.1.ebuild 844
 MD5 0658e29c8e0fa024884f165bf129e8e9 files/digest-kdepim-3.1.5 66
 MD5 af91bc84a08ead68b8cc99511ff098ab files/digest-kdepim-3.2.1 66
@@ -14,7 +14,7 @@ MD5 037cd03c8e7281aec672e6e44c15e7e6 files/digest-kdepim-3.2.2 66
 MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66
 MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
 MD5 6f3f2b21eacb5869a9cbb821ffcf48a6 files/kpilot-parallel-make-fix.patch 737
-MD5 1065344a2c69e768f9c5765ec6ba811f files/digest-kdepim-3.3.0_beta1 67
+MD5 753ca1c819d5146b9a642e67cbf14581 files/digest-kdepim-3.3.0_rc1 70
 MD5 c15bea29d0b5aa57597bcaa4a13168de files/digest-kdepim-3.3.0_beta2 67
 MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r2 66
 MD5 c15bea29d0b5aa57597bcaa4a13168de files/digest-kdepim-3.3.0_beta2-r1 67
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0_beta1 b/kde-base/kdepim/files/digest-kdepim-3.3.0_beta1
deleted file mode 100644
index 37ecb5e8b69f..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.3.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e1db631f0238c381b183d206299e0f0 kdepim-3.2.91.tar.bz2 8947216
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0_rc1 b/kde-base/kdepim/files/digest-kdepim-3.3.0_rc1
new file mode 100644
index 000000000000..1dbcabf3eeff
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.3.0_rc1
@@ -0,0 +1 @@
+MD5 0af064b301dd05c9194292bd02bc4f8a kdepim-3.3.0-rc1.tar.bz2 9950045
diff --git a/kde-base/kdepim/kdepim-3.3.0_beta1.ebuild b/kde-base/kdepim/kdepim-3.3.0_beta1.ebuild
deleted file mode 100644
index f5a3792d8d40..000000000000
--- a/kde-base/kdepim/kdepim-3.3.0_beta1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0_beta1.ebuild,v 1.1 2004/07/08 22:30:25 caleb Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="~x86 ~amd64"
-IUSE="pda crypt ldap"
-
-DEPEND="~kde-base/kdenetwork-${PV}
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	ldap? ( net-nds/openldap )
-	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.3.0_rc1.ebuild b/kde-base/kdepim/kdepim-3.3.0_rc1.ebuild
new file mode 100644
index 000000000000..461b6bed81e2
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.3.0_rc1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0_rc1.ebuild,v 1.1 2004/08/06 18:31:37 caleb Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~x86 ~amd64"
+IUSE="pda crypt"
+
+DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )"
+
+src_compile() {
+	use crypt && export GPGME_CONFIG="/usr/bin/gpgme4-config"
+	kde_src_compile
+}