gentoo auto-resync : 23:04:2023 - 18:08:08

5 files changed, 144 insertions, 2 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9dc5749313ed..d9f490159390 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index dd554d4671e9..800cabee0521 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,5 +3,5 @@ AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad09
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
 EBUILD calligra-3.2.1-r5.ebuild 5740 BLAKE2B eee68fd25820fc31aec3ad18ec302b077e1801eef3236d204084047165ca58db1508ac1cbe0a58d8db1775a1515547459bf3153a67356b3f0ac1b220854b9cd3 SHA512 7b06e50abd506e5e1ba761bc1281bbaed0ebb3a42f078bae0f84abdedda00ba0065280fb0ecc96507a88e74559dff235b86032ddd55eee825d93866753e15a4a
-EBUILD calligra-3.2.1-r8.ebuild 5932 BLAKE2B b6ff2e573f663c27a02b8cf09c4acc1f2be4abeb09afe19580c07b30cc406cd0f1723742ce2699688f1e431fcd45c6e8854d7e99ea3740784ac8e52d961b9ff3 SHA512 2cb60f8417ed4f81e879362fee0c68ccff5a4885b499f3eaca91a5380e5d050a9cb75d4f0ca1b25d861ad89a95fbb5c6477c734820d6dd6ceea3eee84791e440
+EBUILD calligra-3.2.1-r8.ebuild 5931 BLAKE2B 6a91422132342ac944981329f8a697c61c6209e7f260bdc9da6be399cf67ef1e4dffeb19eb6a052840de3f2b3ca640a81d4f9690058d6c6e55821f212e5e3cbf SHA512 271dee4a341e62670995a06759c85c547b9f9e1a2a7681dac7109f62f2fb22c917f6c105cfdcfab1d754eb42f448ead9c618ad148618e5d49e8a0ce38822cd07
 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild
index d757ece3bddd..77b7c25e2de8 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	PATCHSET="${P}-patchset-1"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
index af399c774567..492c6b50441d 100644
--- a/app-office/sc-im/Manifest
+++ b/app-office/sc-im/Manifest
@@ -1,5 +1,6 @@
 DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
 DIST sc-im-0.8.3.tar.gz 1664440 BLAKE2B 9f02e265ecd39b4f3a5e3ab61222094a1424f9591c04ff3ddf745576f2aa1c89345ea2e4d4c95a0565d7f287985e81d9eba849113f5b7aa61744cf69284ce312 SHA512 a3d7cf99c7c959d24ebf7e525abb665c02690674c9b3cdf5b234dcdb376fd73e9488bda522106802932084bbfd239928e39b35743c7051178aa14edf61ec2cb8
 EBUILD sc-im-0.8.2.ebuild 3999 BLAKE2B 235eccb82a11d3b60539c8003d44f7fa17b7266eedb2069b0d2e9261ba6a0e5f2259e1c42107859422d0808ee233a6f06196dd15da66b43f0af831872d537200 SHA512 51010231f671bc5254d1e6f9d624a0206fcc276f1f440a33c759786bdefae85f9f7e92ffcf42115e3a04450f00ea260525c660b3a9e735c370b6a4c510bc7068
+EBUILD sc-im-0.8.3-r1.ebuild 3972 BLAKE2B 4259db356118786dfe61c9cd5e40374c0e7e6c01cab29523717376063c606a6928c9f783a01695a60eda43c937a663b227545409714e0131b5df0a0f23055a93 SHA512 d441df9fa029b5854bc4032c125c3a3239718dcc623e4aeae0f730d50f4c87cfacfe2014325a5e642d4be69d2d0ff5b3a0d6dbb8f880ac21d150e8e43e4a9f00
 EBUILD sc-im-0.8.3.ebuild 3969 BLAKE2B 89a42d81b9f5caeaae8bf27c048f4431c92fd41e784d6fea3be35c05328d5b72955d4eab67f7f7ac57c9b2598f8cfca0d7cc7034f3679e1e4c54dc4814d02489 SHA512 3d89fbaaa85239d2580a39cf161cdc9b9cc53f50c0467a031ec8479b61937d26a3746a69dc653b9aea8dab715bb5f87f57ea8399c5f05e67ad64d6729a4924b8
 MISC metadata.xml 974 BLAKE2B 2e46ac845ba9978e8b646007003dcf2b53844e5dd2a86f4cbdf812d58850e41f3636ba2807503aa56d6c69a8e04033d868534415c7fd71d424444af1eea392a9 SHA512 1f66c4340b79c43daca9d66be2b3e20e59405fc501a793d0159cbe40e7f541af79b036f53905bca0ea8001a14a9f4d17cb3fd060ce95cfbbc0b0ef9c8e521dff
