Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.7.2-r1.ebuild ChangeLog marble-4.7.2.ebuild
Date: Fri, 28 Oct 2011 19:57:47
Message-Id: 20111028195738.1D9D12004B@flycatcher.gentoo.org
1 abcd 11/10/28 19:57:38
2
3 Modified: ChangeLog
4 Added: marble-4.7.2-r1.ebuild
5 Removed: marble-4.7.2.ebuild
6 Log:
7 Revbump, use EAPI=4
8
9 (Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.111 kde-base/marble/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.111&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.111&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?r1=1.110&r2=1.111
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
21 retrieving revision 1.110
22 retrieving revision 1.111
23 diff -u -r1.110 -r1.111
24 --- ChangeLog 28 Oct 2011 19:03:19 -0000 1.110
25 +++ ChangeLog 28 Oct 2011 19:57:38 -0000 1.111
26 @@ -1,6 +1,12 @@
27 # ChangeLog for kde-base/marble
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.110 2011/10/28 19:03:19 dilfridge Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.111 2011/10/28 19:57:38 abcd Exp $
31 +
32 +*marble-4.7.2-r1 (28 Oct 2011)
33 +
34 + 28 Oct 2011; Jonathan Callen <abcd@g.o> +marble-4.7.2-r1.ebuild,
35 + -marble-4.7.2.ebuild:
36 + Revbump, use EAPI=4
37
38 28 Oct 2011; Andreas K. Huettel <dilfridge@g.o> -marble-4.7.1.ebuild:
39 Drop KDEpim 4.6.1 and KDE 4.7.1
40
41
42
43 1.1 kde-base/marble/marble-4.7.2-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.7.2-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.7.2-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: marble-4.7.2-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.2-r1.ebuild,v 1.1 2011/10/28 19:57:38 abcd Exp $
53
54 EAPI=4
55
56 KDE_HANDBOOK="optional"
57 KDE_REQUIRED="optional"
58 CPPUNIT_REQUIRED="optional"
59 PYTHON_DEPEND="python? 2"
60 KDE_SCM="git"
61 inherit kde4-base python
62
63 DESCRIPTION="Generic geographical map widget"
64 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
65 IUSE="debug designer-plugin gps +kde plasma python"
66
67 # tests fail / segfault. Last checked for 4.2.88
68 RESTRICT=test
69
70 DEPEND="
71 gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
72 python? (
73 >=dev-python/PyQt4-4.4.4-r1
74 kde? ( $(add_kdebase_dep pykde4) )
75 )
76 "
77 RDEPEND="${DEPEND}
78 "
79
80 PATCHES=(
81 "${FILESDIR}/${PN}-4.7-magic-r1.patch"
82 )
83
84 pkg_setup() {
85 python_set_active_version 2
86 python_pkg_setup
87 kde4-base_pkg_setup
88 }
89
90 src_prepare() {
91 kde4-base_src_prepare
92 python_convert_shebangs -r $(python_get_version) .
93 }
94
95 src_configure() {
96 mycmakeargs=(
97 $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
98 $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
99 $(cmake-utils_use_with python PyQt4)
100 $(cmake-utils_use_with python PythonLibrary)
101 $(cmake-utils_use_with python SIP)
102 $(cmake-utils_use_with gps libgps)
103 -DWITH_liblocation=0
104 )
105 use kde || mycmakeargs=(
106 -DQTONLY=ON
107 ${mycmakeargs[@]}
108 )
109 use kde && mycmakeargs=(
110 $(cmake-utils_use_with plasma)
111 $(cmake-utils_use_with python PyKDE4)
112 ${mycmakeargs[@]}
113 )
114
115 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
116
117 kde4-base_src_configure
118 }
119
120 src_install() {
121 if use plasma; then
122 insinto /usr/share/apps/cmake/modules
123 doins "${S}"/cmake/modules/FindMarbleWidget.cmake
124 fi
125 kde4-base_src_install
126 }