gentoo auto-resync : 11:05:2024 - 00:01:22

4 files changed, 25 insertions, 13 deletions

diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 58b4c46d231d..d0b0d32ab63d 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -7,7 +7,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-r6.ebuild 2383 BLAKE2B 3de25f4c8778c96d3f3556de55292a5a8e81007804800eb0b5da3cbf92f0a5ddbba9dbdf260bd5be98b53164939d01848a9495ea7ffab55245d699366394b901 SHA512 2842b279fb811a57f166b0cfbd69dbb8e1abada8113712b573c121fdd91fdf7f611efda211c7cc99e36c714e8f310a6a0c47e70a609431321a9290d5229388ef
-EBUILD codeblocks-20.03-r7.ebuild 2523 BLAKE2B a9a61348b744fb80842d336162d590d1ce96325b6b4295d1cc72e53119ea77dc57cc93421245684d30983f7fa39e3c0adde90fea1c4b4f239bcf3431f94515ce SHA512 e24e5f8956966bbc15d5439f9569f4ab0607e76980e3856355bf7f888a9c110c461c29b255fb330a5921431be458ee34889e0862f2fbab24bd4687e1e238b5dd
-EBUILD codeblocks-9999.ebuild 1718 BLAKE2B 703b796827eee3a1f297396fc4c69698dfacba6c09576a1ff140d43d0704674eaa9842a1ce71528d141e53757a10a63ae6bc40792e83b19fb89a8bca81748b6a SHA512 630e267331b1a9f63c9759d19bc7c739d2bc1490e75d7a6e0547e582d9ed02231da1fdd1f8ce3771a2059cfcfdbe7021a2f90c7af5b4235adaa076840579427d
+EBUILD codeblocks-20.03-r6.ebuild 2384 BLAKE2B 1b96645476dce1f0f041061b9bb2568b10694bf0495dd12baa6f33eafc8247dc63e3ad3d49ec4f99754fc42e57fc01483757ff9cb2a6cd319f7474f324f62ada SHA512 fc20a3f793f60c30ded884489b22f70bd893c02ebea6a73aa261b5d3a2f472983c9e21258f5912260cdda92f4bf0fb1f5a8a970983c0306681eca06ff41631c9
+EBUILD codeblocks-20.03-r7.ebuild 2689 BLAKE2B e6aabb3da50a3a0c094d8a137332ab2996e82ce34a22d6045933b21a2639b7b9b43b41be6ca2567f29d3a0cba6f51746fca122e97a87939d0f2607bea314e7c3 SHA512 0009e9c65c30fda668f3ddf197260411c7fc75eb74dd63765673971a6681354863c80f7a878ee2236088da4adba50e06443b9a8133fe4d6ec65e74bfbea6d354
+EBUILD codeblocks-9999.ebuild 1695 BLAKE2B 0b245e75366b1d38d55c74a40df4e82238c214aab59dbad28cdae6bfcbd07e1ad53af3112cd7ef349ddd9235e40c6e346b2c156237505ea49d20b45227e8a887 SHA512 68368d3b5f06a6fe02067817752f08378228cc25ab5d81dba1fd84c7c6f0f351a861f1fe240e5109fd649b53346fef88cc567d4e9f3303c9d3ee780b6461ba6f
 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
index 158380b706cc..cd6aecbe8bad 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r6.ebuild
@@ -9,9 +9,6 @@ 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="https://downloads.sourceforge.net/${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
@@ -19,6 +16,10 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 	https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
 "
 
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
 # 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
diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
index eebbb8597cad..ec7b50a3be12 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild
@@ -5,13 +5,10 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic wxwidgets xdg
+inherit autotools flag-o-matic multiprocessing 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="https://downloads.sourceforge.net/${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
@@ -19,6 +16,10 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz
 	https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
 "
 
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+
 # 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
@@ -84,6 +85,18 @@ src_configure() {
 	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
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 9f4d81cecb69..531794a90f95 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,8 +11,6 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-SRC_URI=""
 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"