diff --git a/app-office/sc-im/sc-im-0.8.3-r1.ebuild b/app-office/sc-im/sc-im-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..5337d164314b
--- /dev/null
+++ b/app-office/sc-im/sc-im-0.8.3-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs flag-o-matic
+
+DESCRIPTION="Ncurses based, vim-like spreadsheet calculator"
+HOMEPAGE="https://github.com/andmarti1424/sc-im"
+SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lua ods plots tmux wayland X xls xlsx"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	sys-libs/ncurses:=
+	lua? (
+		${LUA_DEPS}
+	)
+	ods? (
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+	plots? ( sci-visualization/gnuplot )
+	tmux? ( app-misc/tmux )
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
+	xls? (
+		dev-libs/libxls
+	)
+	xlsx? (
+		dev-libs/libxlsxwriter
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc
+	virtual/pkgconfig"
+
+pkg_setup() {
+	CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "")
+	if ( use tmux && ( use wayland || use X ) ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "tmux support has been preferred."
+	elif ( use wayland && use X ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "Wayland support has been preferred."
+	fi
+
+	# Run lua setup
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Clean Makefile from all sorts of flag / lib setting
+	sed -i -e '/CFLAGS +=\|LDLIBS +=/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+	# Also clean the now useless comments and logic
+	sed -i -e '/#\|if\|else/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	LDLIBS="-lm"
+
+	# default flags that dont need optional dependencies
+	append-cflags -Wall -g \
+		-DNCURSES \
+		-D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE \
+		'-DSNAME=\"sc-im\"' \
+		'-DHELP_PATH=\"/usr/share/sc-im\"' \
+		'-DLIBDIR=\"/usr/share/doc/sc-im\"' \
+		'-DDFLT_PAGER=\"less\"' \
+		'-DDFLT_EDITOR=\"vim\"' \
+		-DUSECOLORS \
+		'-DHISTORY_FILE=\"sc-iminfo\"' \
+		'-DHISTORY_DIR=\".cache\"' \
+		'-DCONFIG_FILE=\"scimrc\"' \
+		'-DCONFIG_DIR=\".config/sc-im\"' \
+		'-DINS_HISTORY_FILE=\"sc-iminfo\"' \
+		-DUNDO \
+		-DMAXROWS=1048576 \
+		-DUSELOCALE \
+		-DMOUSE \
+		'-DDEFAULT_OPEN_FILE_UNDER_CURSOR_CMD=\""scopen"\"' \
+		-DAUTOBACKUP \
+		-DHAVE_PTHREAD
+
+	# setting default clipboard commands
+	if use tmux ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"'
+	elif use wayland ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""wl-copy <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""wl-paste"\"'
+	elif use X ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"'
+	fi
+
+	# optional feature dependency
+	use plots && append-cflags -DGNUPLOT
+	if use xls; then
+		append-cflags -DXLS $(${PKG_CONFIG} --cflags libxls)
+		LDLIBS+=" $(${PKG_CONFIG} --libs libxls)"
+	fi
+	if use xlsx || use ods ; then
+		append-cflags -DODS -DXLSX $(${PKG_CONFIG} --cflags libxml-2.0 libzip)
+		LDLIBS+=" -DODS -DXLSX $(${PKG_CONFIG} --libs libxml-2.0 libzip)"
+	fi
+	if use xlsx ; then
+		append-cflags -DXLSX_EXPORT $(${PKG_CONFIG} --cflags xlsxwriter)
+		LDLIBS+=" -DXLSX_EXPORT $(${PKG_CONFIG} --libs xlsxwriter)"
+	fi
+	if use lua ; then
+		append-cflags -DXLUA $(${PKG_CONFIG} --cflags lua)
+		LDLIBS+=" -DXLUA $(${PKG_CONFIG} --libs lua) -rdynamic"
+	fi
+	append-cflags $(${PKG_CONFIG} --cflags ncursesw) || append-cflags $(${PKG_CONFIG} --cflags ncurses)
+	LDLIBS+=" $(${PKG_CONFIG} --libs ncursesw)" || LDLIBS+=" $(${PKG_CONFIG} --libs ncurses)"
+}
+
+src_compile() {
+	emake LDLIBS="${LDLIBS}" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" install
+	einstalldocs
+}