diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-11-12 20:45:22 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-11-12 20:45:22 +1100 |
| commit | bf0847b6c71d2effd42481721c3cf94de6a5489e (patch) | |
| tree | 0106dd9d6d51d73d852b05a7f75ea525f7b42314 /dev-libs | |
| parent | 42124be8b0556bf37c215b78e971d5af7c915c92 (diff) | |
| parent | 00cda536c44b83e9aa7f61913386299cbe6c414b (diff) | |
| download | kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.gz kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.bz2 kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.zip | |
Merge branch 'master' into frameworks
Diffstat (limited to 'dev-libs')
7 files changed, 18 insertions, 18 deletions
diff --git a/dev-libs/extra-cmake-modules/extra-cmake-modules-0.0.8.ebuild b/dev-libs/extra-cmake-modules/extra-cmake-modules-0.0.8.ebuild index 6c5fc74a3be..6ff66022f15 100644 --- a/dev-libs/extra-cmake-modules/extra-cmake-modules-0.0.8.ebuild +++ b/dev-libs/extra-cmake-modules/extra-cmake-modules-0.0.8.ebuild @@ -4,11 +4,11 @@ EAPI=5 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="http://www.kde.org/" -EGIT_REPO_URI="git://anongit.kde.org/${PN}" +EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) EGIT_COMMIT="cc628694c9e55ffb38fad6e8bfc071fa4e09609b" LICENSE="BSD" diff --git a/dev-libs/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/dev-libs/extra-cmake-modules/extra-cmake-modules-9999.ebuild index d3f6e304ca1..81652637817 100644 --- a/dev-libs/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/dev-libs/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -4,18 +4,18 @@ EAPI=5 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="http://www.kde.org/" -EGIT_REPO_URI="git://anongit.kde.org/${PN}" +EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) LICENSE="BSD" SLOT=0 KEYWORDS="" DEPEND=" - >=dev-util/cmake-2.8.11 + >=dev-util/cmake-2.8.12 " RESTRICT="test" diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index 19ff89f05a0..8fd487890bd 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -4,11 +4,11 @@ EAPI=5 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 DESCRIPTION="C++ string template engine based on the Django template system" HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home" -EGIT_REPO_URI="git://gitorious.org/grantlee/${PN}" +EGIT_REPO_URI=( "git://gitorious.org/grantlee/${PN}" ) LICENSE="LGPL-2.1" KEYWORDS="" @@ -47,7 +47,7 @@ src_compile() { } src_install() { - use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidox/") + use doc && HTML_DOCS=("${BUILD_DIR}/apidox/") cmake-utils_src_install } diff --git a/dev-libs/libattica/libattica-9999.ebuild b/dev-libs/libattica/libattica-9999.ebuild index 12e0e7e18d7..6990c81476e 100644 --- a/dev-libs/libattica/libattica-9999.ebuild +++ b/dev-libs/libattica/libattica-9999.ebuild @@ -8,9 +8,9 @@ MY_P="${P#lib}" MY_PN="${PN#lib}" if [[ $PV = *9999* ]]; then - EGIT_REPO_URI="git://anongit.kde.org/attica" + EGIT_REPO_URI=( "git://anongit.kde.org/attica" ) KEYWORDS="" - scm_eclass=git-2 + scm_eclass=git-r3 else SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" @@ -53,7 +53,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README ) -S=${WORKDIR}/${MY_P} +[[ ${PV} != *9999 ]] && S=${WORKDIR}/${MY_P} src_configure() { local mycmakeargs=( diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild index 6b3310f49d3..f8ef4f6f347 100644 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild +++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild @@ -53,10 +53,10 @@ src_configure() { } src_test() { - local builddir=${CMAKE_BUILD_DIR} + local builddir=${BUILD_DIR} - CMAKE_BUILD_DIR=${CMAKE_BUILD_DIR}/tests \ + BUILD_DIR=${BUILD_DIR}/tests \ VIRTUALX_COMMAND=cmake-utils_src_test virtualmake - CMAKE_BUILD_DIR=${builddir} + BUILD_DIR=${builddir} } diff --git a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild index f53e4e551bb..23bfc9e6610 100644 --- a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild +++ b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild @@ -5,9 +5,9 @@ EAPI=5 if [[ ${PV} == *9999 ]]; then - SCM_ECLASS="git-2" + SCM_ECLASS="git-r3" fi -EGIT_REPO_URI="git://git.code.sf.net/p/oscaf/shared-desktop-ontologies" +EGIT_REPO_URI=( "git://git.code.sf.net/p/oscaf/shared-desktop-ontologies" ) inherit cmake-utils ${SCM_ECLASS} unset SCM_ECLASS diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild index 5f5227e2393..4f456e06caf 100644 --- a/dev-libs/soprano/soprano-9999.ebuild +++ b/dev-libs/soprano/soprano-9999.ebuild @@ -5,8 +5,8 @@ EAPI=5 if [[ ${PV} == *9999* ]]; then - git_eclass="git-2" - EGIT_REPO_URI="git://anongit.kde.org/soprano" + git_eclass="git-r3" + EGIT_REPO_URI=( "git://anongit.kde.org/soprano" ) KEYWORDS="" else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |