diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-10 18:00:20 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-10 18:00:20 +0000 |
commit | b2b19c584143aa3164437f01988775b3baced7a1 (patch) | |
tree | d682b95b673d238fe82f54a47550663464f4e5cd /kde-base/marble | |
parent | Sort test dep. Remove useless dies. (diff) | |
download | gentoo-2-b2b19c584143aa3164437f01988775b3baced7a1.tar.gz gentoo-2-b2b19c584143aa3164437f01988775b3baced7a1.tar.bz2 gentoo-2-b2b19c584143aa3164437f01988775b3baced7a1.zip |
Version bump
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/marble')
-rw-r--r-- | kde-base/marble/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/marble/marble-4.6.4.ebuild | 74 |
2 files changed, 80 insertions, 1 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index f683bed30b58..97b1ec089055 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/marble # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.96 2011/06/10 11:50:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.97 2011/06/10 17:59:50 dilfridge Exp $ + +*marble-4.6.4 (10 Jun 2011) + + 10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +marble-4.6.4.ebuild: + Version bump 10 Jun 2011; Markos Chandras <hwoarang@gentoo.org> marble-4.6.3.ebuild: Stable on amd64 wrt bug #369979 diff --git a/kde-base/marble/marble-4.6.4.ebuild b/kde-base/marble/marble-4.6.4.ebuild new file mode 100644 index 000000000000..23ff14d740cb --- /dev/null +++ b/kde-base/marble/marble-4.6.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.6.4.ebuild,v 1.1 2011/06/10 17:59:50 dilfridge Exp $ + +EAPI=3 + +KDE_HANDBOOK="optional" +CPPUNIT_REQUIRED="optional" +PYTHON_DEPEND="python? 2" +KDE_SCM="git" +if [[ ${PV} == *9999 ]]; then + kde_eclass="kde4-base" +else + KMNAME="kdeedu" + kde_eclass="kde4-meta" +fi +inherit ${kde_eclass} python + +DESCRIPTION="Generic geographical map widget" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug designer-plugin gps plasma python" + +# tests fail / segfault. Last checked for 4.2.88 +RESTRICT=test + +DEPEND=" + gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) + python? ( + >=dev-python/PyQt4-4.4.4-r1 + $(add_kdebase_dep pykde4) + ) +" +RDEPEND="${DEPEND} + !sci-geosciences/marble +" + +PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) +# note that this patch will not work if we ever make a qt-only build + +pkg_setup() { + python_set_active_version 2 + ${kde_eclass}_pkg_setup +} + +src_prepare() { + ${kde_eclass}_src_prepare + python_convert_shebangs -r $(python_get_version) . +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN) + $(cmake-utils_use_with plasma) + $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS) + $(cmake-utils_use_with python PyKDE4) + $(cmake-utils_use_with python PyQt4) + $(cmake-utils_use_with python PythonLibrary) + $(cmake-utils_use_with python SIP) + $(cmake-utils_use_with gps libgps) + -DWITH_liblocation=0 + ) + + find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' + + ${kde_eclass}_src_configure +} + +src_install() { + if use plasma; then + insinto /usr/share/apps/cmake/modules + doins "${S}"/cmake/modules/FindMarbleWidget.cmake + fi + ${kde_eclass}_src_install +} |