gentoo auto-resync : 17:04:2024 - 12:04:27

7 files changed, 148 insertions, 2 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 889ccc4ad863..fededc568225 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 079f49abe794..c55b1e0bcb59 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,5 +1,7 @@
 DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1
 DIST libXmu-1.2.0.tar.xz 366440 BLAKE2B ef05aa1b7985a5d0b3d72199955bc0a1688fbc4519d17c7fb5bc21711e0dea92b1b290514bd1abd4ad4be58d0bfdec03c721cd6df61f1ade3bc99068a40e9cc6 SHA512 199310c57d9ce15d3a049890ba2b853357fbda267ca0f075624ed4757c72c548a1c4153a4f7492a2ebf06eb90518ef02c21b44ca298933c038c62196f2cddb2e
+DIST libXmu-1.2.1.tar.xz 364888 BLAKE2B fca2e16c663483c0147f87830d6a583bb32026719901bd0aa7b7c4e81b18667b7152e0dd0805e22faf51b62e86cffd7a9423c366f1cafd3af007807cf9965262 SHA512 05a30e5961e00e940ad7ec4eb94ec482b5cbe808585972bf70c849333af3fddf4ae4bd87895d706507fb3a94ed0fb73ea161e0e27dc2840323a1a1af49c0e8a3
 EBUILD libXmu-1.1.4.ebuild 705 BLAKE2B db0ba4d1ecb79a63c520a0511248d609e6f9752907916632d101313e33cc63232a9fa7eeda4710b4f3ed427489f746975c1f3145697027fecaf099c6c38c4962 SHA512 a06028fdd2c26907ae221c09f1aa4ba582de30035f3c72798de4cbe5bde2bb523ab07572078744fa5f3b28d936cb5d78d2171fcb4b2688096bca85f8df079107
 EBUILD libXmu-1.2.0.ebuild 798 BLAKE2B cd904813f94336bb2ae7b000c29e993b61bfe1f1ccc73a61fc04c2d7cad19683c79de7ea52977eb2f2580682381b225a9ca299ee529fba13c6e52463fcd0abf0 SHA512 5e1dac61340c346426870be7a58d15c4513f1a6e596253643b68f2da7433c5ae25c1f16e00eff38b7bcdddf297e528b61149b8f3b49c86d596c8b4b37100410c
+EBUILD libXmu-1.2.1.ebuild 798 BLAKE2B cd904813f94336bb2ae7b000c29e993b61bfe1f1ccc73a61fc04c2d7cad19683c79de7ea52977eb2f2580682381b225a9ca299ee529fba13c6e52463fcd0abf0 SHA512 5e1dac61340c346426870be7a58d15c4513f1a6e596253643b68f2da7433c5ae25c1f16e00eff38b7bcdddf297e528b61149b8f3b49c86d596c8b4b37100410c
 MISC metadata.xml 337 BLAKE2B b3db98afa249caf8d23a610701683c053a774b136ba51d685c87c3630710500bf1926bc93b7c793cf57e0041aee5219f25ec0ce8d0cef5e1387000853c62d272 SHA512 ffccc841608e1f4aaebb2a4bf72fae9f6893268b2497686f0b3037c2cea6b8e11555d6576cb3684d44735ef117e80bb1fcb32d758471e0d92df8257fd3dbc705
diff --git a/x11-libs/libXmu/libXmu-1.2.1.ebuild b/x11-libs/libXmu/libXmu-1.2.1.ebuild
new file mode 100644
index 000000000000..f8e0f2bdedfd
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xmu library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? ( dev-libs/glib[${MULTILIB_USEDEP}] )
+"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 44ea9f5d27d1..8a3871b50af5 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbfile-1.1.2.tar.xz 311428 BLAKE2B a7087fe8a752c83fc7c05e4765469d87eb75eb33686c5bcdcbbdc46d60b23d453053aba35082fd2adf5f95a464909e7b7aac1f12ba364ee1fded1c0559dd3a4b SHA512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d
 DIST libxkbfile-1.1.3.tar.xz 314520 BLAKE2B b0fc59e7f68005bee731f72dfaccac1d0f1b1ec2d07d3ec24745542d47aba7bf86cf7ead22153f04a2b4b5acf66f1300050aa4ae6e4f609cf609d8a3a2a6d031 SHA512 d80ac41f6fa3a1ffad77ea1f8f9d9542f0bd210d74b263802bc6e6c1594fe325b27f42b5454aeeb36352518963b1ed1fdbbad95d7db3690b2e36d54742b7c236
 EBUILD libxkbfile-1.1.2.ebuild 452 BLAKE2B 2160bc8e170a80ad838640165dc9f6f31451663d9f9a1f9c884263ef035e3b6f6da9eaa5696d5594d0db25677762fcfa9d060ef49835aaff8e15688740ff9fcb SHA512 13d56db196292acc0c22628dc56e996a34fbdc238230d015d630cda477511cd84b9910ff91d43881db58f4bac887b86b2c071450c91d53717e5e721820e72d93
