4 files changed, 13 insertions, 65 deletions
diff --git a/media-libs/libkgeomap/ChangeLog b/media-libs/libkgeomap/ChangeLog
index 0b16a4ec2c92..8947d54fa189 100644
--- a/media-libs/libkgeomap/ChangeLog
+++ b/media-libs/libkgeomap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libkgeomap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.16 2012/05/13 15:21:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.17 2012/06/07 19:16:55 dilfridge Exp $
+
+*libkgeomap-2.6.0 (07 Jun 2012)
+
+  07 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkgeomap-2.4.1.ebuild, -libkgeomap-2.6.0_beta3.ebuild,
+  -libkgeomap-2.6.0_rc.ebuild, +libkgeomap-2.6.0.ebuild:
+  Version bump; remove old, beta, and rc
 
 *libkgeomap-2.6.0_rc (13 May 2012)
 
diff --git a/media-libs/libkgeomap/libkgeomap-2.4.1.ebuild b/media-libs/libkgeomap/libkgeomap-2.4.1.ebuild
deleted file mode 100644
index bdb3f8c65bed..000000000000
--- a/media-libs/libkgeomap/libkgeomap-2.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.4.1.ebuild,v 1.3 2012/01/16 23:57:41 ago Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-KDE_MINIMAL="4.7"
-
-inherit kde4-base
-
-MY_P="${DIGIKAMPN}-${PV/_/-}"
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-SLOT=4
-
-DEPEND="
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep marble kde,plasma)
-	!media-libs/libkmap
-"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"
diff --git a/media-libs/libkgeomap/libkgeomap-2.6.0_beta3.ebuild b/media-libs/libkgeomap/libkgeomap-2.6.0.ebuild
index 3c584b913300..6541bb91b7cb 100644
--- a/media-libs/libkgeomap/libkgeomap-2.6.0_beta3.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-2.6.0.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.6.0_beta3.ebuild,v 1.1 2012/04/08 19:46:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.6.0.ebuild,v 1.1 2012/06/07 19:16:55 dilfridge Exp $
 
 EAPI=4
 
-DIGIKAMPN=digikam
 KDE_MINIMAL="4.8"
 
 inherit kde4-base
 
-MY_P="${DIGIKAMPN}-${PV/_/-}"
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
 
 DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
 HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libkgeomap/libkgeomap-2.6.0_rc.ebuild b/media-libs/libkgeomap/libkgeomap-2.6.0_rc.ebuild
deleted file mode 100644
index 7981b4bfe05d..000000000000
--- a/media-libs/libkgeomap/libkgeomap-2.6.0_rc.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.6.0_rc.ebuild,v 1.1 2012/05/13 15:21:40 dilfridge Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.8"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-software-compilation-${MY_PV}"
-SRC_URI="mirror://sourceforge/digikam/digikam/${MY_PV}/${MY_P}.tar.bz2"
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND="
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep marble kde,plasma)
-"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${MY_P}/extra/${PN}"