| 1 |
dilfridge 11/07/31 18:24:35 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: marble-4.7.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Add support for qt-only build, bug 356457 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.8/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.103 kde-base/marble/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.103&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.103&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?r1=1.102&r2=1.103 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v |
| 20 |
retrieving revision 1.102 |
| 21 |
retrieving revision 1.103 |
| 22 |
diff -u -r1.102 -r1.103 |
| 23 |
--- ChangeLog 28 Jul 2011 20:02:13 -0000 1.102 |
| 24 |
+++ ChangeLog 31 Jul 2011 18:24:35 -0000 1.103 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for kde-base/marble |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.102 2011/07/28 20:02:13 alexxy Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.103 2011/07/31 18:24:35 dilfridge Exp $ |
| 30 |
+ |
| 31 |
+*marble-4.7.0-r1 (31 Jul 2011) |
| 32 |
+ |
| 33 |
+ 31 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 34 |
+ +files/marble-4.7-magic-r1.patch, +marble-4.7.0-r1.ebuild: |
| 35 |
+ Add support for qt-only build, bug 356457 |
| 36 |
|
| 37 |
28 Jul 2011; Alexey Shvetsov <alexxy@g.o> |
| 38 |
+files/marble-4.5.5-gpsd.patch, marble-4.7.0.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 kde-base/marble/marble-4.7.0-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: marble-4.7.0-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2011 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ |
| 52 |
|
| 53 |
EAPI=3 |
| 54 |
|
| 55 |
KDE_HANDBOOK="optional" |
| 56 |
KDE_REQUIRED="optional" |
| 57 |
CPPUNIT_REQUIRED="optional" |
| 58 |
PYTHON_DEPEND="python? 2" |
| 59 |
KDE_SCM="git" |
| 60 |
inherit kde4-base python |
| 61 |
|
| 62 |
DESCRIPTION="Generic geographical map widget" |
| 63 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 64 |
IUSE="debug designer-plugin gps +kde plasma python" |
| 65 |
|
| 66 |
# tests fail / segfault. Last checked for 4.2.88 |
| 67 |
RESTRICT=test |
| 68 |
|
| 69 |
DEPEND=" |
| 70 |
gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) |
| 71 |
python? ( |
| 72 |
>=dev-python/PyQt4-4.4.4-r1 |
| 73 |
kde? ( $(add_kdebase_dep pykde4) ) |
| 74 |
) |
| 75 |
" |
| 76 |
RDEPEND="${DEPEND} |
| 77 |
!sci-geosciences/marble |
| 78 |
" |
| 79 |
|
| 80 |
PATCHES=( |
| 81 |
"${FILESDIR}/${PN}-4.7-magic-r1.patch" |
| 82 |
"${FILESDIR}/${PN}-4.5.5-gpsd.patch" |
| 83 |
) |
| 84 |
|
| 85 |
pkg_setup() { |
| 86 |
python_set_active_version 2 |
| 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 |
} |
Archives