summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-10 13:20:21 +0200
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-10 13:29:24 +0200
commit8c633369474f9c3b529a2c8bd1a684d669b8e41e (patch)
treecb0db32c880df43ab7efc7999902f85b4951dd85
parent2fda9218117bba2d249b216c6112151330551792 (diff)
downloadkde-8c633369474f9c3b529a2c8bd1a684d669b8e41e.tar.gz
kde-8c633369474f9c3b529a2c8bd1a684d669b8e41e.tar.bz2
kde-8c633369474f9c3b529a2c8bd1a684d669b8e41e.zip
[kdevplatform] Sync with main tree.
-rw-r--r--dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch24
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.2.0.ebuild67
2 files changed, 0 insertions, 91 deletions
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
deleted file mode 100644
index 4c789a38c20..00000000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h
---- kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h 2011-01-23 20:29:25.000000000 +0100
-+++ kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h 2011-01-29 02:54:27.000000000 +0100
-@@ -236,7 +236,7 @@
-
- QString m_name;
- int m_version;
-- mutable ItemRepositoryRegistry& m_registry;
-+ ItemRepositoryRegistry& m_registry;
- AbstractRepositoryManager* (*m_shareMutex)();
- };
-
-diff -ur kdevplatform-1.2.0/language/util/basicsetrepository.h kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h
---- kdevplatform-1.2.0/language/util/basicsetrepository.h 2011-01-23 20:29:25.000000000 +0100
-+++ kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h 2011-01-29 02:53:21.000000000 +0100
-@@ -129,7 +129,7 @@
- SetNodeData data;
-
- uint m_hash;
-- mutable SetDataRepository& repository;
-+ SetDataRepository& repository;
- mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
- mutable bool m_created;
- };
diff --git a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
deleted file mode 100644
index 0c09f0385c9..00000000000
--- a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild,v 1.3 2011/02/27 14:40:39 dilfridge Exp $
-
-EAPI=3
-
-# Bug 276208
-RESTRICT="test"
-
-KDE_LINGUAS="ca ca@valencia da de en_GB es et fi gl it nds nl pt pt_BR sl sv th uk zh_CN zh_TW"
-
-KMNAME="kdevelop"
-KDE_MINIMAL="4.6"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Moved to playground for now
-# bazaar kompare mercurial
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug git reviewboard subversion"
-
-# Moved to playground for now
-# bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
-# mercurial? ( dev-vcs/mercurial )
-# block - some plugins moved to kdevplatform from kdevelop
-DEPEND="
- dev-libs/boost
- reviewboard? ( dev-libs/qjson )
- subversion? ( >=dev-vcs/subversion-1.3 )
-"
-RDEPEND="${DEPEND}
- !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
- !dev-util/kdevelop-git
- $(add_kdebase_dep konsole)
- cvs? ( dev-vcs/cvs )
- git? ( dev-vcs/git )
-"
-
-PATCHES="${FILESDIR}/${P}-gcc46.patch"
-
-src_prepare() {
- kde4-base_src_prepare
-
- # FindKDevPlatform.cmake is installed by kdelibs
- sed -i \
- -e '/cmakeFiles/s/^/#DONOTINSTALL/' \
- cmake/modules/CMakeLists.txt || die
-}
-
-# Moved to playground for now
-# $(cmake-utils_use_build bazaar)
-# $(cmake-utils_use_with kompare)
-# $(cmake-utils_use_build mercurial)
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_build cvs)
- $(cmake-utils_use_build git)
- $(cmake-utils_use_with reviewboard QJSON)
- $(cmake-utils_use_build subversion)
- $(cmake-utils_use_with subversion SubversionLibrary)
- )
-
- kde4-base_src_configure
-}