diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-13 00:08:29 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-13 00:08:29 +0000 |
| commit | 216ba353473b9affe2ceafd585c5c4f280ba9ff8 (patch) | |
| tree | ba7eb8ef8e5243ca6854a04a97a6b07072a60788 /kde-base | |
| parent | bump to 0.6.1. (diff) | |
| download | gentoo-2-216ba353473b9affe2ceafd585c5c4f280ba9ff8.tar.gz gentoo-2-216ba353473b9affe2ceafd585c5c4f280ba9ff8.tar.bz2 gentoo-2-216ba353473b9affe2ceafd585c5c4f280ba9ff8.zip | |
Fix collision. Per bug #265842.
(Portage version: 2.2_rc28/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/marble/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.2.2.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index 64968f303286..99eadd5f4e9c 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/marble # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.28 2009/04/12 06:36:12 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.29 2009/04/13 00:08:29 scarabeus Exp $ + + 13 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> marble-4.2.2.ebuild: + Fix collision. Per bug #265842. *marble-4.2.2 (11 Apr 2009) diff --git a/kde-base/marble/marble-4.2.2.ebuild b/kde-base/marble/marble-4.2.2.ebuild index 73963286bea4..5a7f8baed12b 100644 --- a/kde-base/marble/marble-4.2.2.ebuild +++ b/kde-base/marble/marble-4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.2.ebuild,v 1.1 2009/04/12 06:36:12 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.2.ebuild,v 1.2 2009/04/13 00:08:29 scarabeus Exp $ EAPI="2" @@ -47,6 +47,10 @@ src_configure() { $(cmake-utils_use_with python PythonLibrary) $(cmake-utils_use_with python SIP)" + sed -i \ + -e 's:add_subdirectory(cmake):#dontwantit:g' \ + CMakeLists.txt || die "sed to disable file collisions failed" + find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' if use gps; then |