Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/files/, dev-util/codeblocks/
Date: Mon, 28 May 2018 22:05:22
Message-Id: 1527545090.34f9194950f67c0863fed71c61990f811cd3b395.leio@gentoo
1 commit: 34f9194950f67c0863fed71c61990f811cd3b395
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 28 22:04:50 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon May 28 22:04:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f91949
7
8 dev-util/codeblocks: remove old
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 dev-util/codeblocks/Manifest | 1 -
13 dev-util/codeblocks/codeblocks-16.01.ebuild | 45 ----------------------
14 .../codeblocks/files/codeblocks-16.01-gcc7.patch | 30 ---------------
15 3 files changed, 76 deletions(-)
16
17 diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
18 index 4c4d964fdb7..7bfced6413f 100644
19 --- a/dev-util/codeblocks/Manifest
20 +++ b/dev-util/codeblocks/Manifest
21 @@ -1,3 +1,2 @@
22 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
23 -DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
24 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
25
26 diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild
27 deleted file mode 100644
28 index 07a042e6263..00000000000
29 --- a/dev-util/codeblocks/codeblocks-16.01.ebuild
30 +++ /dev/null
31 @@ -1,45 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -WX_GTK_VER="2.8"
38 -
39 -inherit eutils flag-o-matic wxwidgets
40 -
41 -DESCRIPTION="The open source, cross platform, free C++ IDE"
42 -HOMEPAGE="http://www.codeblocks.org/"
43 -LICENSE="GPL-3"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
46 -SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}.tar.gz"
47 -
48 -IUSE="contrib debug pch static-libs"
49 -
50 -S="${WORKDIR}/${P}.release"
51 -
52 -RDEPEND="app-arch/zip
53 - x11-libs/wxGTK:${WX_GTK_VER}[X]
54 - contrib? (
55 - app-text/hunspell
56 - dev-libs/boost:=
57 - dev-libs/libgamin
58 - )"
59 -DEPEND="${RDEPEND}
60 - virtual/pkgconfig"
61 -
62 -PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
63 -
64 -src_configure() {
65 - touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
66 - setup-wxwidgets
67 -
68 - append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
69 -
70 - econf \
71 - --with-wx-config="${WX_CONFIG}" \
72 - $(use_enable debug) \
73 - $(use_enable pch) \
74 - $(use_enable static-libs static) \
75 - $(use_with contrib contrib-plugins all)
76 -}
77
78 diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
79 deleted file mode 100644
80 index 84cbc88696c..00000000000
81 --- a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
82 +++ /dev/null
83 @@ -1,30 +0,0 @@
84 -Bug: https://bugs.gentoo.org/649248
85 -SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
86 -GIT Commit: https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
87 -
88 -From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
89 -From: jenslody <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
90 -Date: Fri, 10 Feb 2017 20:56:25 +0000
91 -Subject: [PATCH] gcc7 build-fix: avoid template-related error
92 -
93 ----
94 - src/include/scripting/sqplus/sqplus.h | 4 ++--
95 - 1 file changed, 2 insertions(+), 2 deletions(-)
96 -
97 -diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
98 -index 73f37b24f..ae7d3c75f 100644
99 ---- a/src/include/scripting/sqplus/sqplus.h
100 -+++ b/src/include/scripting/sqplus/sqplus.h
101 -@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
102 - return safeStringCopy(s,_s.s,MaxLength);
103 - }
104 - bool operator == (const ScriptStringVar & _s) {
105 -- return _strcmp(s,_s.s) == 0;
106 -+ return strcmp(s,_s.s) == 0;
107 - }
108 - bool compareCaseInsensitive(const ScriptStringVar & _s) {
109 -- return _stricmp(s,_s.s) == 0;
110 -+ return strcasecmp(s,_s.s) == 0;
111 - }
112 - };
113 -