Gentoo Archives: gentoo-commits

From: "Alexey Shvetsov (alexxy)" <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/marble: ChangeLog marble-4.2.0.ebuild
Date: Tue, 27 Jan 2009 18:16:52
Message-Id: E1LRsUU-00011d-TJ@stork.gentoo.org
1 alexxy 09/01/27 18:16:50
2
3 Modified: ChangeLog
4 Added: marble-4.2.0.ebuild
5 Log:
6 Bump shiny new KDE 4.2.0
7 (Portage version: 2.2_rc23/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.21 kde-base/marble/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.21&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.21&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?r1=1.20&r2=1.21
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
19 retrieving revision 1.20
20 retrieving revision 1.21
21 diff -u -r1.20 -r1.21
22 --- ChangeLog 14 Jan 2009 16:01:48 -0000 1.20
23 +++ ChangeLog 27 Jan 2009 18:16:50 -0000 1.21
24 @@ -1,6 +1,11 @@
25 # ChangeLog for kde-base/marble
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.20 2009/01/14 16:01:48 alexxy Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.21 2009/01/27 18:16:50 alexxy Exp $
29 +
30 +*marble-4.2.0 (27 Jan 2009)
31 +
32 + 27 Jan 2009; Alexey Shvetsov <alexxy@g.o> +marble-4.2.0.ebuild:
33 + Bump KDE-4.2.0
34
35 14 Jan 2009; Alexey Shvetsov <alexxy@g.o> -marble-4.1.2.ebuild,
36 -marble-4.1.3.ebuild:
37
38
39
40 1.1 kde-base/marble/marble-4.2.0.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.2.0.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.2.0.ebuild?rev=1.1&content-type=text/plain
44
45 Index: marble-4.2.0.ebuild
46 ===================================================================
47 # Copyright 1999-2009 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.0.ebuild,v 1.1 2009/01/27 18:16:50 alexxy Exp $
50
51 EAPI="2"
52
53 KMNAME="kdeedu"
54 CPPUNIT_REQUIRED="optional"
55 inherit kde4-meta
56
57 DESCRIPTION="Generic geographical map widget"
58 KEYWORDS="~amd64 ~x86"
59 IUSE="debug designer-plugin htmlhandbook +kde gps plasma python"
60
61 DEPEND="
62 gps? ( sci-geosciences/gpsd )
63 kde? (
64 >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=]
65 >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
66 )
67 python? (
68 >=dev-python/PyQt4-4.4.4-r1
69 kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
70 )
71 "
72 RDEPEND="${DEPEND}
73 !kdeprefix? ( !sci-geosciences/marble )
74 "
75
76 pkg_setup() {
77 if use plasma && ! use kde; then
78 echo
79 eerror "KDE integration is required to build marble world clock applet."
80 eerror
81 eerror "Either enable 'kde' USE flag or disable 'plasma'."
82 eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
83 eerror " =${CATEGORY}/${PN}-${PV} kde plasma"
84 echo
85 die "Conflicting USE flags found"
86 fi
87
88 kde4-meta_pkg_setup
89 }
90
91 src_configure() {
92 mycmakeargs="${mycmakeargs}
93 $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
94 $(cmake-utils_use_with plasma Plasma)
95 $(cmake-utils_use_with python PyQt4)
96 $(cmake-utils_use_with python PythonLibrary)
97 $(cmake-utils_use_with python SIP)"
98
99 sed -i -e 's:add_subdirectory(cmake):#dontwantit:g' CMakeLists.txt \
100 || die "sed to disable file collisions failed"
101
102 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
103
104 if use gps; then
105 mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
106 else
107 sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
108 marble/Findlibgps.cmake || die "sed to disable gpsd failed."
109 fi
110
111 if use kde; then
112 mycmakeargs="${mycmakeargs} $(cmake-utils_use_with python PyKDE4)"
113 else
114 mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
115 fi
116
117 kde4-meta_src_configure
118 }