Drop old. Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 13 insertions, 85 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index f63773d563f7..52e9b003fd8b 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.208 2010/06/06 00:53:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.209 2010/06/06 14:42:07 scarabeus Exp $
+
+*kmail-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kmail-4.4.2.ebuild,
+  -kmail-4.4.3.ebuild, +kmail-4.4.4.ebuild:
+  Remove old. Version bump.
 
   06 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.4.2.ebuild,
   kmail-4.4.3.ebuild:
diff --git a/kde-base/kmail/kmail-4.4.3.ebuild b/kde-base/kmail/kmail-4.4.3.ebuild
deleted file mode 100644
index b75f766f6bbf..000000000000
--- a/kde-base/kmail/kmail-4.4.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.3.ebuild,v 1.3 2010/06/06 00:53:11 reavertm Exp $
-
-EAPI="3"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-	$(add_kdebase_dep libkpgp)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-add_blocker kmailcvt
-add_blocker libksieve
-add_blocker messagecore
-add_blocker messagelist
-add_blocker messageviewer
-add_blocker mimelib
-
-KMEXTRACTONLY="
-	korganizer/org.kde.Korganizer.Calendar.xml
-	libkleo/
-	libkpgp/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	messagecore/
-	messagelist/
-	messageviewer/
-	mimelib/
-	plugins/kmail/
-"
-KMLOADLIBS="libkdepim"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_IndicateQt=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
-	# Upstream as KDE Bug #198807
-	# (setting MAKEOPTS to trigger a repoman warning)
-	: || MAKEOPTS="-j1"
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-base/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kmail/kmail-4.4.2.ebuild b/kde-base/kmail/kmail-4.4.4.ebuild
index 0fbc9baec447..6b22cf34aa21 100644
--- a/kde-base/kmail/kmail-4.4.2.ebuild
+++ b/kde-base/kmail/kmail-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.4 2010/06/06 00:53:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.4.ebuild,v 1.1 2010/06/06 14:42:07 scarabeus Exp $
 
 EAPI="3"
 
@@ -55,10 +55,11 @@ src_configure() {
 }
 
 src_compile() {
-	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
-	# Upstream as KDE Bug #198807
-	# (setting MAKEOPTS to trigger a repoman warning)
-	: || MAKEOPTS="-j1"
+	# # Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
+	# # Upstream as KDE Bug #198807
+	# # (setting MAKEOPTS to trigger a repoman warning)
+	# : || MAKEOPTS="-j1"
+	# commented out so this gets more testing again - dilfridge 4/6/2010
 	kde4-meta_src_compile kmail_xml
 	kde4-meta_src_compile
 }