Added the KDE 4.0.5 version of marble.

Package-Manager: portage-2.2_pre7/cvs/Linux 2.6.25-gentoo-r4 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

4 files changed, 67 insertions, 16 deletions

diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 1668ed5d8c9d..bb21079be646 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX akregator-3.5.9-customcolors.patch 11558 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f SHA1 321387cb813d0615a5760f5d5ed107b344a88e8a SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1
 AUX certmanager-3.5.9-fix-kdeenablefinal.patch 1141 RMD160 c132934d60dc01c073850f8d5bc82452a430327f SHA1 ddad372007f5e28df1e7f20ced314229ab63c0fe SHA256 39dfa1543cef12b3db29f4f68b08dc6e80c895292a693f73e7b18b30083584c3
+AUX kitchensync-3.5.9-OpenSync0.30API.patch 115107 RMD160 e61838df14395596cc087be05dbff2a952179285 SHA1 390a72a457ef30fa82e936743aaf0fd0c6ef65f1 SHA256 7f2af0852467d83476fd18d4d40fe8f23b7137209e3d5c77f374e3279807f83a
 AUX korganizer-3.5.9-kdeenablefinal.patch 2046 RMD160 316dfdc39450a63ce97c6490c04d8f22ad5101da SHA1 2d047295901c4080aa958d269cd2354b16c618b7 SHA256 b8391aaa5854e4ddd63519d63354a2646651fffd190a88e503c3963051ece3c1
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5.8.tar.bz2 14107449 RMD160 bb34c7e88227a1ebdd8ff38ee41445f85969175e SHA1 8284db2d3d767228cfb2cad4bf8d5221848d64f2 SHA256 433f8541af0a05e0a7e15df5ecca8463a29b6574871b941a8312b04b2233fef1
 DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54 SHA1 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15 SHA256 ee3f02ac828f1915c09b8c0a1289efcfbae36321cd07bc071df8be041de10d3a
 EBUILD kdepim-3.5.8.ebuild 1587 RMD160 099e4d8555eebc2b00ca32cd84afbed922f54218 SHA1 10d22f525f909c96334be564ef2e1fb79c017355 SHA256 de1e022eef7d131467a2de62722692b40559306fc0f9c5fe2c05c3005a7c533f
 EBUILD kdepim-3.5.9-r1.ebuild 1782 RMD160 0f14d64776923db94b7f4dfd332a3c73d6919107 SHA1 cf2259605c3eacdb91c287cd6ba3e4ada5b24df4 SHA256 e3147d44757acbcfd1314422dda6d898791d06f70beab6b566c2a153f122caa3
+EBUILD kdepim-3.5.9-r2.ebuild 1856 RMD160 3aad9ae656c07046cea4800b3232f4ad8f03db51 SHA1 fe048bfbb70b5f1b59aa1e0eac7088b46e686846 SHA256 891c33f8580c5c162628975600bb19b65ee2922ec8942fdd5aad410f82e6a2f8
 EBUILD kdepim-3.5.9.ebuild 1730 RMD160 3d0c1adc8882af3eec23a4b5246d84a8fae9f5b7 SHA1 aff661d4a6fc7d384f02ed7454de967863e649c8 SHA256 59b50f24c49f3a6855d554168e92497446aeb078d23d7d7904c8013a5b7d2fa2
-MISC ChangeLog 42981 RMD160 0e4f609e1eea1045109050a0d026e5b75154bfe3 SHA1 9cda74ad450ca4b76d40bb05af7001126763c131 SHA256 52ed036f0bd9401092c924fd2b0f60861221055b38495c6b738f7ab9833ad3fc
+MISC ChangeLog 43238 RMD160 289e4a19218683455be5ee6a54502dcd969db151 SHA1 9a318eb4685a8ffbeed16a7cb4377e2f7323c86b SHA256 3400464125499ec53ae712000748e91c8ae50ccb70b3c576ce496a2750e14d4f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgwo3QACgkQkKaRLQcq0GKcogCcC3MJ/sQ17J8u59aQHIUq+quA
-5FIAmwSrtgot9Rwb+5c98DDoLvlvTUWd
-=UHt9
------END PGP SIGNATURE-----
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index f3960c59d461..96a24d049152 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2008/05/16 00:51:21 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.13 2008/06/05 22:42:02 keytoaster Exp $
+
+*marble-4.0.5 (05 Jun 2008)
+
+  05 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> +marble-4.0.5.ebuild:
+  Added the KDE 4.0.5 version of marble.
 
 *marble-4.0.4 (15 May 2008)
 
