Merge updates from master

8 files changed, 203 insertions, 29 deletions

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 51d11daf5cd6..4c4d964fdb73 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1 +1,3 @@
+DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
+DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
diff --git a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
new file mode 100644
index 000000000000..3b627ef7a238
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+		elog "The symbols browser is disabled due to it causing crashes."
+		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+	fi
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
new file mode 100644
index 000000000000..ed606b14c4af
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-17.12.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+
+# USE="fortran" enables FortranProject plugin (v1.5)
+# that is delivered with Code::Blocks 17.12 source code.
+# https://sourceforge.net/projects/fortranproject
+# http://cbfortran.sourceforge.net
+
+IUSE="contrib debug fortran pch"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${WORKDIR}"/patches/
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
+		elog "The symbols browser is disabled due to it causing crashes."
+		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
+	fi
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
new file mode 100644
index 000000000000..7cbb678dda6a
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
@@ -0,0 +1,13 @@
+# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
+diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
+--- old/m4/acinclude.m4	2017-11-01 02:32:37.000000000 +0300
++++ new/m4/acinclude.m4	2018-05-04 11:08:33.000000000 +0300
+@@ -91,8 +91,6 @@
+ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
+                        enable_debug=$debug_default)
+     if test "x$enable_debug" = "xyes"; then
+-        CFLAGS="-g $CFLAGS"
+-        CXXFLAGS="-g $CXXFLAGS"
+         CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
+         AC_MSG_RESULT(yes)
+     else
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 147e365467fc..4d0690ce374b 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>torokhov_s_a@mail.ru</email>
+    <name>Sergey Torokhov</name>
+  </maintainer>
   <maintainer type="project">
     <email>wxwidgets@gentoo.org</email>
     <name>Gentoo wxWidgets Project</name>
   </maintainer>
   <use>
     <flag name="contrib">Build additional contrib components</flag>
+    <flag name="fortran">Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">codeblocks</remote-id>
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 057339dffa41..f493bab2d019 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -159,11 +159,11 @@ _meson_create_cross_file() {
 
 	cat > "${T}/meson.${CHOST}" <<-EOF
 	[binaries]
-	ar = '${AR}'
-	c = '${CC}'
-	cpp = '${CXX}'
-	pkgconfig = '${PKG_CONFIG}'
-	strip = '${STRIP}'
+	ar = '$(tc-getAR)'
+	c = '$(tc-getCC)'
+	cpp = '$(tc-getCXX)'
+	pkgconfig = '$(tc-getPKG_CONFIG)'
+	strip = '$(tc-getSTRIP)'
 
 	[properties]
 	c_args = $(_meson_env_array "${CFLAGS}")
@@ -211,24 +211,9 @@ meson_src_configure() {
 		--wrap-mode nodownload
 		)
 
-	# Both meson(1) and _meson_create_cross_file need these
-	local -x AR=$(tc-getAR)
-	local -x CC=$(tc-getCC)
-	local -x CXX=$(tc-getCXX)
-	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
-	local -x STRIP=$(tc-getSTRIP)
-
 	if tc-is-cross-compiler; then
 		_meson_create_cross_file || die "unable to write meson cross file"
-		mesonargs+=(
-			--cross-file "${T}/meson.${CHOST}"
-		)
-		# In cross mode, meson uses these as the native/build programs
-		AR=$(tc-getBUILD_AR)
-		CC=$(tc-getBUILD_CC)
-		CXX=$(tc-getBUILD_CXX)
-		PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG)
-		STRIP=$(tc-getBUILD_STRIP)
+		mesonargs+=( --cross-file "${T}/meson.${CHOST}" )
 	fi
 
 	# https://bugs.gentoo.org/625396
@@ -241,7 +226,7 @@ meson_src_configure() {
 	set -- meson "${mesonargs[@]}" "$@" \
 		"${EMESON_SOURCE:-${S}}" "${BUILD_DIR}"
 	echo "$@"
-	"$@" || die
+	tc-env_build "$@" || die
 }
 
 # @FUNCTION: meson_src_compile
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 4b1876b8e09b..1c8090cf75c7 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -247,13 +247,21 @@ tc-stack-grows-down() {
 # Export common build related compiler settings.
 tc-export_build_env() {
 	tc-export "$@"
-	# Some build envs will initialize vars like:
-	# : ${BUILD_LDFLAGS:-${LDFLAGS}}
-	# So make sure all variables are non-empty. #526734
-	: ${BUILD_CFLAGS:=-O1 -pipe}
-	: ${BUILD_CXXFLAGS:=-O1 -pipe}
-	: ${BUILD_CPPFLAGS:= }
-	: ${BUILD_LDFLAGS:= }
+	if tc-is-cross-compiler; then
+		# Some build envs will initialize vars like:
+		# : ${BUILD_LDFLAGS:-${LDFLAGS}}
+		# So make sure all variables are non-empty. #526734
+		: ${BUILD_CFLAGS:=-O1 -pipe}
+		: ${BUILD_CXXFLAGS:=-O1 -pipe}
+		: ${BUILD_CPPFLAGS:= }
+		: ${BUILD_LDFLAGS:= }
+	else
+		# https://bugs.gentoo.org/654424
+		: ${BUILD_CFLAGS:=${CFLAGS}}
+		: ${BUILD_CXXFLAGS:=${CXXFLAGS}}
+		: ${BUILD_CPPFLAGS:=${CPPFLAGS}}
+		: ${BUILD_LDFLAGS:=${LDFLAGS}}
+	fi
 	export BUILD_{C,CXX,CPP,LD}FLAGS
 
 	# Some packages use XXX_FOR_BUILD.
diff --git a/profiles/package.mask b/profiles/package.mask
index 2f4449978cd0..8bb42114382d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -542,6 +542,7 @@ net-wireless/cpyrit-cuda
 # Drop mask after migration of existing wxGTK:3.0 users
 =net-ftp/filezilla-3.30.0-r300
 =net-ftp/filezilla-3.31.0-r300
+=dev-util/codeblocks-17.12-r300
 
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Old gstreamer 0.10 version, which is security vulnerable.