summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin64762 -> 64761 bytes
-rw-r--r--dev-util/glslang/Manifest8
-rw-r--r--dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch39
-rw-r--r--dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch26
-rw-r--r--dev-util/glslang/glslang-1.3.250.ebuild37
-rw-r--r--dev-util/glslang/glslang-1.3.261.ebuild37
-rw-r--r--dev-util/glslang/glslang-1.3.268-r2.ebuild44
-rw-r--r--dev-util/meld/Manifest2
-rw-r--r--dev-util/meld/meld-3.22.1.ebuild74
9 files changed, 76 insertions, 191 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7e2f8a510c2b..1ea6c00a3fbd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 91b050260a71..3ea9e7fa35a7 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,12 +1,4 @@
-AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
-AUX glslang-1.3.238-Fix-cmake-targets.patch 1125 BLAKE2B aaf925ce96678f43a4a496278447d92b1cbbd1dbfed2e571960ec10a15439fa08beb51a335c588a72c9449cd32cdd9d05ac2d7426606129fda44f453f379c619 SHA512 fc5cffda5c236e0b819f0dff18d64c603a29a7b1d9cf12f9fed124bfa6aca0dd491f41019503acceb145bded419323cc3cc132f1a029ca7c37a37c59ad639b58
-DIST glslang-1.3.250.tar.gz 3707963 BLAKE2B 24096c88307dfca765bb5fdbcebe1ec8f658ee640408f89cf2e17b3dd35c4870fa2de07403fe754991d953a4b171a75f499638c599c3045e2560fae0c871dabe SHA512 deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c
-DIST glslang-1.3.261.tar.gz 3705459 BLAKE2B 0576d87d6172910ec8853c44920614745be7c244bd70e1f424f07de3befabf93745142ddbc242cedde7ca3c646017104bd6dec2bc6a4c1ff29ac3b4041d68a7a SHA512 dc26a6b4311319e2897141bbb424eac6fc7deec99b90ac87c1f734701a8d52d55e5a6884183583f526580fe173ace01f5a5bc666658e1699a57d2e522f0edc84
-DIST glslang-1.3.268.tar.gz 3765735 BLAKE2B 20e4063c080da6fa7427d8b9af9af27a6e5e8895e870620e4b5e14e4d5548020de38b932b24df5596df0452ab2511497605343f9ff4511fad325aa696ab565cd SHA512 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f
DIST glslang-1.3.275.tar.gz 3773036 BLAKE2B 6bb30d6972fd64a9acde4b4c22e3db48d77c49a885efc47208c1c5a641d1e01d687b016ada94c89da6c48c735394023bd3efea5d77108d0fed9ab0b4fa92adfe SHA512 0c06b07e2424a24dc6b87eb1e76d866bb8d72d632e874e6f100140e24f3a5f562e66b275673677165ee8c7f7c619d09cb272bcd528be6801c7c1702a100b0f4a
-EBUILD glslang-1.3.250.ebuild 973 BLAKE2B 919386f57885af782452f75a529139be6a81c0d709a5262cb574981988067e145bd24623fc668d9e72beade43d6eba17cf808bae4e1418806ac69850f143e268 SHA512 81a8570342bdf685bea69252a6d52b7295562ec22d1f176dddc92fcf9ea648bd2fb7ce1e827f1bd3e34b87fe59d0f10bfd8ae12faf15e652b61e903493f3d3a7
-EBUILD glslang-1.3.261.ebuild 973 BLAKE2B 919386f57885af782452f75a529139be6a81c0d709a5262cb574981988067e145bd24623fc668d9e72beade43d6eba17cf808bae4e1418806ac69850f143e268 SHA512 81a8570342bdf685bea69252a6d52b7295562ec22d1f176dddc92fcf9ea648bd2fb7ce1e827f1bd3e34b87fe59d0f10bfd8ae12faf15e652b61e903493f3d3a7
-EBUILD glslang-1.3.268-r2.ebuild 1182 BLAKE2B 6b908529674af04d8481cae2a981aed02af12d6712464bfcd6145da01203adfedb2661d2a53b9ece766d467c27124edcf253d2f73f8bd4b6190330584f9bb8e5 SHA512 b02989980b6b014c547ab75968a1283d89ab029925d9762fab262d2ab6a644990222e7daf91dad3585411f12f58bd9fd37c14ccf786884206bbb01d1573ab4d3
EBUILD glslang-1.3.275.ebuild 1079 BLAKE2B ee0c7ebac99e43d915b629e7da6019b2daee1b904f08bfe5c367a29ee9f150072f146aba9a61e944f0fc19582c3a75cdfadd3e97e642f26e2337b2ba8606cc54 SHA512 927c615322c940d790c964e7f6e8ba32da91baa1db9c7cb87211ba8ff0071ec94047db64a979246d458d5db5ebbf53fd8f1e5b7925acaae2bc901dea98b706b6
EBUILD glslang-9999.ebuild 1091 BLAKE2B 49416e282ade462c6e38ff0bb831d9747a4ab29f5badb1c3eccdf5b470d1113c6c078bb6e9a2ad32390064bd62d2cdf42e7617847d92a6e109a5fac39b75c94c SHA512 4b962ff56d2cc94ea836ad0aa5a7f3d1c10fe76377f992ec992a95fc5259bfcc99c9f2486785005c89c9435400d19ce079bf09944fbfc847592c4727e071a80a
MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
deleted file mode 100644
index 826e0f6cd856..000000000000
--- a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index b44cbc73..41f6de93 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -41,7 +41,7 @@ if(WIN32)
- source_group("Source" FILES ${SOURCES})
- endif(WIN32)
-
--if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
-+if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT glslang-targets)
-
- # Backward compatibility
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index a8b14911..57ec1efd 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -203,7 +203,7 @@ endif()
- ################################################################################
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslang EXPORT glslang-targets)
-- if(NOT BUILD_SHARED_LIBS)
-+ if(BUILD_SHARED_LIBS)
- install(TARGETS MachineIndependent EXPORT glslang-targets)
- install(TARGETS GenericCodeGen EXPORT glslang-targets)
-
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 16eb939b..959788dc 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -52,7 +52,7 @@ else()
- target_link_libraries(OSDependent Threads::Threads)
- endif()
-
--if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
-+if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT glslang-targets)
-
- # Backward compatibility
diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
deleted file mode 100644
index 3afcec329f07..000000000000
--- a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index a80e74ed..8a15f00d 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -106,7 +106,7 @@ if(ENABLE_OPT)
- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
- target_include_directories(SPIRV PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
-- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>)
- else()
- target_link_libraries(SPIRV PRIVATE MachineIndependent)
- endif()
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index ad88442c..db2ca5ff 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -69,7 +69,7 @@ endif()
- target_link_libraries(glslang-standalone ${LIBRARIES})
- target_include_directories(glslang-standalone PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
-- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
- if(ENABLE_OPT)
- target_include_directories(glslang-standalone
diff --git a/dev-util/glslang/glslang-1.3.250.ebuild b/dev-util/glslang/glslang-1.3.250.ebuild
deleted file mode 100644
index d720251291ea..000000000000
--- a/dev-util/glslang/glslang-1.3.250.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="sdk-${PV}.0"
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0/12"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.261.ebuild b/dev-util/glslang/glslang-1.3.261.ebuild
deleted file mode 100644
index d720251291ea..000000000000
--- a/dev-util/glslang/glslang-1.3.261.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="sdk-${PV}.0"
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0/12"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.268-r2.ebuild b/dev-util/glslang/glslang-1.3.268-r2.ebuild
deleted file mode 100644
index af9b2a33b3dd..000000000000
--- a/dev-util/glslang/glslang-1.3.268-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="vulkan-sdk-${PV}.0"
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0/13"
-
-# Bug 698850
-RESTRICT="test"
-
-BDEPEND="${PYTHON_DEPS}
- ~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]
-"
-
-DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch
- "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- -DALLOW_EXTERNAL_SPIRV_TOOLS=ON
- )
- cmake_src_configure
-}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 513f7587afbf..6fb6c41bc890 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
+DIST meld-3.22.1.tar.xz 675984 BLAKE2B 47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364 SHA512 7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd
EBUILD meld-3.22.0-r2.ebuild 1640 BLAKE2B be686d99841994654a0c1da88027b6928adef68e3aba076eaeeae1df5dddeefa99f1f9377111f36637c5bbfd4d63cb1b658f8792e52160f8c94276175b281866 SHA512 3c4abb8bd65e9bde7cbb93ce3b4d26bbf188bfc9bc0971c2e4ea1b834f5b405a27ce5e4fea7a76c25269d0f1699fbf74bddac4093d9f2a1be23deb485989cb3e
+EBUILD meld-3.22.1.ebuild 1642 BLAKE2B 8cf753779a1554c3361dcd7af529fc9b632b8595febe141d9c5831107bb4bbb68d5fae3a4aa0695806d31b17d5b11b2fa52a93083b00a259ba9e1c57a3818fbd SHA512 5c01e26b508165e2b4c4ced41171e8bbb3591a7bb8ee1ef9fc527eba2dbd92459332c1c7b90deec13ad391217523d4346f18eb447ca74d6f112af155bb6b061b
MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89
diff --git a/dev-util/meld/meld-3.22.1.ebuild b/dev-util/meld/meld-3.22.1.ebuild
new file mode 100644
index 000000000000..48ffb7c894f2
--- /dev/null
+++ b/dev-util/meld/meld-3.22.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=x11-libs/gtk+-3.20:3[introspection]
+ >=dev-libs/glib-2.48:2
+ >=x11-libs/gtksourceview-4.0.0:4[introspection]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+ ')
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/pango-1.34[introspection]
+ x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-util/desktop-file-utils
+ dev-libs/appstream-glib
+ )
+"
+BDEPEND="
+ dev-util/intltool
+ dev-util/itstool
+ sys-devel/gettext
+ $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dprofile=''
+ -Dbyte-compile=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_optimize
+ python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 23:28:59 +0000