summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/marble/ChangeLog6
-rw-r--r--kde-base/marble/Manifest6
-rw-r--r--kde-base/marble/marble-4.0.4.ebuild52
-rw-r--r--kde-base/marble/marble-4.0.5.ebuild52
4 files changed, 6 insertions, 110 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index dd7f26e62708..66abf5078a53 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/marble
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.15 2008/10/02 11:03:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.16 2008/10/21 11:32:24 jmbsvicetto Exp $
+
+ 21 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ -marble-4.0.4.ebuild, -marble-4.0.5.ebuild:
+ Removing KDE-4.0.X packages now that 4.1.2 was put in the tree.
*marble-4.1.2 (02 Oct 2008)
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index d7c3f0a72a2d..3401e18c0c2b 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,9 +1,5 @@
AUX marble-4.0.0-fix-tests.patch 387 RMD160 027940172b552edf909e60e6418f2ef3cb639eaf SHA1 039e91f2f05e972f87a464d1d13ce074ccde7d3d SHA256 809db4563e9689c7ff34a4f41c01bd092f24dcf224222688e8cb36e1d1083d8f
-DIST kdeedu-4.0.4.tar.bz2 42437930 RMD160 4e793adfb88086b8d4e17b6ebc9aa91c73135a4e SHA1 51461706018d2101160c1ae012b07374ca62149a SHA256 683b6087763c7ae13e3b2792bb4bb22e640def340dd4aa9ac424cedcc2ca1793
-DIST kdeedu-4.0.5.tar.bz2 42520529 RMD160 fb93f0d69d6102c1414c113ed788af3f67e17984 SHA1 d0c758e5a1eebcb8884380a5ae15d8408815f3cf SHA256 0664f295da9c16ca7390bc757d25381892642f0a588534ee5612b767a906bae6
DIST kdeedu-4.1.2.tar.bz2 57396348 RMD160 06c56cbbd3df68214165e9ef533068324130e7a5 SHA1 f7359e415d7fc007b391cb0b3a2a1c17616b55de SHA256 53af35e8bcf2316e5e37cd5c563870357033bf4729d8060808e0743bf354c792
-EBUILD marble-4.0.4.ebuild 1365 RMD160 8111419d3aa55c594cf64f9368b2c8173d4f68a3 SHA1 4b707030ccfba1aef2252435e007d2660fa81e86 SHA256 5e98354d81bdbe53ad7f5c5208c18dfead6711834358b4812e75f280a2e35658
-EBUILD marble-4.0.5.ebuild 1369 RMD160 e50abd6f5fc4a29a2acc462381cd55992e21577d SHA1 f23a9d85c5a0526c919ae29f0c62eb8c6942e9c7 SHA256 fc6ede326bf7e5dbc0b5d77b45eeb85fc393d691d2e3a52a4f202d019736c88e
EBUILD marble-4.1.2.ebuild 1699 RMD160 5f9a38a0588fca35dae4d450b88d3f55ea12c03a SHA1 a4e6d0db201afb6e3e9e771467f8466aee8e4f90 SHA256 2466fb7450515bdc2d11cbf69ec3355188a9059949428bfe71469c1c56ed31db
-MISC ChangeLog 2302 RMD160 b61e45e03f3441234f365b923602f0524349d6ce SHA1 d30258d915005461607be575df77567c1ca16ee1 SHA256 24944454531a4ea47ac65870fdaf17a66eafe7b2b1b8b673b0a042daa000fa89
+MISC ChangeLog 2482 RMD160 eccf0464c9fe51ec3318a3b186a10b84636cafd7 SHA1 9cfa28b5894c2c66cec21c64c6cb367307f31b2f SHA256 307a8c9967c11dec71f49f12fc3fc15631fa123e426a0c28123f0a52f78252a8
MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
diff --git a/kde-base/marble/marble-4.0.4.ebuild b/kde-base/marble/marble-4.0.4.ebuild
deleted file mode 100644
index 68331470d5d3..000000000000
--- a/kde-base/marble/marble-4.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.4.ebuild,v 1.1 2008/05/16 00:51:21 ingmar Exp $
-
-EAPI="1"
-NEED_KDE="none"
-KMNAME=kdeedu
-SLOT="kde-4" # Goes in the ebuild because of NEED_KDE=none
-KDEDIR="/usr/kde/4.0"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE: generic geographical map widget"
-KEYWORDS="~amd64 ~x86"
-IUSE="${IUSE} debug designer-plugin htmlhandbook kde gps"
-
-# FIXME: undefined reference when building tests. RESTRICTed for now.
-# Last checked in 4.0.3.
-RESTRICT="test"
-
-COMMONDEPEND="
- gps? ( sci-geosciences/gpsd )
- kde? ( >=kde-base/kdelibs-${PV}:${SLOT}
- >=kde-base/kdepimlibs-${PV}:${SLOT} )"
-DEPEND="${COMMONDEPEND}"
-RDEPEND="${COMMONDEPEND}"
-
-src_compile() {
- epatch "${FILESDIR}/${PN}-4.0.0-fix-tests.patch"
-
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
-
- if use gps; then
- mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
- else
- sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
- marble/Findlibgps.cmake || die "sed to disable gpsd failed."
- fi
-
- if ! use kde; then
- mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON"
- fi
-
- kde4-meta_src_compile
-}
-
-src_test() {
- mycmakeargs="${mycmakeargs} -DENABLE_TESTS=TRUE"
-
- kde4-meta_src_test
-}
diff --git a/kde-base/marble/marble-4.0.5.ebuild b/kde-base/marble/marble-4.0.5.ebuild
deleted file mode 100644
index e2fc5fc9d7f1..000000000000
--- a/kde-base/marble/marble-4.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.5.ebuild,v 1.1 2008/06/05 22:42:02 keytoaster Exp $
-
-EAPI="1"
-NEED_KDE="none"
-KMNAME=kdeedu
-SLOT="kde-4" # Goes in the ebuild because of NEED_KDE=none
-KDEDIR="/usr/kde/4.0"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE: generic geographical map widget"
-KEYWORDS="~amd64 ~x86"
-IUSE="${IUSE} debug designer-plugin htmlhandbook kde gps"
-
-# FIXME: undefined reference when building tests. RESTRICTed for now.
-# Last checked in 4.0.3.
-RESTRICT="test"
-
-COMMONDEPEND="
- gps? ( sci-geosciences/gpsd )
- kde? ( >=kde-base/kdelibs-${PV}:${SLOT}
- >=kde-base/kdepimlibs-${PV}:${SLOT} )"
-DEPEND="${COMMONDEPEND}"
-RDEPEND="${COMMONDEPEND}"
-
-src_compile() {
- epatch "${FILESDIR}/${PN}-4.0.0-fix-tests.patch"
-
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
-
- if use gps; then
- mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
- else
- sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
- marble/Findlibgps.cmake || die "sed to disable gpsd failed."
- fi
-
- if ! use kde; then
- mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON"
- fi
-
- kde4-meta_src_compile
-}
-
-src_test() {
- mycmakeargs="${mycmakeargs} -DENABLE_TESTS=TRUE"
-
- kde4-meta_src_test
-}