Stable on ppc wrt bug#431894. Drop older.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 23 insertions, 80 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/Manifest b/dev-libs/grantlee/Manifest
index 0e5c4f208f51..594fae2828df 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX grantlee-0.1.8-arm.patch 704 SHA256 4d2f67b6bfa6049e1103436da8ad86a22711444702730a017038482814b558c9 SHA512 6b18dd9d7ad851748569689d466a9ba49d98fbc95d7f9cc70b49d3efd1ca09183f53c139e57e6a593b763f3625203b9bcdcc6810421617075a79576d2d5b9b54 WHIRLPOOL 87a7b342a83ffffcfb02ae1af413453e685770376169d6d3b163ab90ab2af8fe3a943c53838c44335d3dd6094dc0ffedf1e55ea07432b71bfdb98ad15ca9f71e
 AUX grantlee-0.1.9-qt-test-optional.patch 1428 SHA256 66c75a543a6dc04d85e2d1db6c3d0e0eba5d84c05967188b8bf4cdebcda76913 SHA512 6b7d428fa36ac0b9d1a6e1d6e5edb6e3b5f0344de70c834823436dc3f80744731eaa2528e86c5a4dc964361d9506bdb7c284c212853bc03b96b4048b19798aad WHIRLPOOL 2b1cb3dbbbfbd6cf947f85d3bb8e557736498600ed165cc4646dd453e7e61ec3ca008a38438c2d178e4595d90b233bd27e6b09781709c0de9231f0bd5f419772
-DIST grantlee-0.1.8.tar.gz 669703 SHA256 d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c SHA512 11e27ffd409408e6a0b3f206010bf78b547b26c3dbdeb69e58b6c00d36685c7fa72874550de9c036bf7a17ccf66adb290601428c3bd65dda7b09fd3f242e685e WHIRLPOOL 201b8992bca7a259bfa5b0c0010cf19702c1d16bc3aa7f06176eba95a55a408217c6873facaf3fb169eee6a830d92261be07961211fba07ecce0b5ff5bea365d
 DIST grantlee-0.1.9.tar.gz 1124725 SHA256 67f058a65ff3654d1d5f5de8e528332d1dddfd7963ec857de15d83d0acf55984 SHA512 2a169a3e1c5a065043424569d16848362162a8a57d412540625c1f98b6d013da5ff79163919e54dfe39f6477d3661941384a756bc965a5cef47500d36f76c68d WHIRLPOOL fd24453b80e4e5f5c6d59c1cac2809d18119a1cc0652f45cec3c1905a7304c6e00cc50ffb96797019b3f259a862858a5bb4570694163b7046659528682521fcd
 DIST grantlee-0.2.0.tar.gz 1128991 SHA256 43a6256b46a14cc12a2a6bdbe300f1c5ab52abd0cb6ba357db4580148bddd474 SHA512 a7885cc83b1caf759f76ec4a98ba1cc83b23997c5230ae68c28647b8f9d21ce5169416805930593fdf0313c9b65bdd764af470c552cf324b9a0d034fcc21e1c2 WHIRLPOOL 4aa59861a66112f190c0e08c816fd0683eefa22e4ebc01d7ff0c74390b2608c05f9d86255643d1d7769e0f922b532045965ce608bcbd061930710b7e67027585
-EBUILD grantlee-0.1.8.ebuild 1174 SHA256 0f064034b083424dd6656b293362498765d8f75ccad465fdb645f18f5bd74afd SHA512 dcd10e930219f1c602630283e97c1bb79c3a26d1007862376d2b516f9d25a47854c85d7a09beb1e09c28502c876072c46ffb470cbf07b45fe9cebd9be739f552 WHIRLPOOL 6dc07d8208dff0fdde40279e3f5a2ce950fed13b1f9a50eb4cc6b947014b1cbc3479b844c8f8078d53d31c4a5e09d4b1ed8e81c5e150a9b27e98d3ab039e3665
-EBUILD grantlee-0.1.9.ebuild 1222 SHA256 6a2abef9874eeef035b3707c4e7ac7ccd2bc219b691f3b250b167f8e631771fb SHA512 b21cb561399f2e143d6332336cf51aead11b5f2d66d4a5d803e6b40719348c35321a48d4272715fe3262e258398b0aaf9ca638b5ac60d9f114d0048ff49718c6 WHIRLPOOL c764d59b2765d9c8ad41b95e1e1ff860e650feaadbb6ffa2fbbd64f655e5c2143990585aa3ba50e61e43a777fe045317c770b887c63e0594b820b03a8385a770
+EBUILD grantlee-0.1.9.ebuild 1224 SHA256 3950d9c3963a928ea26e329cbea20f855e3983215037c1a998da1a2250deeb9e SHA512 3d8c5662b5086861798770603e4315da575bd70a42207be4d8c6e35ed8b9334f243ee4468b29d483db31356c7347b816e084cb149d1af38c0c2536687e03d31b WHIRLPOOL 362c425c63f3e07e0988233daa1a630c9fa96872300292060f06ce843a2aba06842777636e7e0994211f4cf647850336bbdeb79050a80b424312a25c3ef16471
 EBUILD grantlee-0.2.0.ebuild 1280 SHA256 90dd455b988d8b97d3350c9618777ccdd1af3312b93e94855ff759d900bc7e86 SHA512 3f442aaf3873f6927d476c1faf56862c8d943405f4a410db608378d2246df1f8f3208f3567b11473a629d0ed3aca2ac4516e544bcf554c4ae37fa89f6e1b1bba WHIRLPOOL 5275c66b9291b676a6b1d304dd6a03dfaee5317675a08020873950847d64a8796f7b5cf9a9edf4819b3b4132513b3b985cbc4d04e367b215783d4844ba5c1976
