gentoo auto-resync : 26:01:2025 - 22:42:38

3 files changed, 130 insertions, 5 deletions

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 55e366a9bb55..3ac2a70c7625 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -12,6 +12,7 @@ DIST codeblocks-20.03_p13518.tar.bz2 19779652 BLAKE2B cc445516ce92918dfac67b250e
 DIST fortranproject_r378.tar.bz2 603873 BLAKE2B ed1fe94c591ec8ce1e5a844b3fa789f1bbecfade19a4ac1c3d17098da704b271be2e13d680e43050116d7117d40e117fa50d75ab5cc3ddd7223f46e1c2a162cd SHA512 fb4645f81b087d22e5735a33aded806595f96ccd1c2d32123a919c48de260ce2e1d96551fae0b65663902bc198a8f4ab158233b8755693df38315ea688cbaf92
 EBUILD codeblocks-20.03-r6.ebuild 2388 BLAKE2B 251e3569304c6fe42a5074ee1bf457f39d7306c403a81308cd2e2f410445e6cd2411b22c90ac9ca274c6f1df69f1407761ee5f781e26ee919fb4ae1b0cce04f9 SHA512 5ca19abf0d252e84a9e7f3bb1339bfe45459aafd730dbc3129fafd6cdc400295c7691f5b8d524795c564b163988c33e23e3980bd8c584f155cc5baf438bffd0a
 EBUILD codeblocks-20.03-r7.ebuild 2692 BLAKE2B cd4e7bd16ab478d662f94193cbe31cbd1450d98061af54a24a572ef2f1ef39fa82b822f68df7c2ecbb5e626757e7760326a2cdc712a39965161c91c3fae58b70 SHA512 b67d05d542e560d3b08ad5db3b07324bf188fd64bec3008bb8667dd6ae75c96c554b5174b694aac9ebeb4839a1165d28cf6ec8ab4be9d6f1dc94096274aa6aa4
+EBUILD codeblocks-20.03_p13518-r1.ebuild 2744 BLAKE2B 1e476c0122b9cdd02bf13e838a01651fc55019b8428d98ac8f9e0a7fba26ae9c587e60b9779c15a92d699d11e6c1da40620e23fc0dcc1325871f774660329135 SHA512 e666119846fed53eeba72f02eb6ba3f1757c94ebd17d7b1844446cd0d38581e814d2d63c15a7ba78f34f70bc06697fc9caa129ba8fccb75e4179acbeb5d2dbc7
 EBUILD codeblocks-20.03_p13518.ebuild 2783 BLAKE2B fa2e7f7dcf8186bc6e8f7cd693549546b01a7545e56fe5c196883e6dd911c9e3c0682925c672cce8d6d1c6b3c1d00f4f277eabed674af04655a529f151106247 SHA512 e7b427594023bf95000a713e8f3b23621a891d18528a6f021d16cd1a6750e9f870caa32299758827ff09c5f175bb15fe88e71729cb58a4bd6001a8dd78a0c474
-EBUILD codeblocks-9999.ebuild 1864 BLAKE2B b3abbffb334438bcc77be8a1e90d2307fe9c7edb2e72408f24322ab360fabd473446c086eebdbafb897d3531e8c16f7ec4a17dbf295962a3260ba8e6d1d6dba0 SHA512 5d1f7bde1d0cebbb6c33af4d8bc2308a3ee790e7875e4d1f2567cbf3f704f2a3882fecee0278bb0b88466dc31f9a5b636eea5accb8e8c2edd152195fa37c9e33
+EBUILD codeblocks-9999.ebuild 1920 BLAKE2B c1e5e42e8690704e0eac209edaee69528662e570b488d3694885c43ef02776280134d0a4955c5ffa2dc6efdfd17a593862a4acab18dda1b662c0429785f8815a SHA512 0bc588f23ec776fd65e411b6f47b449c60c22e0627b9febc2c4331f2a01da540470e7b60305364c44ca80fd91aeb7d01f514b01ba0e688b7e3a5843be6a3d8bd
 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03_p13518-r1.ebuild b/dev-util/codeblocks/codeblocks-20.03_p13518-r1.ebuild
new file mode 100644
index 000000000000..624f076ca642
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03_p13518-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools flag-o-matic multiprocessing wxwidgets xdg
+
+REV=13518
+REV_DATE="2024-05-05 20:30:28"
+FP_NAME=fortranproject
+FP_REV=378
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://www.codeblocks.org/"
+
+# svn export --ignore-externals https://svn.code.sf.net/p/codeblocks/code/trunk@${REV} codeblocks-20.03_p${REV}
+# tar -cjf codeblocks-20.03_p${REV}.tar.bz2 codeblocks-20.03_p${REV}
+#
+# svn export https://svn.code.sf.net/p/fortranproject/code/trunk@${FP_REV} fortranproject_r${FP_REV}
+# tar -cjf fortranproject_r${FP_REV}.tar.bz2 fortranproject_r${FP_REV}
+SRC_URI="
+	https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${PN}-20.03_p${REV}.tar.bz2
+	https://github.com/band-a-prend/gentoo-overlay/releases/download/${PN}-20.03_p${REV}/${FP_NAME}_r${FP_REV}.tar.bz2
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="fortran contrib debug"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	app-arch/zip
+	dev-libs/glib:2
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0=
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-arch/bzip2
+		app-text/hunspell:=
+		dev-libs/boost:=
+		media-libs/fontconfig
+		sys-libs/zlib
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nodebug.diff"
+	"${FILESDIR}/${P}_FortranProject-r378-autotools-build.patch"
+)
+
+src_unpack() {
+	default
+	mv -T "${WORKDIR}/${FP_NAME}_r${FP_REV}" "${S}"/src/plugins/contrib/FortranProject || die
+}
+
+src_prepare() {
+	default
+
+	# Let's make the autorevision work.
+	echo "m4_define([SVN_REV], ${REV})" > revision.m4
+	echo "m4_define([SVN_DATE], ${REV_DATE})" >> revision.m4
+
+	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)
+
+	local myeconfargs=(
+		--disable-pch
+		--disable-static
+		$(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
+		$(use_enable debug)
+		${CONF_WITH_LST}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	if use contrib; then
+		if (( $(get_makeopts_jobs) > 8 )); then
+			emake -j8  # Bug 930819
+		else
+			emake
+		fi
+	else
+		emake
+	fi
+}
+
+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 330b857627b4..2127adf3b262 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,15 +22,13 @@ BDEPEND="virtual/pkgconfig"
 RDEPEND="app-arch/zip
 	dev-libs/glib:2
 	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.1-r2:0/3.1
+	>=dev-util/astyle-3.1-r2:0=
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
-		app-admin/gamin
 		app-arch/bzip2
 		app-text/hunspell:=
 		dev-libs/boost:=
-		dev-libs/libgamin
 		media-libs/fontconfig
 		sys-libs/zlib
 	)"
@@ -55,6 +53,8 @@ src_prepare() {
 src_configure() {
 	# Bug 858338
 	append-flags -fno-strict-aliasing
+	# Upstream issue: https://sourceforge.net/p/codeblocks/tickets/1512
+	append-cxxflags -std=c++17
 
 	setup-wxwidgets