[gentoo-commits] proj/kde:master commit in: kde-base/kde-meta/

[Andreas Hüttel]

commit:     0799e4cfcc99f31f567eb61fdbc6702e5fe97a51
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Oct 28 19:17:41 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:17:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0799e4cf

[kde-base/kde-meta] Remove oldpim useflag as it is not really needed

(Portage version: 2.1.10.31/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/kde-meta/kde-meta-4.7.49.9999.ebuild |    5 ++---
 kde-base/kde-meta/metadata.xml                |    1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-base/kde-meta/kde-meta-4.7.49.9999.ebuild b/kde-base/kde-meta/kde-meta-4.7.49.9999.ebuild
index 41b5705..7af7fcf 100644
--- a/kde-base/kde-meta/kde-meta-4.7.49.9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.7.49.9999.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
 KEYWORDS=""
-IUSE="accessibility nls oldpim sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -30,7 +30,6 @@ RDEPEND="
 		$(add_kdebase_dep kdewebdev-meta)
 	)
 	semantic-desktop? (
-		!oldpim? ( $(add_kdebase_dep kdepim-meta) )
-		oldpim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
+		$(add_kdebase_dep kdepim-meta "" 4.4.11.1)
 	)
 "

diff --git a/kde-base/kde-meta/metadata.xml b/kde-base/kde-meta/metadata.xml
index 0a6a814..c1fa409 100644
--- a/kde-base/kde-meta/metadata.xml
+++ b/kde-base/kde-meta/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>kde</herd>
   <use>
-    <flag name="oldpim">Allow the use of non-akonadi kdepim-4.4</flag>
     <flag name="sdk">Pull in developer-specific meta-packages</flag>
   </use>
 </pkgmetadata>