-EBUILD libxkbfile-1.1.3.ebuild 453 BLAKE2B a466ea04c782c5a37902de2eaa97f26fd6954de0478c8ba37b8b3a0de437054f9fba10ad2e5fa59630667dc3e35695e00b4ac6cbe96698d70df56116fb456dc9 SHA512 5e9439a35b9fe42c33467a380be226d4e074f0769fcf81ac8c2f50690b39727074cd61a55ad866c43665762ef56591d43cee0391e191a0d10e629a0ca8a2829f
+EBUILD libxkbfile-1.1.3.ebuild 452 BLAKE2B dfa5ec553794cf02ee0dccba6ef0919e04ca9b7b20c83fbba16897725b4e955ce62b7cc72be6b7a44aca24798069d8904f17feda0a062c8121d13eb96190a92a SHA512 61ac1e03e2ab80b0691925a06aeb57f9209782ada2e61c559e94fb6b84a346649424dafc4d60b51d183c34ccadbb2b2c5428e784dac4e1f55503c3e4f8194ff1
 MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
index 39b5e838ae5f..dfc45043e66f 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris"
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 69f56ba4b170..7d788f76db3e 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,6 @@
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
 DIST QScintilla_src-2.14.1.tar.gz 3233610 BLAKE2B 83b54378f0d3fa39ea120214a06c91982f81281e15c61fc70a9e83928be64724cfd2679b5e4aafee44a324e24a6c4729693cd118c6ad0b1636a199f2f41d34fe SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a
 EBUILD qscintilla-2.13.3.ebuild 1904 BLAKE2B 4efdf5c406362d834ee9e357cb5770cc41ebf3a398c15edbdc548783a70b3139cd731b20bb5b98fb10dc76e51905fffa1a7ac3960b0b6c193b2900d1ab04507c SHA512 5103d72ac50506fad4eb7f8c2b82c506e9b366d86cb04f978eb2eba53ef70fe35ff3468d81e9ad4da10eb6bc2f9a5e2c8c2df2ef7a2adfa7c80826190147365f
+EBUILD qscintilla-2.14.1-r1.ebuild 2548 BLAKE2B a359b3291b40f5da4d2f2093515fe8db6aa217defc9c38b04d41b0ea595d3ea0903afeb6181dbbd98f3b29156e8213fdf98f510bc1b51bb3e3403ddaca1403fb SHA512 a92118846b388c0f8817ce2edc6979789b180b5387f71e7cef5b5e9514f603d02bfc81fc334f28b5916ffb3468e5fab17262160bc24e6ef2b11ca6bc8cd05937
 EBUILD qscintilla-2.14.1.ebuild 1904 BLAKE2B 6499a6963083ebadf341c303ed75e16f18cda09ededf21c6c5f542cdb24eae5b2c964299c6b74dfab7947d15b9510d81ddb4fbfe19bb4cb09215bb5c4d2ce58c SHA512 5601d66b8917cdc0a9e0e022bfe2bbc82646691da7075278700596319fa68199db4a54d5e04aa629137aadca36b3b67f5c56a7226ab2d2b2ca3fa786864a5052
 MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
new file mode 100644
index 000000000000..50efd464a50b
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.14.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multibuild qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="designer doc +qt5 qt6"
+
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+# no tests
+RESTRICT="test"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	multibuild_copy_sources
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../src
+		append-ldflags -L../src
+	fi
+	my_src_configure() {
+		case ${MULTIBUILD_VARIANT} in
+			qt5)
+				qsci_run_in "${BUILD_DIR}"/src eqmake5;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake5;;
+			qt6)
+				qsci_run_in "${BUILD_DIR}"/src eqmake6;
+				use designer && qsci_run_in "${BUILD_DIR}"/designer eqmake6;;
+		esac
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	my_src_compile() {
+		qsci_run_in "${BUILD_DIR}"/src emake
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake
+	}
+
+	multibuild_foreach_variant my_src_compile
+}
+
+src_install() {
+	my_src_install() {
+		qsci_run_in "${BUILD_DIR}"/src emake INSTALL_ROOT="${D}" install
+		use designer && qsci_run_in "${BUILD_DIR}"/designer emake INSTALL_ROOT="${D}" install
+	}
+
+	multibuild_foreach_variant my_src_install
+
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+}