[gentoo-commits] repo/gentoo:master commit in: sci-libs/cifparse-obj/files/, sci-libs/cifparse-obj/

[Justin Lecher]

commit:     b71be70a5e0eee017fc3ba5d3a9952bc55c1b1c7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 12:42:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 12:55:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71be70a

sci-libs/cifparse-obj: Add gcc5 support

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=570254

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild       |  3 ++-
 .../cifparse-obj/files/cifparse-obj-7.025-gcc5.patch     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
index be87825..a30d3b4 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
@@ -28,7 +28,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-makefile.patch \
 		"${FILESDIR}"/${P}-gcc4.3.patch \
-		"${FILESDIR}"/${P}-gcc4.7.patch
+		"${FILESDIR}"/${P}-gcc4.7.patch \
+		"${FILESDIR}"/${P}-gcc5.patch
 
 	sed \
 		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \

diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch
new file mode 100644
index 0000000..6b2f797
--- /dev/null
+++ b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc5.patch
@@ -0,0 +1,16 @@
+ etc/platform.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/platform.sh b/etc/platform.sh
+index ff0ab51..1b56ab1 100755
+--- a/etc/platform.sh
++++ b/etc/platform.sh
+@@ -60,7 +60,7 @@ case `uname -s` in
+ #   Check if it is a Linux platform
+     Linux)
+ #     Check if it is GCC version 4.x
+-      gcc_ver=`gcc --version | grep -e " 4\."`
++      gcc_ver=`gcc --version | grep -e " [45]\."`
+       if [[ -z $gcc_ver ]]
+       then
+ #       It is not GCC version 4.x. Check if it is GCC version 3.x