-MISC ChangeLog 2090 SHA256 b588a55145127068e34a659683a4ce4af4bbd5524d2e81ac39c410228d8f8c20 SHA512 394686e995886441cbe21fadc5ccae8ec450c44fbf43dc7c96722114379deb9d46107b1cfd45388aea61254e300dcbbcb35136c7c152f610c61f4a01b6f33572 WHIRLPOOL 6d4e54744894d1b942f3941d8b96b4df3254434d97027c37308d1ba146f7e7945fed4189b4b0c17d0607a4c615595fd5027e565889ac811fcf6388ad5c8dd655
+MISC ChangeLog 2279 SHA256 359c119cedb2027543767f4d9721ef359fb673ddd850fe89b76f2891f1aae425 SHA512 fe5ecbea951af7c7c1a59ee98a62f83c20b691fd0b4d2619065c00770a9fdeb9560c90eb42da4ff57c1907d8c8bec6f91fb32b1e291a717f60e28d96d44d38d0 WHIRLPOOL 870f49e2cba8a04e284a69f4e203db5ba9ffdc7947dd82c9aa3a8c17aacb3a72d3239b73221d72fb67c7e293dcb7dcc5db3ed61a30e1280823b0e142116312f4
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQGYAhAAoJEO+t9ga+3I3aR+kIAJDllvg8Ag4mFrG2/EnAVR2r
-scQfJPNG2/xfPGCsaWLfHKRZxroisKLIuNr6qqIwFqsgcJjVJ2CbfvJzF8/Li6j2
-2DVsRoVQ5dqRnFT6SBqsH4vOf66S6ZElaTIAPg2Ydlgxkhfhsp6wOS42BBQsWezr
-vblAO0cg5USDTbq6oWWDD2YV16HH3DlRyKK4NjiL+mpEX/HPryAHr1+/Exn/KpNa
-pYxkL5kajKvusd6wsGRuxnUcW1XejkFFU+7BbbYoDTIom/gvUzUy9HYpWj31GAOG
-fLedOHSkUT4HJ8LaEZTBrka9Ox0l0KnfIC5QZqsE7Zi4WcP5ZYhUh92gYFUJjbg=
-=mp7S
+iQIcBAEBCAAGBQJQMJytAAoJEOSiRoyO7jvo1SIP+wVdSkVWJ0jGwBBJ8FtU/3IZ
+3pSeIOkyrvVwcyhTcYcV7aRQmebN+Q6pkw16wRNY+ZvWhhLQBItgljMjEu6qLx93
+THQlX/2+h2UHvGpTC47sr5tRZbrr/aGXdGtiFaubNMRRzpQjZlM/E0S1hMitOOhA
+LB5sk+JrvwshJvPtEMQOCDBwPUX8U+nRr3OYmNUOVDHC/xqew2pHIM4SKuoODnWV
+k7Ml++UIRhhVkhnArz0nWObaV8+3X/SGgiNfRy687MQqUIHbU2i2tT7w5o+RQuu1
+r0lAwnUzvmkiD8DoHhLRheL1+w4uq+qi1VhNw7HKPBUeEVCsqPQnYiZtS9aQjhPQ
+lDmZ+BvMpknUwtH4fssP0FzjRoE+4qNQAjhdZuAXrvsUN8PgjOGZClyaXqDImq2Q
+dVBStfwISOLm03M89IMjZIpa8GSTWGdHgN3qzcL6uAV6wHpIJjt1dmyf4B+DIWgM
+7NhQRFxxHqX1u7U3tlAUN7KFAUZgrLvIGYecLLWRyfkTeUNzPeAQ8Kej73/5YQH4
+AqoMCtjxZP3BWBbVdBhmvgTfrvsngU73lesYnWDT7U1/J/JZgv5rAu6asREJCeOr
+WE1T8fhzWeijUmf/EHrIOn91BWf5zxKExPiBAmIC6cf5Csqt52OzWSSl8/q71+c5
+JUoYrD389ioZLcSBy/2w
+=/6If
 -----END PGP SIGNATURE-----
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"