From e169149b84bc9ff33d3286d60dfab754d2e0e4be Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Apr 2023 17:15:23 +0100 Subject: gentoo auto-resync : 29:04:2023 - 17:15:23 --- dev-util/Manifest.gz | Bin 68274 -> 68278 bytes dev-util/cmake/Manifest | 12 +- dev-util/cmake/cmake-3.25.2.ebuild | 293 ------------------- dev-util/cmake/cmake-3.25.3.ebuild | 2 +- dev-util/cmake/cmake-3.26.2.ebuild | 294 ------------------- dev-util/kdevelop-php/Manifest | 4 +- dev-util/kdevelop-php/kdevelop-php-22.12.3.ebuild | 54 ---- dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild | 2 +- dev-util/kdevelop-python/Manifest | 4 +- .../kdevelop-python/kdevelop-python-22.12.3.ebuild | 51 ---- .../kdevelop-python/kdevelop-python-23.04.0.ebuild | 2 +- dev-util/kdevelop/Manifest | 6 +- .../kdevelop/files/kdevelop-22.12.3-clang16.patch | 24 -- dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild | 136 --------- dev-util/kdevelop/kdevelop-22.12.3.ebuild | 130 --------- dev-util/kdevelop/kdevelop-23.04.0.ebuild | 2 +- dev-util/mingw64-runtime/Manifest | 8 +- .../files/mingw64-runtime-8.0.0-__rdtsc.patch | 25 -- .../files/mingw64-runtime-8.0.0-udivmod.patch | 26 -- .../mingw64-runtime/mingw64-runtime-11.0.0.ebuild | 141 +++++++++ .../mingw64-runtime-8.0.0-r3.ebuild | 146 ---------- .../mingw64-runtime-9.0.0-r2.ebuild | 144 ---------- dev-util/mingw64-toolchain/Manifest | 2 + .../mingw64-toolchain-11.0.0.ebuild | 317 +++++++++++++++++++++ 24 files changed, 470 insertions(+), 1355 deletions(-) delete mode 100644 dev-util/cmake/cmake-3.25.2.ebuild delete mode 100644 dev-util/cmake/cmake-3.26.2.ebuild delete mode 100644 dev-util/kdevelop-php/kdevelop-php-22.12.3.ebuild delete mode 100644 dev-util/kdevelop-python/kdevelop-python-22.12.3.ebuild delete mode 100644 dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch delete mode 100644 dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild delete mode 100644 dev-util/kdevelop/kdevelop-22.12.3.ebuild delete mode 100644 dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch delete mode 100644 dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch create mode 100644 dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild delete mode 100644 dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild delete mode 100644 dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild create mode 100644 dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 3af6d5cfe976..e654b03add52 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index ddcd7d20f059..c69ea4a19b0f 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -12,26 +12,16 @@ DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6 DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132 DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764 -DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 10289acf1a74e45ad1109bb0759ce82024553947ff60c8358854f26d276e89155df9b44561adee4b838d95fb2fcb54b4d2ca1e957b35a90ee80ea56dc63d94be SHA512 75d6a0c4c9350ad466559f44f56f2d18308cdfbaba24da3c86950c9bfb4861f9486f031b41206de83019850944081f304953dbd04b55501ea7b3912aabfb1e00 -DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc SHA512 16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486 -DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8 SHA512 191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91 -DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 SHA512 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 DIST cmake-3.25.3-SHA-256.txt 1646 BLAKE2B 2b4febaa4c486f42c773621efe5ab3ff903578373c3df3ed060add6b42f1d16fe760a4b8825bf753ef0f72fe4584ffb3130a2ffc9397b12a93e1f14d5fba6128 SHA512 8d2f39c50206f6912ad575507f3172fb87b425f461990ba0f703c85b152aaa0bccb9d72a2e7dd38449b3c40bb7a1664ba9f4d5879d96c1928bb77effdcf25ada DIST cmake-3.25.3-SHA-256.txt.asc 833 BLAKE2B 7db637e3383915cb659b176ffc72508460ef73a245dc5ff99d9ba2649d8db0666e04ff2d428fefaa86cd14a07047bc7b7df0e0bed91ac80d9a8bb993f1d70102 SHA512 26f6c584d8f8bb44fc10b227f81ef3655d35140a1825270877e2be5460e4f0bfa92ca7d7186f55ef08085814c7f79e50cfc9cd7ba9880620aba25661ed1f75ac DIST cmake-3.25.3-docs.tar.xz 500216 BLAKE2B 5c6474328e2bfa17f5aa39693dabb19f33ac1f6875119e41d60f97c94bf1441b9d9528e96e4dd36d5d68e711c4bf4d32fe84a454df796755eccb1483fa55e3c8 SHA512 6e9ce5fc545324c327d8216dbbc316bbd5966640ae2b3e17ada00926004d55df75c5d25e6590ed53a8033d9638c5b6282bedd115ddf28b27980a80e40a3cba0c DIST cmake-3.25.3.tar.gz 10562254 BLAKE2B b7ae9f129731da30f89967eac20bdfcebd9c4f6ca3b28decc2016ab18292e4b51eb5a43b5797f874e23e64e1d01eeb98b18a927035aab8edc63a069f1bfce32b SHA512 ebcb5616ca418fe164863b157f67cff6e8c49b0f8f723c0bd219466211f3cfe8b93c4b3ad0fe6d2d3772881fd867b0905340945156f6d70a9ea08bfb7eb98550 -DIST cmake-3.26.2-SHA-256.txt 1646 BLAKE2B 8b82cc9b837363e2522f4d984b7be53d795475e8f3f0e0c796dbca6da7e8b61121175efd736c437afff46656416988f83abdbb9a98cfaff8dfb65fc256c1b8cb SHA512 5227027f386ac9adaf6cad7638c424a4e4ed99fa04fa53634e462e88a93b2b14dc99e0a7c18162fe438327197f9df185e83cf9e09d06d7bc4575ae11d67a7ac6 -DIST cmake-3.26.2-SHA-256.txt.asc 833 BLAKE2B f59a215131314c9d0a5c6659e8e287b749da4fba5de08b965734192e7787e9439e0566fd3e61b3091d7ff678bd2a8ec66e0e87f74938e77a25a34e3a7f20f07e SHA512 b9187ac43687caf9bcd8d3ed3922efe4ffc30d5c9d282d0549d0f22aedd1c23d2aab158117c212febc4917d74eed89836ebdd9948cf20318dcb021ce71acb049 -DIST cmake-3.26.2-docs.tar.xz 507664 BLAKE2B 7f73c18e9e3d22a0e9f0d9fdfae3c35fd8e92aec1cccd4fecb552e6b42187b8eb4ab16977233f5536fca62dc91064d857f1e7b076ec8547b1ec283fe404ed381 SHA512 1130301ecaa608df3b927052c06d18b2ef67b1de1b2011a06072f70255204fb40928325c15c2cd3363dd88fe27b66e2805763eb9cb58bc3474d6d05d436f3b36 -DIST cmake-3.26.2.tar.gz 10669169 BLAKE2B 7d77de6d44af0f26f299fdfdfa100a1d45af63996d704c8b76e40e3860ef08cc7864b05ebaad2e59844326856ff54984f505eb2d195d68d88acb98e5a72977bb SHA512 7f4eefbffce2bad241261583b0b8962519dc266fa0c6c5ea6917a785eb2b81ebeda637ed9035965a43e9f89f072bc509d4583b5d595a7b72f5e54bb5170f7c9c DIST cmake-3.26.3-SHA-256.txt 1646 BLAKE2B 687b488818da6ae557e3b4f297fa560bfdca34fa61d57ccabe0469ce5110c8c134f4f705a33258677dc9073c685844aed5b6dc586b774041662a759c55674720 SHA512 14b37bfb4cff8c05d4e715e752c8f2cc2e32a09eaadf1b587549e91937a97bddb3d16654466052a5a5f8a43a790c24266d87add2a37e86040fb3416fe6042a58 DIST cmake-3.26.3-SHA-256.txt.asc 833 BLAKE2B 247689511e634d6383b1a3b6fc8c2fe5977dad21375c79bfd9541ab8fdf6a50fa0b2008018acae85593ce1513fe2d582e30c37ba1a8f380729d68c9e6077dcdc SHA512 623dba2d086ab03e3fd4b8b6e57704eb60774a6b5f2944089d9a2f0c9052345a781b9f8b93b782b00ebe3c4cf65c142ce20d0882c3d516c05e05271507073431 DIST cmake-3.26.3-docs.tar.xz 507560 BLAKE2B 1859321d884d518c849082fcbd293656c32a0b1abc40da577be342b5bf165a6ae9a8d9316a1fe937f83a566db7732725dc9eb10de076eedd7a368564e26859b2 SHA512 30cbba92d46437b2daa2390321eb4b34f46330baa80e536b947bb5200b1b30512873aa90052208e4bb181ad6181e671d9ab883637a0dbaeb73601840b5355c69 DIST cmake-3.26.3.tar.gz 10668855 BLAKE2B c105b19d49ac47d0a9fdfee7908c64db3bfe82d57cfb342c76938fa824a1413d7215b56a7407ac35dfcbd0d7a9e47dd631bd52d45aa097ac7d96b493bcfa64b4 SHA512 b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148 -EBUILD cmake-3.25.2.ebuild 8809 BLAKE2B 48f85b5bdd45ac0fb69374c354408606f2f315ecaa46ad6c8365922127cd77d9a8e8cae3c6f7478342ccb862e0acc43eef07b43d44169bf7cb303be7a38fb485 SHA512 46f18794b82460a58bb3ed4ea0a2725b68b65b9f3d01a00208c9124a7e7a54f508625310f85167de48f69e6867b22cd00f19abd50b13c01a299ef95a229d334c -EBUILD cmake-3.25.3.ebuild 8810 BLAKE2B f5e1b8c7ca9b16bd03bb402f1191b8dac5fb86c693a80c66a6094c8625c82b8b24dcb334f41db9e87b832861381c24ef3680fe7a2ff8e6f2669b16b797ac21f9 SHA512 c8fe7d3d1160fa79ca8a34c8fc57dd566834579242068f3dbebd774e4d5331bd5f0862f0a09a20b043698341950add53a7bc6e88ac68e00b8fecad6196221a36 -EBUILD cmake-3.26.2.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e +EBUILD cmake-3.25.3.ebuild 8809 BLAKE2B 48f85b5bdd45ac0fb69374c354408606f2f315ecaa46ad6c8365922127cd77d9a8e8cae3c6f7478342ccb862e0acc43eef07b43d44169bf7cb303be7a38fb485 SHA512 46f18794b82460a58bb3ed4ea0a2725b68b65b9f3d01a00208c9124a7e7a54f508625310f85167de48f69e6867b22cd00f19abd50b13c01a299ef95a229d334c EBUILD cmake-3.26.3.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e EBUILD cmake-9999.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a diff --git a/dev-util/cmake/cmake-3.25.2.ebuild b/dev-util/cmake/cmake-3.25.2.ebuild deleted file mode 100644 index 35212b661e4e..000000000000 --- a/dev-util/cmake/cmake-3.25.2.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -: ${CMAKE_DOCS_PREBUILT:=1} - -CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=$(ver_cut 1-3) -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# See bug #784815 -CMAKE_DOCS_USEFLAG="+doc" - -# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja -# ... but seems fine as of 3.22.3? -# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -if [[ ${PV} == 9999 ]] ; then - CMAKE_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" - inherit git-r3 -else - SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - - if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" - fi - - if [[ ${PV} != *_rc* ]] ; then - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc - inherit verify-sig - - SRC_URI+=" verify-sig? ( - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc - )" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" - fi -fi - -[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" - -S="${WORKDIR}/${MY_P}" - -LICENSE="CMake" -SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/libarchive-3.3.3:= - app-crypt/rhash - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND+=" - doc? ( - dev-python/requests - dev-python/sphinx - ) - test? ( app-arch/libarchive[zstd] ) -" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # Prefix - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch - - # Handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch - # Next patch needs to be reworked - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # Respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in bootstrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - # bootstrap script isn't exactly /bin/sh compatible - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then - default - else - cd "${DISTDIR}" || die - - # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature - verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} - verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz - - cd "${WORKDIR}" || die - - default - fi -} - -src_prepare() { - cmake_src_prepare - - if [[ ${CHOST} == *-darwin* ]] ; then - # Disable Xcode hooks, bug #652134 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ - Source/CMakeLists.txt || die - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ - -e '/cmGlobalXCodeGenerator.h/d' \ - Source/cmake.cxx || die - - # Disable isysroot usage with GCC, we've properly instructed - # where things are via GCC configuration and ldwrapper - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - Modules/Platform/Apple-GNU-*.cmake || die - # Disable isysroot usage with clang as well - sed -i -e '/_SYSROOT_FLAG/d' \ - Modules/Platform/Apple-Clang.cmake || die - # Don't set a POSIX standard, system headers don't like that, #757426 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmLoadCommandCommand.cxx \ - Source/cmStandardLexer.h \ - Source/cmSystemTools.cxx \ - Source/cmTimestamp.cxx - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmStandardLexer.h - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - # ODR warnings, bug #858335 - # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 - filter-lto - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - # Fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null || die - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # RunCMake.CompilerLauncher: also requires fortran - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because - # it can't find a deb package that owns libc - # TestUpload, which requires network access - # RunCMake.CMP0125, known failure reported upstream (bug #829414) - local myctestargs=( - --output-on-failure - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ - ) - - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] - fi - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} -} - -pkg_postinst() { - use emacs && elisp-site-regen - - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/cmake/cmake-3.25.3.ebuild b/dev-util/cmake/cmake-3.25.3.ebuild index f2777145dac1..35212b661e4e 100644 --- a/dev-util/cmake/cmake-3.25.3.ebuild +++ b/dev-util/cmake/cmake-3.25.3.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/dev-util/cmake/cmake-3.26.2.ebuild b/dev-util/cmake/cmake-3.26.2.ebuild deleted file mode 100644 index a2b661bbcdbe..000000000000 --- a/dev-util/cmake/cmake-3.26.2.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -: ${CMAKE_DOCS_PREBUILT:=1} - -CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=${PV} -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# See bug #784815 -CMAKE_DOCS_USEFLAG="+doc" - -# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja -# ... but seems fine as of 3.22.3? -# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -if [[ ${PV} == 9999 ]] ; then - CMAKE_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" - inherit git-r3 -else - SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - - if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" - fi - - if [[ ${PV} != *_rc* ]] ; then - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc - inherit verify-sig - - SRC_URI+=" verify-sig? ( - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc - )" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" - fi -fi - -[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" - -S="${WORKDIR}/${MY_P}" - -LICENSE="CMake" -SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/libarchive-3.3.3:= - app-crypt/rhash - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND+=" - doc? ( - dev-python/requests - dev-python/sphinx - ) - test? ( app-arch/libarchive[zstd] ) -" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # Prefix - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch - - # Handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch - # Next patch needs to be reworked - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # Respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in bootstrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - # bootstrap script isn't exactly /bin/sh compatible - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then - default - else - cd "${DISTDIR}" || die - - # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature - verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} - verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz - - cd "${WORKDIR}" || die - - default - fi -} - -src_prepare() { - cmake_src_prepare - - if [[ ${CHOST} == *-darwin* ]] ; then - # Disable Xcode hooks, bug #652134 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ - Source/CMakeLists.txt || die - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ - -e '/cmGlobalXCodeGenerator.h/d' \ - Source/cmake.cxx || die - - # Disable isysroot usage with GCC, we've properly instructed - # where things are via GCC configuration and ldwrapper - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - Modules/Platform/Apple-GNU-*.cmake || die - # Disable isysroot usage with clang as well - sed -i -e '/_SYSROOT_FLAG/d' \ - Modules/Platform/Apple-Clang.cmake || die - # Don't set a POSIX standard, system headers don't like that, #757426 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmLoadCommandCommand.cxx \ - Source/cmStandardLexer.h \ - Source/cmSystemTools.cxx \ - Source/cmTimestamp.cxx - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmStandardLexer.h - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - # ODR warnings, bug #858335 - # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 - filter-lto - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - # Fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null || die - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # RunCMake.CompilerLauncher: also requires fortran - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because - # it can't find a deb package that owns libc - # TestUpload, which requires network access - # RunCMake.CMP0125, known failure reported upstream (bug #829414) - local myctestargs=( - --output-on-failure - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ - ) - - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] - fi - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} -} - -pkg_postinst() { - use emacs && elisp-site-regen - - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest index e7468b40b1a7..f78f4caa4426 100644 --- a/dev-util/kdevelop-php/Manifest +++ b/dev-util/kdevelop-php/Manifest @@ -1,5 +1,3 @@ -DIST kdev-php-22.12.3.tar.xz 1086004 BLAKE2B 30a4a1f96943d93b405def16863d11ae46eb74c2c6a42aedbe76afa6c8b7e5c35ac3a335835cc10f495614486907d2e2fbc88b61dfd8809e7959758d6c1ab2d0 SHA512 a8fb926627df83fbb9b292a805636cf0ab237ef6b13be25d2dfe751e4c18e3730a36ed22a23fd7d9d8a5d8d6763c61e8535a088ec845b100d09c77388a7bce1e DIST kdev-php-23.04.0.tar.xz 1086172 BLAKE2B 1ffe30d1eb12564f22cebe332e4d94af96b6729282a76c46b4c8a32ffa1393be7007a90a90fe9fe9f066a2bb8b89cee1e0ad455223ab65627143a8c28f557141 SHA512 fe49be01a9813fc2a1fb263fd460255cc821ee24e59724a59f534786f92c3c2b1b4413331eadfa9ad5685fe0f453b97cba082cf6451cbf3637d00cebf15051cd -EBUILD kdevelop-php-22.12.3.ebuild 1228 BLAKE2B c6391b442a7c8024f923a46913440bc9cdef4fa69dce3200b504bca5de8eeb883223500d34f050728f46df0de735351f0f4a95f925d802424791ed2ed5ba2035 SHA512 f6692b5d4d616aab505c12684ccd86f69c5eb2e0df4dcbc1b82d161c6074cb1aa8897adf2d1419b36e0bbe0434bcb85fbc0aaf7fff198f69d7af0e5536c75a9c -EBUILD kdevelop-php-23.04.0.ebuild 1229 BLAKE2B 7f348b106b4c6566b82be012deda7bdca219640ce2cfb3c9af1fe1b36bf8fac3a3ab68bb75cc944dbba3f868ba86db3dff151a3ad83abdfe66147af8c5af7d18 SHA512 b38bb867f8fd88f41bf05b6716b77ac12ed4ef63c24ebcb940b1ec10850439f63e8b86ca971db416ce76975192e1387671c5cc28e0449c7266b3d1bc82478864 +EBUILD kdevelop-php-23.04.0.ebuild 1228 BLAKE2B dda7be7d5396c6fd5c63d449d89a0571eb05694dc167754853deb54b1fd79fc666f827e9768e5ff1579ad13c23808d7f3f6c5c1e511e96ebae819166ec69c0f4 SHA512 ee5d66ace30332ce5fe9b1ac58d141c5065c1aadbf8fbc5f70ea1652cd59ed7126607fdb2dc3c374c61adf21a1c20faaf3291de9ff5def67fb5d774802534000 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-util/kdevelop-php/kdevelop-php-22.12.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-22.12.3.ebuild deleted file mode 100644 index 8b468cfcc612..000000000000 --- a/dev-util/kdevelop-php/kdevelop-php-22.12.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_HANDBOOK_DIR="docs" -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KDE_ORG_NAME="kdev-php" -KFMIN=5.101.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org - -DESCRIPTION="PHP plugin for KDevelop" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5" -IUSE="" -KEYWORDS="amd64 arm64 ~x86" - -# remaining tests fail for some, bug 668530 -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - dev-util/kdevelop-pg-qt:5 - dev-util/kdevelop:5= - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-util/kdevelop:5[test] ) -" - -src_test() { - # tests hang, bug 667922 - local myctestargs=( - -E "(completionbenchmark|duchain_multiplefiles)" - ) - ecm_src_test -} diff --git a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild index 6ecd788af5d0..f8df4e4bfdbb 100644 --- a/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild +++ b/dev-util/kdevelop-php/kdevelop-php-23.04.0.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.kdevelop.org/" LICENSE="GPL-2 LGPL-2" SLOT="5" IUSE="" -KEYWORDS="~amd64 arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" # remaining tests fail for some, bug 668530 RESTRICT="test" diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest index 34ef8d04855a..0b12dbfe50e6 100644 --- a/dev-util/kdevelop-python/Manifest +++ b/dev-util/kdevelop-python/Manifest @@ -1,5 +1,3 @@ -DIST kdev-python-22.12.3.tar.xz 1095932 BLAKE2B d83d908928ad79f1bb2fd2ce7ff4f61b0fe12aa9a1345a486290ca15a9d8fae83680de3139874c12561e4bf90404ce640869d17e22efe11d31a531803d47ef36 SHA512 443618b9cd0ac1fcefecec1420a8a4a4de7c4e337031e6da3b258a286bb195e1bd548828155b0847b491b6310939080cd858987c44c0d4c5a87d6cf02ca10c6e DIST kdev-python-23.04.0.tar.xz 1096352 BLAKE2B dc6d9c8247e1805d127fb7031bf216fe4b787746b96ab99b31e03ce74fbacba6c0ce13692057dfb5cace9582462ec3d2019449d670755d240af2da69235c81bc SHA512 56997fc93c993bbbd584ca7a3c531a9f49198a412b628c975aa3d392128e8df3904e0b182d8bf4fd452701b59b9485e8cd9e628cb5523d2a31cc34b9d8cf307c -EBUILD kdevelop-python-22.12.3.ebuild 1232 BLAKE2B 4cbd8dff5d839b6ec16a250fd954d2b25d7958808b6163b14435ac387e8a5d02c4bedf046ab23af89c17c12e33fc117902f54b3815cc9898f6759df291e0859a SHA512 c1f4b72b8149e70f498cca34747d503d48dfca14da9ec9a42689c7c7a66ddecdfd1fe53faa81993f82cc2b83b6807e0bc1c422e5d4fe26c380296e99e2bb9dca -EBUILD kdevelop-python-23.04.0.ebuild 1233 BLAKE2B 5b43d50321a8458646cc25045ce11bf6348fa080fa590a0851b7ebd457555f39d572cadd5515fb6235dc84060c6bea8d03319187461def01b7b4d82d9fd77355 SHA512 171bee3c2f42d6e1bad43f006c8e1b405d22c513bf25cde1baf5b4902dea65c1d91dc4342d7bc914817ca456aebc8b6786ee349e3d005e0c55b41b51c49f2a1b +EBUILD kdevelop-python-23.04.0.ebuild 1232 BLAKE2B 6dc6882a4501092cc7d2d21d015c5734b5c5459dd2a2aab1e7b90f635bcca7141ba3f3bfcde40327c17bd0cc2c949c6999aee5e9ebd92588245c310044c5bc7f SHA512 ebb13b759d67617a01351448e581b2ed4d0d97ad6ff0f70a6868a54a23e4fcc80a86abd8592c5d8ded10b40bf95a1984b378f3966f9d4900deb0d84bcf678ab5 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-util/kdevelop-python/kdevelop-python-22.12.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-22.12.3.ebuild deleted file mode 100644 index b8b9515f9073..000000000000 --- a/dev-util/kdevelop-python/kdevelop-python-22.12.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KDE_ORG_CATEGORY="kdevelop" -KDE_ORG_NAME="kdev-python" -PYTHON_COMPAT=( python3_{9..10} ) -KFMIN=5.101.0 -QTMIN=5.15.5 -inherit ecm gear.kde.org python-single-r1 - -DESCRIPTION="Python plugin for KDevelop" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -IUSE="" -KEYWORDS="amd64 arm64 ~x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" - -DEPEND="${PYTHON_DEPS} - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - dev-util/kdevelop:5= - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 -" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/pycodestyle[${PYTHON_USEDEP}] - ') -" - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} diff --git a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild index 1fd0a31e533a..5fdf77a9574b 100644 --- a/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild +++ b/dev-util/kdevelop-python/kdevelop-python-23.04.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.kdevelop.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" IUSE="" -KEYWORDS="~amd64 arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index d2a68283e90e..2035ad5165ce 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,7 +1,3 @@ -AUX kdevelop-22.12.3-clang16.patch 1126 BLAKE2B d4c189ebba3bcde3a0183674089289ecb325e9feb1182b05f9f826cb52674910ca84e07441c50d83a3d023129fc4e559870e8a96d85625fe2fc3bdf19e7a6a41 SHA512 b6ed8ad92ab013fa300dab122e7772861627798f2a3fd7329a1b0206232726b7d1cb8b213d04b499757edfb238537ff9aaafc2f2f07aa00ef0db9e8966b8a1f7 -DIST kdevelop-22.12.3.tar.xz 8652864 BLAKE2B a60de8549ccc949811c6c755c729b51711b2a7b0dbd8cf4c8f853623f27f42328dc82f732dd45abf7bfbf248841c72a55f1799c19110d2dd497c96fe5e7ef9ed SHA512 465bf3639e3fd61058af1217904fe0904d7c380e1f073dcb3af28d5758bba1d477e2f1313c61c233cf2acef4362c5380b30bcae6a02eb704a8a3fdf80ddfd75a DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173 -EBUILD kdevelop-22.12.3-r1.ebuild 4197 BLAKE2B becc1b76ab207ddff1952f5f54fb9e184c669c8045fc366e440974bce225bb8f20358878ad7381e135eab6609e0b13eb976de9afc72b174fbd4f9a5399143728 SHA512 41a25c12385fe30fc78fc1192139167f0364e32f6529a6379cfef3984435174376bcb9127f62463e57b8b2ede50c374c5ba64b436118bad543663126fed08f78 -EBUILD kdevelop-22.12.3.ebuild 4140 BLAKE2B 9404a7cc0a09a366ab3cabfd55dbb37da08a825e402e0a129bb82916aa6378e3888a5167bace7ebda6eff0ae81a63d5d6e821fd8429d483f391cae5a3725d090 SHA512 6346a83f99e30412fc8a3afc2be9a36df15d9e678ef30b185a68e44708588325c73da28930d5398929686f6cc809c1d8057277c33626cc1790c0a75d3ac544c8 -EBUILD kdevelop-23.04.0.ebuild 4101 BLAKE2B 270eb41d25d852626c9b9f3bed55c7e82ddd28b8b26e2a312eb63f7b1fccfc1221cf7aeaf3a0fafed76b94c211e7694d494973ee3308db38e371a3ce2829c1dc SHA512 ee18234c9c162f0da7239689c6b6c4b8aa1b9cb2119fc6d80a99917b2bf53d39f7ef015ac9594862bab4e5907e05d93a285ef95477587fe15e3bbde223d265ef +EBUILD kdevelop-23.04.0.ebuild 4100 BLAKE2B c9d4d4c0d9d10a2878ef03cd80a52aeb73f4f4dcb6e2b006467e7ffbaad880e1895bc35dbd486ef87f046e21899668f0b7c14c184cd2b667386d844798d15ad0 SHA512 8dfdf4e3346cfc31b65453dd6880f1e021a3d34e87545bbd560d05f57a963064ea94c9e8f981bf569b8e89b94e95240ac1b7aee842e5026ef4f554a2913c6e01 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch deleted file mode 100644 index 38676cc16473..000000000000 --- a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/902101 ---- a/cmake/modules/FindClang.cmake -+++ b/cmake/modules/FindClang.cmake -@@ -97,6 +97,8 @@ - # dito for git - string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}") - -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}") -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}") - find_path(CLANG_BUILTIN_DIR - # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator - NAMES "cpuid.h" -@@ -106,6 +108,10 @@ - "../../../clang/${CLANG_VERSION}/include" - "clang/${CLANG_VERSION_CLEAN}/include" - "../../../clang/${CLANG_VERSION_CLEAN}/include" -+ "clang/${CLANG_VERSION_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_STRIPPED}/include" -+ "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" - NO_DEFAULT_PATH - ) - - diff --git a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild deleted file mode 100644 index 6788033f46fe..000000000000 --- a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KFMIN=5.101.0 -LLVM_MAX_SLOT=16 -QTMIN=5.15.5 -VIRTUALDBUS_TEST="true" -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org llvm optfeature - -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt -IUSE="+gdbui hex +plasma +qmake reviewboard subversion" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -# see bug 366471 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/grantlee:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-util/astyle-3.1:= - kde-apps/libkomparediff2:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - =kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) - qmake? ( dev-util/kdevelop-pg-qt:5 ) - reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - subversion? ( - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-vcs/subversion - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - dev-util/ninja - kde-apps/kapptemplate:5 - kde-apps/kio-extras:5 - >=sys-devel/gdb-7.0[python] - reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-22.12.3-clang16.patch -) - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - -src_configure() { - local mycmakeargs=( - -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})" - $(cmake_use_find_package gdbui KSysGuard) - -DBUILD_executeplasmoid=$(usex plasma) - $(cmake_use_find_package plasma KF5Plasma) - $(cmake_use_find_package hex OktetaKastenControllers) - $(cmake_use_find_package qmake KDevelop-PG-Qt) - $(cmake_use_find_package reviewboard KF5Purpose) - $(cmake_use_find_package subversion SubversionLibrary) - ) - - use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON ) - use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "konsole view" kde-apps/konsole - optfeature "static C++ Qt code analysis" dev-util/clazy - optfeature "static C/C++ code analysis" dev-util/cppcheck - optfeature "heap memory profiling" "dev-util/heaptrack[gui]" - optfeature "meson project manager plugin" dev-util/meson - optfeature "formatting configurations via customscript plugin" dev-util/indent - optfeature "formatting configurations via customscript plugin" dev-util/uncrustify - fi - ecm_pkg_postinst -} diff --git a/dev-util/kdevelop/kdevelop-22.12.3.ebuild b/dev-util/kdevelop/kdevelop-22.12.3.ebuild deleted file mode 100644 index 4d314ca3def7..000000000000 --- a/dev-util/kdevelop/kdevelop-22.12.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KDE_ORG_CATEGORY="kdevelop" -KFMIN=5.101.0 -QTMIN=5.15.5 -VIRTUALDBUS_TEST="true" -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org optfeature - -DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt -IUSE="+gdbui hex +plasma +qmake reviewboard subversion" -KEYWORDS="amd64 arm64 ~ppc64 ~x86" - -# see bug 366471 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/grantlee:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-util/astyle-3.1:= - kde-apps/libkomparediff2:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - >=sys-devel/clang-6.0:= - gdbui? ( kde-plasma/libksysguard:5= ) - hex? ( app-editors/okteta:5 ) - plasma? ( - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) - qmake? ( dev-util/kdevelop-pg-qt:5 ) - reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - subversion? ( - dev-libs/apr:1 - dev-libs/apr-util:1 - dev-vcs/subversion - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - dev-util/ninja - kde-apps/kapptemplate:5 - kde-apps/kio-extras:5 - >=sys-devel/gdb-7.0[python] - reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) -" - -src_configure() { - local clang_version=$(best_version sys-devel/clang) - local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})" - - local mycmakeargs=( - -DLLVM_ROOT=${llvm_root} - $(cmake_use_find_package gdbui KSysGuard) - -DBUILD_executeplasmoid=$(usex plasma) - $(cmake_use_find_package plasma KF5Plasma) - $(cmake_use_find_package hex OktetaKastenControllers) - $(cmake_use_find_package qmake KDevelop-PG-Qt) - $(cmake_use_find_package reviewboard KF5Purpose) - $(cmake_use_find_package subversion SubversionLibrary) - ) - - use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON ) - use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "konsole view" kde-apps/konsole - optfeature "static C++ Qt code analysis" dev-util/clazy - optfeature "static C/C++ code analysis" dev-util/cppcheck - optfeature "heap memory profiling" "dev-util/heaptrack[gui]" - optfeature "meson project manager plugin" dev-util/meson - optfeature "formatting configurations via customscript plugin" dev-util/indent - optfeature "formatting configurations via customscript plugin" dev-util/uncrustify - fi - ecm_pkg_postinst -} diff --git a/dev-util/kdevelop/kdevelop-23.04.0.ebuild b/dev-util/kdevelop/kdevelop-23.04.0.ebuild index c3daad3655ce..4e4fac18ef52 100644 --- a/dev-util/kdevelop/kdevelop-23.04.0.ebuild +++ b/dev-util/kdevelop/kdevelop-23.04.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://www.kdevelop.org/" LICENSE="GPL-2 LGPL-2" SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~x86" IUSE="+gdbui hex +plasma +qmake reviewboard subversion" # see bug 366471 diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest index af277aa28e7c..50dbdcbee6cc 100644 --- a/dev-util/mingw64-runtime/Manifest +++ b/dev-util/mingw64-runtime/Manifest @@ -1,11 +1,7 @@ AUX mingw64-runtime-10.0.0-msvcr-extra-race.patch 1971 BLAKE2B 1c8d6371cfb7f5ebdaadc1f04ee4497b494108ead0daa3ed05c1f533d9e52d551bc94bbde7050885a723fa2423b86cb6eedc7df1584ca01834b61f17c177165e SHA512 3763b103f3d7927dbc84c9cb1a3836cb4af943dfc6a335ef904c8f66da06486751fe29465cdbcecc2bf0d7312f623d3fb5ac91e8dcfe1b20cb6657cadd2b6fad AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da51354324a3b29e327982fd586339e5f8df4309de2bbdb2722773e0d145d87363183ff70fd02fcdcbc46c560bef9a5111dc33ee8105bede SHA512 991d4294d81a05bfa86d2bed102b3f5bf58435ef02b0a38abe905cc4a0416896b01ffc3a2fe64e78d44e78c9c65051428426b7d19561bd337a229bf7281c7040 -AUX mingw64-runtime-8.0.0-__rdtsc.patch 773 BLAKE2B 8ec970049ee9d1003caed099a6eb0301f066cd3f0986895f08b2912b14248d3c41c87558a1df40b7f452e73d382da73215942827f4e5e551df65d779eda23eef SHA512 df986f2b24ea1e4db7babad2a837a55a59e1abd20f41ef03f438907477829561238a69fa8e8891ede1a45eef6dca36deb82c6be61293ce0f39e7f94f82483cad -AUX mingw64-runtime-8.0.0-udivmod.patch 865 BLAKE2B 848b45fb68c775baa5b285293df0a986a11f98e1768f4a55e7c22bd870f1df12d60fd03c378d1fe24e5049886a48527aee894e1f0d58555cc686a807815a3a7b SHA512 0d5c27e8b30efd8b0e938f66f0fd8ddc2a279c79a1ae99d776fc2b1595f97489083f8cc2caa6c3d78ed7a0394e707efe6e6792fec768e90dc170ac6c9fc84146 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 -DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e -DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386 +DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d EBUILD mingw64-runtime-10.0.0-r1.ebuild 4156 BLAKE2B 463e887c1c14c93222997399af7764e65c0fdd723d0f7893ca960d42cebd214805206ba3e255d8f4be586e0fb302025e65c28b4341073c4ce1ebf6212fe30fc3 SHA512 e5463dd1ff2312bcdcb120c5719a70d1ac01d5374f5f10d81a99142a96ad9f3419e5072cbc29efc6ef3f97eb470ae0ed8a43448a6c2723b1dee59ca6ba4904eb -EBUILD mingw64-runtime-8.0.0-r3.ebuild 4118 BLAKE2B 567d0363b56bf4c981b06533ccd91542748e958784fea43882a7f91b74f0ba470c8eb60e1f392ff9749603d38981e64e0875cdcc9f74c2db31c431f8ea1cf159 SHA512 f395b256b5366cead108cce7eb3bf8b0106f74263f4f461e2bbb0122fe89b47f82362323df908797706ae5fdd5b9c315dea5daf92141d2215b41929b4d1d05f2 -EBUILD mingw64-runtime-9.0.0-r2.ebuild 4050 BLAKE2B 6d053ffe4e6adb1e4acb599ecc46daa91ca300ef758ee093307638115ee1ddbca35e812a3fa1702fbe9fa8fd6244420d9fe0ff200885682f933c6c6a12c59ad5 SHA512 287ea98d74134ebb97cdded333588aa9487cd4bf11b7d4dbaa116811bd83c28d359ca8ef6d7f189d281be6a96c3fe9a6ddf307a728465e4743e1a68ff28eaae4 +EBUILD mingw64-runtime-11.0.0.ebuild 4281 BLAKE2B 7ace99fb8541dc5310f30cff1aa7604330de4285252c91b96b8773cb50eb537dde2a892029e1b2f7576ac906a3965aedf7e197d6d0795b8926f71da36be0b8dc SHA512 54acd494289fbc5bc16f83ec9b1ad47f4e41189cfb9f2bfbb91587f33a0f894822a1c784d5afba7fa3a925f184b5a50a6e691b2e36475cfbfff9b7a6a522d210 MISC metadata.xml 904 BLAKE2B b7b42242ff7a39ba87ec4889295bb1229122bd20f34c163499423d989120569d5b6c69ed9490f328aa1af8a9dd3ff2ec0f07b85910e7d2eb401f40dbd670d366 SHA512 80bb5c58cf80d7233599e772a1e615ec4b4f16bd9387539a684d11e0b7196e7a3d21f1b56d18271b9a4b0544253e3fec4130ff70702ba4cf5684941ff8d49a51 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch deleted file mode 100644 index df06f041c8c2..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/786549 - -gcc-11 defines __rdtsc as a macro: - // include/ia32intrin.h:110 - #define __rdtsc() __builtin_ia32_rdtsc () -and causes build failure: - intrincs/rdtsc.c:15:30: error: macro "__rdtsc" passed 1 arguments, but takes just 0 - 15 | unsigned __int64 __rdtsc(void) - | ^ - -Let's avoid __rdtsc definition on systems with #define __rdtsc present. - -There is still a chance that it might be a '#define __rdtsc __rdtsc'. -We'll revisit it then. ---- a/mingw-w64-crt/intrincs/rdtsc.c -+++ b/mingw-w64-crt/intrincs/rdtsc.c -@@ -11,7 +11,7 @@ - #define __has_builtin(x) 0 - #endif - --#if !__has_builtin(__rdtsc) -+#if !__has_builtin(__rdtsc) && !defined(__rdtsc) - unsigned __int64 __rdtsc(void) - { - #ifdef _WIN64 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch deleted file mode 100644 index dcbe99878f05..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/787662 -https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ab0fa5ad3c67d634fd7754d9473d1bb7051f9bf0/tree/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c?diff=6a0e9165008f731bccadfc41a59719cf7c8efc02 ---- a/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c -+++ b/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c -@@ -121,6 +121,7 @@ - u_quad_t __umoddi3(u_quad_t a, u_quad_t b); - int __ucmpdi2(u_quad_t a, u_quad_t b); - quad_t __divmoddi4(quad_t a, quad_t b, quad_t *rem); -+u_quad_t __udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem); - - #endif /* !_LIBKERN_QUAD_H_ */ - -@@ -573,6 +574,12 @@ - return (negq ? -uq : uq); - } - -+u_quad_t -+__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem) -+{ -+ return __qdivrem(a, b, rem); -+} -+ - #else - static int __attribute__((unused)) dummy; - #endif /*deined (_X86_) && !defined (__x86_64__)*/ - diff --git a/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild new file mode 100644 index 000000000000..e9b21a93f78c --- /dev/null +++ b/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Free Win64 runtime and import library definitions" +HOMEPAGE="https://www.mingw-w64.org/" +SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" +S="${WORKDIR}/mingw-w64-v${PV}" + +LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# default-ucrt: enabling requires to be done during the bootstrap process +# or else will cause e.g. undefined reference to __intrinsic_setjmpex +# libraries: needs working stage2 compiler (bug #665512) +IUSE="default-ucrt headers-only idl libraries tools" +RESTRICT="strip" # portage would use the wrong strip executable + +pkg_setup() { + : "${CBUILD:=${CHOST}}" + : "${CTARGET:=${CHOST}}" + [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && + CTARGET=${CATEGORY#cross-} + + [[ ${CHOST} != ${CTARGET} ]] && MW_CROSS=true || MW_CROSS=false + + [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] && + die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw" +} + +mingw-foreach_tool() { + use !tools || use headers-only && return + + local tool=widl + if use !amd64 && use !x86 && use !arm64 && use !arm; then + einfo "Skipping widl due to unsupported platform" #853250 + tool= + fi + + for tool in gendef genidl ${tool}; do + # not using top-level --with-tools given it skips widl + pushd mingw-w64-tools/${tool} >/dev/null || die + "${@}" + popd >/dev/null || die + done +} + +src_configure() { + # native tools, see #644556 + local toolsconf=() + # normally only widl is prefixed, but avoids clash with other targets + ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) + + mingw-foreach_tool econf "${toolsconf[@]}" + + MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it + + # likely cross-compiling from here, update toolchain variables + if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then + unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP + filter-flags '-fuse-ld=*' + filter-flags '-mfunction-return=thunk*' #878849 + fi + local CHOST=${CTARGET} + strip-unsupported-flags + + # Normally mingw64 does not use dynamic linker, but at configure time it + # uses LDFLAGS. When -Wl,--hash-style=gnu is passed __CTORS_LIST__ / + # __DTORS_LIST__ is misdetected for target and binaries crash at shutdown. + # Note: typically also stripped by strip-unsupported-flags, but not during + # USE=headers-only and potentially other configurations (kept as safety). + filter-ldflags '-Wl,--hash-style=*' + + local prefix=${EPREFIX}/usr + ${MW_CROSS} && prefix+=/${CTARGET}/usr + + local conf=( + --prefix="${prefix}" + --libdir="${prefix}"/lib + $(use_with !headers-only crt) + $(usev default-ucrt --with-default-msvcrt=ucrt) + + # By default configure tries to set --sysroot=${prefix}. We disable + # this behaviour with --with-sysroot=no to use gcc's sysroot default. + # That way we can cross-build mingw64-runtime with cross-emerge. + --with-sysroot=no + ) + + if use !headers-only; then + conf+=( + $(use_enable idl) + $(use_with libraries) + ) + + # prefer tuple to determine if should do 32 or 64bits, but fall + # back to cpp test if missing (bug #584858, see also #840662) + local b32=true + case ${CHOST} in + x86_64-*) b32=false;; + i*86-*) ;; + *) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;; + esac + ${b32} && + conf+=( --enable-lib32 --disable-lib64 ) || + conf+=( --disable-lib32 --enable-lib64 ) + + # prepare temporary headers install to build against same-version + mkdir ../headers || die + pushd ../headers >/dev/null || die + ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt + popd >/dev/null || die + + append-cppflags "-I${T}/root/include" + fi + + econf "${conf[@]}" +} + +src_compile() { + use headers-only || emake -C ../headers install + emake + mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}" +} + +src_install() { + default + + mingw-foreach_tool emake DESTDIR="${D}" install + + if ${MW_CROSS}; then + # gcc is configured to look at specific hard-coded paths for mingw #419601 + dosym usr /usr/${CTARGET}/mingw + dosym usr /usr/${CTARGET}/${CTARGET} + dosym usr/include /usr/${CTARGET}/sys-include + fi + + rm -r "${ED}"/usr/share || die +} diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild deleted file mode 100644 index caa50883a838..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Free Win64 runtime and import library definitions" -HOMEPAGE="https://www.mingw-w64.org/" -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -S="${WORKDIR}/mingw-w64-v${PV}" - -LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# USE=libraries needs working stage2 compiler: bug #665512 -IUSE="headers-only idl libraries tools" -RESTRICT="strip" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch - "${FILESDIR}"/${P}-__rdtsc.patch - "${FILESDIR}"/${P}-udivmod.patch -) - -pkg_setup() { - : ${CBUILD:=${CHOST}} - : ${CTARGET:=${CHOST}} - [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && - CTARGET=${CATEGORY#cross-} - - [[ ${CHOST} != ${CTARGET} ]] && MW_CROSS=true || MW_CROSS=false - - [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] && - die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw" -} - -mingw-foreach_tool() { - use !tools || use headers-only && return - - local tool=widl - if use !amd64 && use !x86 && use !arm64 && use !arm; then - einfo "Skipping widl due to unsupported platform" #853250 - tool= - fi - - for tool in gendef genidl ${tool}; do - # not using top-level --with-tools given it skips widl - pushd mingw-w64-tools/${tool} >/dev/null || die - "${@}" - popd >/dev/null || die - done -} - -src_configure() { - # native tools, see #644556 - local toolsconf=() - # normally only widl is prefixed, but avoids clash with other targets - ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) - - mingw-foreach_tool econf "${toolsconf[@]}" - - MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it - - # likely cross-compiling from here, update toolchain variables - if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then - unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - fi - local CHOST=${CTARGET} - strip-unsupported-flags - - # Normally mingw64 does not use dynamic linker. - # But at configure time it uses $LDFLAGS. - # When default -Wl,--hash-style=gnu is passed - # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected - # for target ld and binaries crash at shutdown. - filter-ldflags '-Wl,--hash-style=*' - - local prefix=${EPREFIX}/usr - ${MW_CROSS} && prefix+=/${CTARGET}/usr - - local conf=( - --prefix="${prefix}" - --libdir="${prefix}"/lib - $(use_with !headers-only crt) - - # By default configure tries to set --sysroot=${prefix}. We disable - # this behaviour with --with-sysroot=no to use gcc's sysroot default. - # That way we can cross-build mingw64-runtime with cross-emerge. - --with-sysroot=no - ) - - if use !headers-only; then - conf+=( - $(use_enable idl) - $(use_with libraries) - ) - - # prefer tuple to determine if should do 32 or 64bits, but fall - # back to cpp test if missing (bug #584858, see also #840662) - local b32=true - case ${CHOST} in - x86_64-*) b32=false;; - i*86-*) ;; - *) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;; - esac - ${b32} && - conf+=( --enable-lib32 --disable-lib64 ) || - conf+=( --disable-lib32 --enable-lib64 ) - - # prepare temporary headers install to build against same-version - mkdir ../headers || die - pushd ../headers >/dev/null || die - ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt - popd >/dev/null || die - - append-cppflags "-I${T}/root/include" - fi - - econf "${conf[@]}" -} - -src_compile() { - use headers-only || emake -C ../headers install - emake - mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}" -} - -src_install() { - default - - mingw-foreach_tool emake DESTDIR="${D}" install - - if ${MW_CROSS}; then - # gcc is configured to look at specific hard-coded paths for mingw #419601 - dosym usr /usr/${CTARGET}/mingw - dosym usr /usr/${CTARGET}/${CTARGET} - dosym usr/include /usr/${CTARGET}/sys-include - fi - - rm -r "${ED}"/usr/share || die -} diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild deleted file mode 100644 index 7f9b3697a13d..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Free Win64 runtime and import library definitions" -HOMEPAGE="https://www.mingw-w64.org/" -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -S="${WORKDIR}/mingw-w64-v${PV}" - -LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# USE=libraries needs working stage2 compiler: bug #665512 -IUSE="headers-only idl libraries tools" -RESTRICT="strip" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch -) - -pkg_setup() { - : ${CBUILD:=${CHOST}} - : ${CTARGET:=${CHOST}} - [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && - CTARGET=${CATEGORY#cross-} - - [[ ${CHOST} != ${CTARGET} ]] && MW_CROSS=true || MW_CROSS=false - - [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] && - die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw" -} - -mingw-foreach_tool() { - use !tools || use headers-only && return - - local tool=widl - if use !amd64 && use !x86 && use !arm64 && use !arm; then - einfo "Skipping widl due to unsupported platform" #853250 - tool= - fi - - for tool in gendef genidl ${tool}; do - # not using top-level --with-tools given it skips widl - pushd mingw-w64-tools/${tool} >/dev/null || die - "${@}" - popd >/dev/null || die - done -} - -src_configure() { - # native tools, see #644556 - local toolsconf=() - # normally only widl is prefixed, but avoids clash with other targets - ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) - - mingw-foreach_tool econf "${toolsconf[@]}" - - MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it - - # likely cross-compiling from here, update toolchain variables - if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then - unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - fi - local CHOST=${CTARGET} - strip-unsupported-flags - - # Normally mingw64 does not use dynamic linker. - # But at configure time it uses $LDFLAGS. - # When default -Wl,--hash-style=gnu is passed - # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected - # for target ld and binaries crash at shutdown. - filter-ldflags '-Wl,--hash-style=*' - - local prefix=${EPREFIX}/usr - ${MW_CROSS} && prefix+=/${CTARGET}/usr - - local conf=( - --prefix="${prefix}" - --libdir="${prefix}"/lib - $(use_with !headers-only crt) - - # By default configure tries to set --sysroot=${prefix}. We disable - # this behaviour with --with-sysroot=no to use gcc's sysroot default. - # That way we can cross-build mingw64-runtime with cross-emerge. - --with-sysroot=no - ) - - if use !headers-only; then - conf+=( - $(use_enable idl) - $(use_with libraries) - ) - - # prefer tuple to determine if should do 32 or 64bits, but fall - # back to cpp test if missing (bug #584858, see also #840662) - local b32=true - case ${CHOST} in - x86_64-*) b32=false;; - i*86-*) ;; - *) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;; - esac - ${b32} && - conf+=( --enable-lib32 --disable-lib64 ) || - conf+=( --disable-lib32 --enable-lib64 ) - - # prepare temporary headers install to build against same-version - mkdir ../headers || die - pushd ../headers >/dev/null || die - ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt - popd >/dev/null || die - - append-cppflags "-I${T}/root/include" - fi - - econf "${conf[@]}" -} - -src_compile() { - use headers-only || emake -C ../headers install - emake - mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}" -} - -src_install() { - default - - mingw-foreach_tool emake DESTDIR="${D}" install - - if ${MW_CROSS}; then - # gcc is configured to look at specific hard-coded paths for mingw #419601 - dosym usr /usr/${CTARGET}/mingw - dosym usr /usr/${CTARGET}/${CTARGET} - dosym usr/include /usr/${CTARGET}/sys-include - fi - - rm -r "${ED}"/usr/share || die -} diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest index f4fd291317b4..304d9d098848 100644 --- a/dev-util/mingw64-toolchain/Manifest +++ b/dev-util/mingw64-toolchain/Manifest @@ -8,6 +8,8 @@ DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b830 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 +DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d EBUILD mingw64-toolchain-10.0.0_p1-r2.ebuild 9715 BLAKE2B 42bb3caaee09901b0d0ab7e90f3f53fefd3d220e4a99305130c504c387661595789acffd6ef65cdfac549f037ebfaf17294bdea287646634dd34cdccf8c9bbee SHA512 79f4bb56176112f4e77b9d7b1c8a309d56ff261fb0805a65be0dea7629163fe7d9a93fb800ea006b4d71751cb6bddff929de5491e1e84e322874470d943a146d EBUILD mingw64-toolchain-10.0.0_p4.ebuild 9936 BLAKE2B 4a8b9b7d14b3421c75e2b7b2cbc2aa0eea576c02c60bd2f07ace8be45371d999c5041ae60020c35a86941491fcfe33d31de1b88e547e4f6a7ee69a1622ddceda SHA512 a5e05cba57d34d9f41b4939da950749cf192f5fcb84a4c4d7417c2afe80ffca018e80054e27002584c259e14d13c0edc98f7d2356e68ff09d94da3cc1d87de38 +EBUILD mingw64-toolchain-11.0.0.ebuild 9717 BLAKE2B f9b83c2162ce0bc13fff25fd9cb6d8335b8daf7ddcd92f422d2d16e72a9034e829c894bd9841573c9abcdada9b2c6e57f05e5602fe811dc128e66da10a6168d9 SHA512 e0db83744186966384953a601274593b5d3b75fc7c34692faae07542c5b8b37b0795cd23c8dcab9fad562310ace468b017568b3dc64f1f7ebd589c75ab538ff4 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313 diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild new file mode 100644 index 000000000000..360f880e3610 --- /dev/null +++ b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild @@ -0,0 +1,317 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) +inherit edo flag-o-matic multilib-build toolchain-funcs + +# Pick versions known to work for wine+dxvk, and avoid too frequent updates +# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using +# Gentoo patchsets for simplicity, their changes are mostly unneeded here). +BINUTILS_PV=2.40 +GCC_PV=13.1.0 +MINGW_PV=$(ver_cut 1-3) + +DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev" +HOMEPAGE=" + https://www.mingw-w64.org/ + https://gcc.gnu.org/ + https://sourceware.org/binutils/" +SRC_URI=" + mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2 + mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz" +if [[ ${GCC_PV} == *-* ]]; then + SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz" +else + SRC_URI+=" + mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz + mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz" +fi +S="${WORKDIR}" + +# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime +LICENSE=" + GPL-3+ + LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) + ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+abi_x86_32 custom-cflags debug" + +RDEPEND=" + dev-libs/gmp:= + dev-libs/mpc:= + dev-libs/mpfr:= + sys-libs/zlib:= + virtual/libiconv" +DEPEND="${RDEPEND}" + +QA_CONFIG_IMPL_DECL_SKIP=( + strerror_r # libstdc++ test using -Wimplicit+error +) + +PATCHES=( + "${FILESDIR}"/binutils-2.40-import-lib.patch + "${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} == binary ]] && return + + tc-is-cross-compiler && + die "cross-compilation of the toolchain itself is unsupported" +} + +src_prepare() { + # rename directories to simplify both patching and the ebuild + mv binutils{-${BINUTILS_PV},} || die + mv gcc{-${GCC_PV},} || die + mv mingw-w64-v${MINGW_PV} mingw64 || die + + default +} + +src_compile() { + # not great but do everything in src_compile given bootstrapping + # process needs to be done in steps of configure+compile+install + # (done modular to have most package-specific things in one place) + + CTARGET=$(usex x86 i686 x86_64)-w64-mingw32 + + MWT_D=${T}/root # moved to ${D} in src_install + local mwtdir=/usr/lib/${PN} + local prefix=${EPREFIX}${mwtdir} + local sysroot=${MWT_D}${prefix} + local -x PATH=${sysroot}/bin:${PATH} + + filter-lto # requires setting up, and may be messy with mingw static libs + use custom-cflags || strip-flags # fancy flags are not realistic here + + local multilib=false + use abi_x86_32 && use abi_x86_64 && multilib=true + + # global configure flags + local conf=( + --build=${CBUILD:-${CHOST}} + --target=${CTARGET} + --{doc,info,man}dir=/.skip # let individual packages handle docs + ) + + # binutils + local conf_binutils=( + --prefix="${prefix}" + --host=${CHOST} + --disable-cet + --disable-default-execstack + --disable-nls + --disable-shared + --with-system-zlib + --without-debuginfod + --without-msgpack + --without-zstd + ) + mwt-binutils() { + # symlink gcc's lto plugin for AR (bug #854516) + ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \ + "${sysroot}"/lib/bfd-plugins || die + } + + # gcc (minimal -- if need more, disable only in stage1 / enable in stage3) + local conf_gcc=( + --prefix="${prefix}" + --host=${CHOST} + --disable-bootstrap + --disable-cet + --disable-gcov #843989 + --disable-gomp + --disable-libquadmath + --disable-libsanitizer + --disable-libssp + --disable-libvtv + --disable-shared + --disable-werror + --with-gcc-major-version-only + --with-system-zlib + --without-isl + --without-zstd + ) + ${multilib} || conf_gcc+=( --disable-multilib ) + + local conf_gcc_stage1=( + --enable-languages=c + --disable-libatomic + --with-sysroot="${sysroot}" + ) + local -n conf_gcc_stage2=conf_gcc_stage1 + + local conf_gcc_stage3=( + --enable-languages=c,c++ + --enable-threads=posix # needs stage3, and is required for dxvk/vkd3d + --with-sysroot="${prefix}" + --with-build-sysroot="${sysroot}" + ) + + # mingw64-runtime (split in several parts, 3 needed for gcc stages) + local conf_mingw64=( + --prefix="${prefix}"/${CTARGET} + --host=${CTARGET} + --with-sysroot=no + --without-{crt,headers} + + # mingw .dll aren't used by wine and packages wouldn't find them + # at runtime, use crossdev if need dll and proper search paths + --disable-shared + ) + + local conf_mingw64_headers=( + --enable-idl + --with-headers + ) + mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601 + + local conf_mingw64_runtime=( --with-crt ) + ${multilib} || + conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) ) + + local conf_mingw64_libraries=( --with-libraries ) + local conf_mingw64_libraries32=( + --libdir="${prefix}"/${CTARGET}/lib32 + --with-libraries + CC="${CTARGET}-gcc -m32" + RCFLAGS="--target=pe-i386 ${RCFLAGS}" + ) + + # mingw64-runtime's idl compiler (useful not to depend on wine for widl) + local conf_widl=( --prefix="${prefix}" ) + + # mwt-build [-x] [stage-name] + # -> ./configure && make && make install && mwt-package() && mwt-package_stage() + # passes conf, conf_package, and conf_package_stage arrays to configure, and + # users can add options through environment with e.g. + # MWT_BINUTILS_CONF="--some-option" + # MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option" + # MWT_WIDL_CONF="--some-other-option" + # EXTRA_ECONF="--global-option" (generic naming for if not reading this) + mwt-build() { + if [[ ${1} == -x ]]; then + ( + # cross-compiling, cleanup and let ./configure handle it + unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP + CHOST=${CTARGET} + filter-flags '-fuse-ld=*' + filter-flags '-mfunction-return=thunk*' #878849 + strip-unsupported-flags + mwt-build "${@:2}" + ) + return + fi + + local id=${1##*/} + local build_dir=${WORKDIR}/${1}${2+_${2}}-build + + # econf is not allowed in src_compile and its defaults are + # mostly unused here, so use configure directly + local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" ) + + local -n conf_id=conf_${id} conf_id2=conf_${id}_${2} + [[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" ) + [[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" ) + + local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF + conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} ) + + einfo "Building ${id}${2+ ${2}} in ${build_dir} ..." + + mkdir -p "${build_dir}" || die + pushd "${build_dir}" >/dev/null || die + + edo "${conf[@]}" + emake + emake DESTDIR="${MWT_D}" install + + declare -f mwt-${id} >/dev/null && edo mwt-${id} + declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2} + + popd >/dev/null || die + } + + # workaround race condition with out-of-source crt build (bug #879537) + mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die + + # build with same ordering that crossdev would do + stage3 for pthreads + mwt-build binutils + mwt-build mingw64 headers + mwt-build gcc stage1 + mwt-build -x mingw64 runtime + mwt-build gcc stage2 + ${multilib} && mwt-build -x mingw64 libraries32 + mwt-build -x mingw64 libraries + mwt-build gcc stage3 + mwt-build mingw64/mingw-w64-tools/widl + # note: /could/ system-bootstrap if already installed, but gcc and + # libraries will use the system's older mingw64 headers/static-libs + # and make this potentially fragile without more workarounds/stages + + if ${multilib}; then + # Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86, + # but packages expect crossdev's i686-w64-mingw32-gcc which is the same + # just without 64bit support and would rather not build the toolchain + # twice. Dirty but wrap to allow simple interoperability with crossdev. + mwt-i686_wrapper() { + printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \ + > ${bin32} || die + chmod +x ${bin32} || die + } + pushd "${sysroot}"/bin >/dev/null || die + local bin bin32 + for bin in ${CTARGET}-*; do + bin32=${bin/x86_64-w64/i686-w64} + case ${bin#${CTARGET}-} in + as) mwt-i686_wrapper --32;; + cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;; + ld|ld.bfd) mwt-i686_wrapper -m i386pe;; + windres) mwt-i686_wrapper --target=pe-i386;; + *) ln -s ${bin} ${bin32} || die;; + esac + done + popd >/dev/null || die + fi + + # portage doesn't know the right strip executable to use for CTARGET + # and it can lead to .a mangling, notably with 32bit (breaks toolchain) + dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}} + + # ... and instead do it here given this saves ~60MB + if use !debug; then + einfo "Stripping ${CTARGET} static libraries ..." + find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \ + -exec ${CTARGET}-strip --strip-unneeded {} + || die + fi +} + +src_install() { + mv "${MWT_D}${EPREFIX}"/* "${ED}" || die + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Note that this package is primarily intended for Wine and related" + elog "packages to depend on without needing a manual crossdev setup." + elog + elog "Settings are oriented only for what these need and simplicity." + elog "Use sys-devel/crossdev if need full toolchain/customization:" + elog " https://wiki.gentoo.org/wiki/Mingw" + elog " https://wiki.gentoo.org/wiki/Crossdev" + fi + + local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc + if has_version ${cross_gcc}; then + # encourage cleanup given users may not realize if switch by default + ewarn "${cross_gcc} is installed, note that ${PN}" + ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}" + ewarn "packages and optionally only one needs to be kept." + fi +} -- cgit v1.2.3