Merge branch 'master' into kde-git

Conflicts:
	kde-base/pykde4/Manifest
	kde-base/pykde4/pykde4-9999.ebuild

3 files changed, 52 insertions, 2 deletions

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 5ea0b0b8e07..1385c9bc2e6 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,4 +1,6 @@
 DIST grantlee-0.1.5.tar.gz 618490 RMD160 ba8522167ef1dfa65d029d807d74dff06a21aafb SHA1 0239d98d0be1a948f9d109dcd22f51f2005c7c99 SHA256 2aec88e25875ea69224b06da0988c5bc842ab0ddb06bcb27dfc2c43b49a61a10
-EBUILD grantlee-0.1.5.ebuild 937 RMD160 ae1a7310631458123829a79d3820018fa964e24a SHA1 3d11bfd518fd7c889cb630e51dc2d2fb09b07a9b SHA256 a0d77814c6fcbe280d86d7eae509c2dcd6127f17213d856f12404e152da805fc
+DIST grantlee-0.1.7.tar.gz 636992 RMD160 36d38a3f7e5cb09980d1fff37dc29d726c295f7b SHA1 02362a6cfeb2865e28397d8a626e95072a3ea247 SHA256 e2a86c272533d713d9d37e7f66b0c4c939795d3a7b1924349e20a8f26874663f
+EBUILD grantlee-0.1.5.ebuild 939 RMD160 8badf417841e4bb448fdd7cd2b3101afbb23758a SHA1 6ef33f2809b8f6bf9e2d4a020f60c05a7db4e280 SHA256 228ada3c562be8dbeea011204a99546b6b9efeaeada9e65f2ac7bed90ee1a1f8
+EBUILD grantlee-0.1.7.ebuild 937 RMD160 082c87392225b46265e2782b6b6a379931b46651 SHA1 de5a5729c99fd5a8e0c2cfa8b8852f23ee8ed113 SHA256 f1a768e2fb7b3672ced2c4d36fb377308eb352e252e94d2c93a199a8fb9e20fe
 EBUILD grantlee-9999.ebuild 936 RMD160 dbea2b6bc3be1d2b5eac58ac6aedef7d886f9f3f SHA1 5fb67ef72da501edb97e9e7e98a597d20e094385 SHA256 668c7169653e77c35abe4d7f824576c85dc38cac73f5eeb045508ddc0e5142b7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-libs/grantlee/grantlee-0.1.5.ebuild b/dev-libs/grantlee/grantlee-0.1.5.ebuild
index a2c8ada1c0d..55c7ea23fb3 100644
--- a/dev-libs/grantlee/grantlee-0.1.5.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.5.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils
 
 DESCRIPTION="C++ string template engine based on the Django template system"
 HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
-SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
+SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/grantlee/grantlee-0.1.7.ebuild b/dev-libs/grantlee/grantlee-0.1.7.ebuild
new file mode 100644
index 00000000000..42589a542ca
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-0.1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit cmake-utils
+
+DESCRIPTION="C++ string template engine based on the Django template system"
+HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
+SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc test"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	>=x11-libs/qt-gui-4.5.0:4
+	>=x11-libs/qt-script-4.5.0:4
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen[-nodot] )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS CHANGELOG GOALS README)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
+
+	cmake-utils_src_install
+}