Stable on ppc wrt bug#431894. Drop older.

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

4 files changed, 8 insertions, 68 deletions

diff --git a/dev-libs/grantlee/ChangeLog b/dev-libs/grantlee/ChangeLog
index 33928c0a4ef5..0e26771a6231 100644
--- a/dev-libs/grantlee/ChangeLog
+++ b/dev-libs/grantlee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/grantlee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.14 2012/08/01 19:14:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.15 2012/08/19 07:58:27 scarabeus Exp $
+
+  19 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/grantlee-0.1.8-arm.patch, -grantlee-0.1.8.ebuild,
+  grantlee-0.1.9.ebuild:
+  Stable on ppc wrt bug#431894. Drop older.
 
 *grantlee-0.2.0 (01 Aug 2012)
 
diff --git a/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch b/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch
deleted file mode 100644
index f8bc1ee3249a..000000000000
--- a/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN grantlee-0.1.8.orig/templates/lib/abstractlocalizer.cpp grantlee-0.1.8/templates/lib/abstractlocalizer.cpp
---- grantlee-0.1.8.orig/templates/lib/abstractlocalizer.cpp	2011-01-24 09:32:38.000000000 +0100
-+++ grantlee-0.1.8/templates/lib/abstractlocalizer.cpp	2011-06-18 18:07:49.000000000 +0200
-@@ -47,7 +47,7 @@
-   else if ( isSafeString( variant ) )
-     return localizeString( getSafeString( variant ).get() );
-   else if ( variant.type() == QVariant::Double )
--    return localizeNumber( variant.toDouble() );
-+    return localizeNumber( qreal(variant.toDouble()) );
-   else if ( variant.canConvert( QVariant::LongLong ) )
-     return localizeNumber( variant.toInt() );
-   return QString();
diff --git a/dev-libs/grantlee/grantlee-0.1.8.ebuild b/dev-libs/grantlee/grantlee-0.1.8.ebuild
deleted file mode 100644
index 74bf317d0394..000000000000
--- a/dev-libs/grantlee/grantlee-0.1.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.8.ebuild,v 1.7 2012/02/23 16:38:31 xarthisius Exp $
-
-EAPI=4
-
-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 ~arm ppc ~ppc64 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-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS=(AUTHORS CHANGELOG GOALS README)
-
-# Some tests fail
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-arm.patch" )
-
-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}/apidox/")
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/grantlee/grantlee-0.1.9.ebuild b/dev-libs/grantlee/grantlee-0.1.9.ebuild
index 4263f946b8ff..aa4dffc34fd2 100644
--- a/dev-libs/grantlee/grantlee-0.1.9.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.5 2012/04/18 18:36:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.6 2012/08/19 07:58:27 scarabeus Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
 SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 SLOT="0"
 IUSE="debug doc test"