Import patch from debian to fix compilation with gcc4.8

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x84F20B43

4 files changed, 41 insertions, 7 deletions

diff --git a/app-misc/granule/ChangeLog b/app-misc/granule/ChangeLog
index 1c68dac74a95..6b89b33337fa 100644
--- a/app-misc/granule/ChangeLog
+++ b/app-misc/granule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/granule
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/granule/ChangeLog,v 1.11 2012/05/03 19:41:35 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/granule/ChangeLog,v 1.12 2014/03/22 19:33:59 angelos Exp $
+
+  22 Mar 2014; Christoph Mende <angelos@gentoo.org>
+  +files/granule-1.4.0-fix-template-with-permissive.patch, granule-1.4.0.ebuild:
+  Import patch from debian to fix compilation with gcc4.8
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> granule-1.4.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -40,4 +44,3 @@
 
   11 Sep 2007; Christoph Mende <angelos@gentoo.org> +granule-1.2.4.ebuild:
   Initial import
-
diff --git a/app-misc/granule/Manifest b/app-misc/granule/Manifest
index 0658964d38b7..009d515fda24 100644
--- a/app-misc/granule/Manifest
+++ b/app-misc/granule/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX granule-1.4.0-fix-template-with-permissive.patch 583 SHA256 4a118f07b72ab30c699d35738ddfdfb972b9583df5fb591ff5683c9bf04131dd SHA512 a0c6c4c9d11c8d7d65b0f43d8d8b37ac39df9a3eebdbe66c9c1a79f32a613e261a409eccbed357ad2f1d900cb6df40f1534ae55ae9f0190865239b432df2da0f WHIRLPOOL 30770a18eeec26234d77e08dd4ce58894796318bcaec92401e747094518c1151c6ccc78e220649e9e2672c3d282abf2b0fc1a59efe34db4bcd98640f82fead32
 DIST granule-1.4.0-7.tar.gz 677428 SHA256 356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 SHA512 a5e3640c06b573a2bca01a4b893fec7ff363185e121a09c23f99297651518f7745f130b31165c47ee0c603c3ff2f59d996197c4b507edc8487998ddb80cef8b6 WHIRLPOOL 54f13dea2f0aa0a56e5b9f382c9b677d75293b26dce2acc3b6ecfa049844389c53a8dcab3e857220ef24b8bb545ffe3a479c9db520916944686044afe851a6d0
-EBUILD granule-1.4.0.ebuild 825 SHA256 548247932dd9df33e4c63e4e7a4db163f88a54f81bd2c556dc62551c5405d9df SHA512 a1a50d9a7c86d53af3993231449634f98b712a82768a0c5f39bfc6fdc9c134fa791e242cc65625ecb46eb799bda2bbe66da577c74157dcb077c93af941c9bafb WHIRLPOOL 5795414bcdda3cfa2c337301ef13a7da1ae5bcae68357310078e334656d6265209870c7d2ed5d05bfb00ef080a8c058f275c45e22ca0020fbe1366a54e7f1420
-MISC ChangeLog 1388 SHA256 5f671586af06172923cc4ce8e988b963ab17487b195ea854bc3f8dbbbded9a76 SHA512 74d0854fe0d5821864542623d173bc9fefb00126341539ac470d956ca1b1ca538e40004768ef4c9ec246ae4ca3e69a0a898ee02758c627fff39008b29bdb98d5 WHIRLPOOL 0db1def0d0babf7bc224b30fd45960ce29addf21a094a9164cc2cd3049010e6537d2632fb7ac3d2827bbec0e5ff5c3d5aa34ff816e06eaf66e58ceccc3c1a17a
+EBUILD granule-1.4.0.ebuild 922 SHA256 ee7dfe0293247eda291a6ff295f45d0bb2b99c88b4a1cc6dd3404a54d0280f1c SHA512 e43bdfaff61a4a95e064221f1e43c124ab963fed7d3746959da636492296fe8e57bff17209e50bfcfb28aab83f2a05e66bf7f41ec5b23f1f21dd162f3a021aa0 WHIRLPOOL f5424848bfe04e553aa79270b2f55e34ada1a0e8be0ee29a1b67e19723a64f022ea2c55cab54f2ec1d2ccf8623ee9a629672e0c6a62c1e02248c44b23564dec1
+MISC ChangeLog 1580 SHA256 fe4d73f24c6cec91f64c141f4b222103d1380c3e4f6ff228763c21d36fdd715a SHA512 920909eb800ae6b788649d67643a4df93a52c2e465e03865a99ca969bb128732e83be8e0b7b27a0ad3f8a389dbe710f18c1710e61a7589f45b1be0dfe0d1f5f3 WHIRLPOOL d9777a6f3812cec710d674fc5bbfcba6ee87177419460658c676c45c4d87f9c2652c5404ba5ba70e86a561f0bea7d8a0a5826aee1beaa503ba973770d40133fe
 MISC metadata.xml 236 SHA256 3d0f545d018f4339358833ccd9c96f191d49a0ec57538a6555b1e8309950ffc4 SHA512 1b0218005e78814a9faddb69385f8c52c70735859380dd678148021c65ae7010fd045e14ce87945a01e6ec3a5114f060a6be64cde6ecc5d6e142179bcfffbd7b WHIRLPOOL 17efdd67f82ebefdaef81327ecff218d23085003b7c1eea0eef873ade2c2ea2a3de078e44a46290cb359212a1b62b48cc795c84219bb8fb05d71039996e3eeef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlMt5akACgkQmWq1bYTyC0NjFAD/f5DFqZn4PxS1qfoxuOG6rMij
+I8TAv6ImHJ9sFub55TMBAKABdWK0nugMo3j/16Nor23ThzPEWCs81GXCDxGHjITy
+=ktdb
+-----END PGP SIGNATURE-----
diff --git a/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch b/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch
new file mode 100644
index 000000000000..252c41e77973
--- /dev/null
+++ b/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch
@@ -0,0 +1,15 @@
+Description: Fix build with gcc4.8 and -fpermissive
+Bug-Debian: http://bugs.debian.org/701292
+Last-Update: 2013-08-11
+
+--- granule-1.4.0-7.orig/src/Granule.cpp
++++ granule-1.4.0-7/src/Granule.cpp
+@@ -56,7 +56,7 @@ ASSA_DECL_SINGLETON(Granule);
+ 
+ static const int TIMEOUT = 2000;  // 2 seconds (1,000 mls = 1 sec).
+ 
+-template <> xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
++xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
+ 
+ /*******************************************************************************
+                           Member Functions
diff --git a/app-misc/granule/granule-1.4.0.ebuild b/app-misc/granule/granule-1.4.0.ebuild
index 356f5493e341..9fa3b74a2938 100644
--- a/app-misc/granule/granule-1.4.0.ebuild
+++ b/app-misc/granule/granule-1.4.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/granule/granule-1.4.0.ebuild,v 1.6 2012/05/03 19:41:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/granule/granule-1.4.0.ebuild,v 1.7 2014/03/22 19:33:59 angelos Exp $
 
 EAPI="2"
+inherit eutils
 
 DESCRIPTION="A flashcard program that implements Leitner cardfile methodology"
 HOMEPAGE="http://granule.sourceforge.net/"
@@ -28,6 +29,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}-7"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-template-with-permissive.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README