diff --git a/kde-base/marble/marble-4.0.5.ebuild b/kde-base/marble/marble-4.0.5.ebuild
new file mode 100644
index 000000000000..e2fc5fc9d7f1
--- /dev/null
+++ b/kde-base/marble/marble-4.0.5.ebuild
@@ -0,0 +1,52 @@
+# 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
+}
diff --git a/kde-base/strigi-analyzer/Manifest b/kde-base/strigi-analyzer/Manifest
index 6a07d3d40c23..cb4633a82cc8 100644
--- a/kde-base/strigi-analyzer/Manifest
+++ b/kde-base/strigi-analyzer/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST kdesdk-4.0.2.tar.bz2 4220984 RMD160 2f633c5f2fd8eb9dac2911a1df22295594156623 SHA1 b1a57fd0910c73f5bc21fb2cbcf4913c3383152d SHA256 a8a952b9d362aa34ee22b9b7633f279665f29c40f18556bb1c69caf8c1aa33d9
 DIST kdesdk-4.0.3.tar.bz2 4226598 RMD160 4dd4c90fc36ba121115c72ebdbebca71cb7e076c SHA1 548685ffa1206f3a999539c8ca405700e84aff48 SHA256 5c862915204972d3e6a1d863c12fcbddf80de55bdce9eb57ca5c007664e5f2b7
 DIST kdesdk-4.0.4.tar.bz2 4227224 RMD160 49a868ba21bfeda61211f5d90efb3810507c65df SHA1 d66ca576186c90b13f77540c991b08e0890fd10c SHA256 e839e4d449888fc0166027c17bc6659a6ba57d3d54989b2b00a73f9ddc4e1b72
+DIST kdesdk-4.0.5.tar.bz2 4263585 RMD160 78b5ea80e8b323a121989195f2e4e66eefe4eaf4 SHA1 996b3d348098a6765a144aa38d524a9f3e22be97 SHA256 792767e13fb9a4fdd26b90a1565c1ab06568c29994f6e3b2fcd022eca25869d7
 EBUILD strigi-analyzer-4.0.2.ebuild 411 RMD160 f1cafc61ac4f51de5946edb6e48b151862966086 SHA1 48732def41f39012f900f53c9db922b59c7fe3bd SHA256 87588eeee1c163dde77706bba9539937783e126adc8722b2b2bf162630db42de
 EBUILD strigi-analyzer-4.0.3.ebuild 411 RMD160 1eb8164ad52c702336be15ee70b89b5c878bc596 SHA1 0379be8c3e6e5651be827201eab6cd96cdfb3bce SHA256 46016ff45769e5dbe7b08394514743ab1f2f4aa9dbaff2d09f49751a5a2301a8
 EBUILD strigi-analyzer-4.0.4.ebuild 407 RMD160 e89b704928e4e4b27153a9c7daa45dba4555415d SHA1 406773106dbfab5731c2988a45ac1318e84db12d SHA256 53ca18aca13e4b26d88e5615e25c5725610bde96de6aadd902f446ee6b584aea
-MISC ChangeLog 1502 RMD160 39be59bdba6011ee19c378ae4759ec21df2df713 SHA1 e70876febdbda4f207b559e19011a4768bd32330 SHA256 0701322dab04055e21bffe2ae2379999d1d126ae9d4c432203c97fb8f17215d7
+EBUILD strigi-analyzer-4.0.5.ebuild 411 RMD160 38524a26d355ea50f247ea9d4948057b4a49ab08 SHA1 c3128918fb5f8bbafda1089d6acfeb24fb1bc757 SHA256 0cd3a8574b5594cfcc3d7dcf64f1279a257bc17cf0e682058e658ccef4dc84aa
+MISC ChangeLog 1683 RMD160 7a2fa955735b63788b9dff21903bcd2b0adf5e99 SHA1 70f456da869beff2d62afe6fa1708f8c8cd09aab SHA256 c3ea494775706855327fd7107d1ff8433b3530eb58239c55448fdbc6c30d6948
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgs294ACgkQB18eXLOpYdlDNgCfZ5I3UaDrFxORHVBunfNI5dKn
-x9oAoI3ocKMo7vCkLvPl7D2soN/tNxOc
-=SJnn
+iEYEARECAAYFAkhIbWcACgkQKfQzuokD2Io7+wCeKocuyIE4VdHtDCzLKr8F30lK
+zAEAoLGHJ30CWMsnkMiKpR1dz80OqjIW
+=b7aa
 -----END PGP SIGNATURE-----