gentoo resync : 24.06.2021

5 files changed, 149 insertions, 0 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f2b92d093df4..b34103252188 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 3add9ffcae98..9838b08d0c06 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,5 @@
 DIST goffice-0.10.49.tar.xz 2430256 BLAKE2B 64ef27ab729f02b42742b2ae8da43c59b560d016caa707c6dccb3dc6f23eaab13b40367f145b83b1c728c9884dff164118f4a4d6f9ac5accb07596173b127271 SHA512 a185f9fc814ecd2a6e69d026ac150c38e30e1a440f7640bcfc3bfd1939b924621eabf2faafa2837e2d1835418f5481a0d0d7980f4a669e7ca1b93907b17a303a
+DIST goffice-0.10.50.tar.xz 2430608 BLAKE2B 0b06da8d58c4407465266f8c5421331d5d05731038bca191afdd1823950dde07439d458c0ddb93e0641ff81e727f055313be3c8af29bdf32214ed8b2c2cafc0b SHA512 1117540d9162d45059150281b03941ff9b6df1929dcbd7e5aa6e28010d3bb5a46902c30b6f1d35fd5b60f9afe73b58f132aa686aa1712332ea18635d5a79bd0c
 EBUILD goffice-0.10.49.ebuild 1419 BLAKE2B b94d44596297b2ac24076e4021f0a557828fc0a185a9a933d774134ac99411189ccafbe3549b35503d240f82635d1eea9c7ce5b7a6623b5e33ac7895cd1be87b SHA512 ffd5cb7122e6a6b9997bbd3bb7d837061d2e87b0df26c9a823b34a50b35a5e0766302a0f2e56a319e53393f53eeeb57fabd00f3e0333de657afae77564b77c82
+EBUILD goffice-0.10.50.ebuild 1421 BLAKE2B 2deabb9817080a9e684e2d87ed423d1a2921a1a47b1c2a9a50ed6782d2761a8b98b3d0fdec5b70fbdff4fd4442525a29d9f86a44574ca03cad027d1751e1b9ac SHA512 faaa54513d7666a724dc03d6611e6026a21de35f0ca8f94ca05659bd6f671e555448fa9f97b29bfeac1473246e1827c4c14b9ee79df49353433ce14f7662222a
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.50.ebuild b/x11-libs/goffice/goffice-0.10.50.ebuild
new file mode 100644
index 000000000000..33a766b3e012
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.50.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.4.12:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=x11-libs/cairo-1.10:=[svg]
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/pango-1.24:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	dodoc MAINTAINERS
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 661a9161bae0..64ce9d0a7d18 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
+DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd SHA512 7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b
 EBUILD qscintilla-2.11.5.ebuild 1959 BLAKE2B 66709df30efbbee01900254c1fbe9026155fc6a063b2bbc2dee69278c6600a258ba351155519db19588d6a032080be7bdbb2dc0ecad7dcacdd4eb017f2e5b542 SHA512 f786290e1496a6d1ff12f9c235269e5d72d4e5898fd5b57a787df74d84f33359b6eeff3530d96fb9037804e26be126abcd3cf84c9242f4c24238ea94898646b5
 EBUILD qscintilla-2.11.6.ebuild 1964 BLAKE2B d7b1627cc76f089054a76cfb01263cd78278b2ff17295dcac245bea8cbf3ca5ea0830a8e30ea8e3ba69b968f0cf8ecbdbae6a82972ea3f0cd085cb8c54807dca SHA512 3f69bb7fb27ac4c0d3c5292dc98d219f938c10ff73bb78eb62972b5f2f80b66fd9f717ce0b3cae0d3e43f4d2929fc1bc2fc8b12533ac3b0429eb6f0dd3d5938b
+EBUILD qscintilla-2.12.1.ebuild 1896 BLAKE2B 1d71cf780fe20869ee6bc54e7d7642de70a79bbe881931c80b38e946ba57f65aa2f28af4f8cdc58d8783d363f77320e1d43f1f96f80b1f8c9b165be4caab6999 SHA512 ed15cfa05b70312b449c473e197bbf3b4683adad1e7bf73547986d3eceb2a37500924c55e8ba8ed4f618dd5d311634f6ec8a1409b632ed9b1fe356598b42594d
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
new file mode 100644
index 000000000000..c754ae717fed
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+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
+
+	qsci_run_in src eqmake5
+	use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+	qsci_run_in src emake
+	use designer && qsci_run_in designer emake
+}
+
+src_install() {
+	qsci_run_in src emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+}