4 files changed, 104 insertions, 7 deletions
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 827f71d57d4a..af43a80bba8d 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -5,6 +5,7 @@ DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f
 DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
-EBUILD codeblocks-20.03-r4.ebuild 1886 BLAKE2B 494dabba78cc8fa158cf70f111c869ffd95eeccfb1b6d67948efea2a9b6709d19bbfe71d124220c34dc8de4e4c8768a03cd0bdef84cd4f80609c91eb27c87432 SHA512 e0497e4a4e9ac983035936a385e399f97afbf47a70275577977bbf643c98e5e9b5867c50e9a6515d4d7138a3b9188c0aa069f79b95ab1ab9069fb361e1ee069d
-EBUILD codeblocks-9999.ebuild 1413 BLAKE2B b0c2aa1d16b7e43f93c811280e80602801604ab32943a42f18024678c90009030b0cf659515b2ca5289b1f25bf2982fdebf3bee96000eb74b6813c4a2ec1407d SHA512 78460da740b74a040419bc02387528ae54905656779f1cf496af4d8dc22b562e48a9ff48431f4c193be0551fb406d46585986efdfd43c42865a55ec6b99e6b6d
+EBUILD codeblocks-20.03-r4.ebuild 1949 BLAKE2B 648ed4a3621883329f3667ce73b0c13b8b9c48f5463456410ba2ad4b91ebe23a7edd8ed35d0db934a22e2ee8a802a17c3842b1999578faa8f423270e2f36f07e SHA512 286cfb7075ff6838918db3f5dead81d7572aef1f8ddd37be9b39cb2389bf1b39ec1e11ed2869a4d370a0a25f3f7742c09a7f593025bb99b687b1764e0342625e
+EBUILD codeblocks-20.03-r5.ebuild 2021 BLAKE2B 685b82d930a6769300201052224dfacbb2cf4a2d60c61509c7e7a73a1dfe7c17fbb2982e5d6a33c8c803e9e3fec423d4b0c7e70d0954ec9d84ae5bc90f580725 SHA512 5226bf948fb23a763ef4160b23fb3fec0cb092f295b66d192de146cbf507d755263afdf15bf1edf7435d85e22dd0bc7f60c6bdf977304bc415cea40d2a933372
+EBUILD codeblocks-9999.ebuild 1546 BLAKE2B 17b5900fd5ee8e1d5651e6c0fdd64e3692a6856fa262d75ed15df5e42355be5658ad904ed7f8cd9a7d971846c15e8434df2b829f22800857705f06d1f10ceb9f SHA512 9049a732d538df1a79e368ba0f60777b0a9ed65c56adadfccd4b9974a53c7f5115fa71da4efcaa16b166655ae38bc31d52f1435bf261c04fa1b797159175758f
 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index a4c49bac1afe..6f2f211771d4 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools wxwidgets xdg
+inherit autotools flag-o-matic wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
@@ -51,6 +51,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug 858338
+	append-flags -fno-strict-aliasing
+
 	setup-wxwidgets
 
 	# USE="contrib -fortran" setup:
diff --git a/dev-util/codeblocks/codeblocks-20.03-r5.ebuild b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
new file mode 100644
index 000000000000..ac379f1867b5
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 [r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-env.patch
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Bug 858338
+	append-flags -fno-strict-aliasing
+
+	setup-wxwidgets
+
+	# 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 \
+		--disable-pch \
+		--disable-static \
+		$(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") \
+		$(use_enable debug) \
+		${CONF_WITH_LST}
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 3ce6e1a69d71..6a574aa1d60e 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools subversion wxwidgets xdg
+inherit autotools flag-o-matic subversion wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
@@ -17,7 +17,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
 ESVN_FETCH_CMD="svn checkout --ignore-externals"
 ESVN_UPDATE_CMD="svn update --ignore-externals"
 
-IUSE="contrib debug pch"
+IUSE="contrib debug"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -46,16 +46,24 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug 858338
+	append-flags -fno-strict-aliasing
+
 	setup-wxwidgets
 
 	econf \
+		--disable-pch \
 		--disable-static \
 		$(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") \
 		$(use_enable debug) \
-		$(use_enable pch) \
 		$(use_with contrib contrib-plugins all)
 }
 
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 }