* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-13 16:34 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-13 16:34 UTC (permalink / raw
To: gentoo-commits
commit: bda843e20b5e627a32a1b73ca1a0434ca266e0b7
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Wed Apr 13 16:30:40 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Wed Apr 13 16:30:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bda843e2
app-office/sc-im: Remove tmux dependency
This dependency doesn't make sense in it's current flag,
neither does it make sense without patching the Makefile.
It will be added later together with the proper patch and
use flag.
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index e59b5e8f0..69b694230 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -18,7 +18,7 @@ PATCHES=(
DEPEND="
sys-libs/ncurses
- X? ( || ( app-misc/tmux x11-misc/xclip ) )
+ X? ( x11-misc/xclip )
plots? ( sci-visualization/gnuplot )
xls? (
dev-libs/libxlsxwriter
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-14 10:38 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-14 10:38 UTC (permalink / raw
To: gentoo-commits
commit: cd10b2990d8bef52ab21a523329753db49e50c5a
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Thu Apr 14 10:37:43 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Thu Apr 14 10:37:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd10b299
app-office/sc-im: add missing eapply
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index eed3d720a..49753c8bb 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -15,7 +15,6 @@ IUSE="X plots xls lua ods tmux"
PATCHES=(
"${FILESDIR}/${P}-prefix.patch"
"${FILESDIR}/${P}-tmux.patch"
-
)
DEPEND="
@@ -42,6 +41,6 @@ S="${WORKDIR}/${P}/src"
src_prepare() {
eapply "${FILESDIR}/${P}-prefix.patch"
- use tmux && "${FILESDIR}/${P}-tmux.patch"
+ use tmux && eapply "${FILESDIR}/${P}-tmux.patch"
eapply_user
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-14 16:24 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-14 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 46b72e774f59cb8120c55e9f35c2a648eeca68ef
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Thu Apr 14 16:23:07 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Thu Apr 14 16:23:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=46b72e77
app-office/sc-im: add pkgconfig to bdeps
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index 49753c8bb..f170c72d4 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -36,7 +36,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${P}/src"
src_prepare() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-15 5:41 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-15 5:41 UTC (permalink / raw
To: gentoo-commits
commit: 759052518b1b7a312eaa5658e21c277f82ea7298
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Fri Apr 15 05:39:13 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Fri Apr 15 05:39:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=75905251
app-office/sc-im: fix verbose flag description
Removed list of dependencies from flag description.
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
index 64d566c87..ed2ff157e 100644
--- a/app-office/sc-im/metadata.xml
+++ b/app-office/sc-im/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<use>
<flag name='plots'>Add <pkg>sci-visualization/gnuplot</pkg> for plotting support</flag>
- <flag name='xls'>Add xls/xlsx support. Pulls in <pkg>dev-python/xlsxwriter</pkg>, <pkg>dev-haskell/libxml</pkg>, <pkg>dev-libs/libzip</pkg> and <pkg>dev-libs/libxls</pkg></flag>
+ <flag name='xls'>Add xls/xlsx support</flag>
<flag name='ods'>Add <pkg>dev-libs/libzip</pkg> for ods import support</flag>
<flag name='X'>Use <pkg>x11-misc/xclip</pkg> for clipboard copy/paste</flag>
<flag name='tmux'>Use <pkg>app-misc/tmux</pkg> for clipboard copy/paste</flag>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-16 10:08 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-16 10:08 UTC (permalink / raw
To: gentoo-commits
commit: a5d5c2b05c08a8069a579fc4b47563499c8eb3fc
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Sat Apr 16 09:01:46 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Sat Apr 16 10:06:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5d5c2b0
app-office/sc-im: remove unnecessary flag logic
This part is already handled by the Makefile
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index 852cd456c..e61cbc8f9 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -60,11 +60,8 @@ pkg_setup() {
export LUA=$(usex lua)
( use xlsx || use ods ) && export XML_ZIP="yes"
- # Prefer wayland support over X, and tmux support over both wayland and X.
- use wayland && export X="no"
- use tmux && export X="no" && export WAYLAND="no"
-
# Notifying the user about which clipboard support is enabled if conflicting flags are set
+ # Prefer wayland support over X, and tmux support over both wayland and X.
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}"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-18 10:22 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-18 10:22 UTC (permalink / raw
To: gentoo-commits
commit: ea11f083ca7f15abf42ebd8154ad78fcc0a04001
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Mon Apr 18 10:19:05 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Mon Apr 18 10:21:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea11f083
app-office/sc-im: export cc
Closes: https://bugs.gentoo.org/839150
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index e61cbc8f9..3c1ab1a27 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-1 luajit )
-inherit lua-single
+inherit lua-single toolchain-funcs
DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
HOMEPAGE="https://github.com/andmarti1424/sc-im"
@@ -74,3 +74,8 @@ pkg_setup() {
# Run lua setup
lua-single_pkg_setup
}
+
+src_configure() {
+ tc-export CC
+ default
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-24 6:33 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-24 6:33 UTC (permalink / raw
To: gentoo-commits
commit: f1d04cda964f52683ad207ef7a38236848dea479
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Sun Apr 24 06:31:40 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Sun Apr 24 06:31:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1d04cda
app-office/sc-im: fix wrong dependency libxml
Changed dev-haskell/libxml to the correct dev-libs/libxml2
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index ddccd6cb4..15abb065d 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="
${LUA_DEPS}
)
ods? (
- dev-haskell/libxml
+ dev-libs/libxml2
dev-libs/libzip
)
plots? ( sci-visualization/gnuplot )
@@ -42,7 +42,7 @@ DEPEND="
)
xlsx? (
dev-libs/libxlsxwriter
- dev-haskell/libxml
+ dev-libs/libxml2
dev-libs/libzip
)
"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-24 15:26 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-24 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 03ed3db1f7003bc01926cd6680b1692a5a4af2d2
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Sun Apr 24 15:21:06 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Sun Apr 24 15:26:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=03ed3db1
app-office/sc-im: runtime dep change revbump
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2-r1.ebuild | 103 +++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
new file mode 100644
index 000000000..15abb065d
--- /dev/null
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs flag-o-matic
+
+DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
+HOMEPAGE="https://github.com/andmarti1424/sc-im"
+SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X plots wayland xls xlsx lua ods tmux"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-prefix.patch"
+ "${FILESDIR}/${P}-automagic.patch"
+ "${FILESDIR}/${P}-clipboard.patch"
+)
+
+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="virtual/pkgconfig"
+S="${WORKDIR}/${P}/src"
+
+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_configure() {
+ tc-export CC
+
+ PKGCONF=$(tc-getPKG_CONFIG)
+
+ 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
+
+ use plots && append-cflags -DGNUPLOT
+ if use xls; then
+ append-cflags -DXLS $(${PKGCONF} --cflags libxls)
+ LDLIBS+=" $(${PKGCONF} --libs libxls)"
+ fi
+ if use xlsx || use ods ; then
+ append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
+ LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
+ fi
+ if use xlsx ; then
+ append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
+ LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
+ fi
+ if use lua ; then
+ append-cflags -DXLUA $(${PKGCONF} --cflags lua)
+ LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"
+ fi
+ append-cflags $(${PKGCONF} --cflags ncursesw) || append-cflags $(${PKGCONF} --cflags ncurses)
+ LDLIBS+=" $(${PKGCONF} --libs ncursesw)" || LDLIBS+=" $(${PKGCONF} --libs ncurses)"
+ export LDLIBS
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-04-26 12:44 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-04-26 12:44 UTC (permalink / raw
To: gentoo-commits
commit: a3166947b444f4d08ce9fcd49dbe101e266ee817
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Tue Apr 26 12:42:41 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Tue Apr 26 12:42:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3166947
app-office/sc-im: drop 0.8.2
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2.ebuild | 103 ------------------------------------
1 file changed, 103 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
deleted file mode 100644
index 15abb065d..000000000
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit lua-single toolchain-funcs flag-o-matic
-
-DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
-HOMEPAGE="https://github.com/andmarti1424/sc-im"
-SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X plots wayland xls xlsx lua ods tmux"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}/${P}-prefix.patch"
- "${FILESDIR}/${P}-automagic.patch"
- "${FILESDIR}/${P}-clipboard.patch"
-)
-
-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="virtual/pkgconfig"
-S="${WORKDIR}/${P}/src"
-
-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_configure() {
- tc-export CC
-
- PKGCONF=$(tc-getPKG_CONFIG)
-
- 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
-
- use plots && append-cflags -DGNUPLOT
- if use xls; then
- append-cflags -DXLS $(${PKGCONF} --cflags libxls)
- LDLIBS+=" $(${PKGCONF} --libs libxls)"
- fi
- if use xlsx || use ods ; then
- append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
- LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
- fi
- if use xlsx ; then
- append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
- LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
- fi
- if use lua ; then
- append-cflags -DXLUA $(${PKGCONF} --cflags lua)
- LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"
- fi
- append-cflags $(${PKGCONF} --cflags ncursesw) || append-cflags $(${PKGCONF} --cflags ncurses)
- LDLIBS+=" $(${PKGCONF} --libs ncursesw)" || LDLIBS+=" $(${PKGCONF} --libs ncurses)"
- export LDLIBS
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-05-04 6:38 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-05-04 6:38 UTC (permalink / raw
To: gentoo-commits
commit: edb50d74d1826794b24fe6e90186bc5d973f064a
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Wed May 4 06:32:31 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Wed May 4 06:35:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edb50d74
app-office/sc-im: remove xlsx export support
Temporarily removed xlsx export support because of build errors.
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2-r1.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
index d95a385a1..8bf7613d1 100644
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -121,10 +121,10 @@ src_configure() {
append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
fi
- if use xlsx ; then
- append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
- LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
- fi
+ # if use xlsx ; then
+ # append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
+ # LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
+ # fi
if use lua ; then
append-cflags -DXLUA $(${PKGCONF} --cflags lua)
LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-05-07 5:57 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-05-07 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 3f4cfa11497a75b27897d688935794e3964b4ae9
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Sat May 7 05:56:22 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Sat May 7 05:56:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3f4cfa11
app-office/sc-im: re-add xlsx export support
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2-r1.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
index 8bf7613d1..d95a385a1 100644
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -121,10 +121,10 @@ src_configure() {
append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
fi
- # if use xlsx ; then
- # append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
- # LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
- # fi
+ if use xlsx ; then
+ append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
+ LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
+ fi
if use lua ; then
append-cflags -DXLUA $(${PKGCONF} --cflags lua)
LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-06-27 22:13 Dex Conner
0 siblings, 0 replies; 13+ messages in thread
From: Dex Conner @ 2022-06-27 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 060ba0a45d8a63d7347bdafbcfa601e2a15db271
Author: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Mon Jun 27 22:08:47 2022 +0000
Commit: Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
CommitDate: Mon Jun 27 22:08:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=060ba0a4
app-office/sc-im: unkeyword 0.8.2-r1 for ~x86
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>
app-office/sc-im/sc-im-0.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
index d95a385a1..8f65e8d0f 100644
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
IUSE="X plots wayland xls xlsx lua ods tmux"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/
@ 2022-08-29 23:18 Efe İzbudak
0 siblings, 0 replies; 13+ messages in thread
From: Efe İzbudak @ 2022-08-29 23:18 UTC (permalink / raw
To: gentoo-commits
commit: da21d58bc9469d11036a13a72a638d6d0f1f0b8a
Author: Efe İzbudak <efe.izbudak <AT> metu <DOT> edu <DOT> tr>
AuthorDate: Mon Aug 29 23:14:57 2022 +0000
Commit: Efe İzbudak <efe.izbudak <AT> metu <DOT> edu <DOT> tr>
CommitDate: Mon Aug 29 23:14:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=da21d58b
app-office/sc-im: treeclean
Signed-off-by: Efe İzbudak <efe.izbudak <AT> metu.edu.tr>
app-office/sc-im/Manifest | 1 -
app-office/sc-im/metadata.xml | 17 ----
app-office/sc-im/sc-im-0.8.2-r1.ebuild | 143 ---------------------------------
3 files changed, 161 deletions(-)
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
deleted file mode 100644
index a085c5e62..000000000
--- a/app-office/sc-im/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
deleted file mode 100644
index 9119e904f..000000000
--- a/app-office/sc-im/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>efe.izbudak@metu.edu.tr</email>
- <name>Efe İzbudak</name>
- </maintainer>
- <use>
- <flag name='plots'>Add <pkg>sci-visualization/gnuplot</pkg> for plotting support</flag>
- <flag name='xls'>Add xls support</flag>
- <flag name='xlsx'>Add xlsx support</flag>
- <flag name='ods'>Add ods import support</flag>
- <flag name='X'>Use <pkg>x11-misc/xclip</pkg> for clipboard copy/paste</flag>
- <flag name='tmux'>Use <pkg>app-misc/tmux</pkg> for clipboard copy/paste</flag>
- <flag name='wayland'>Use <pkg>gui-apps/wl-clipboard</pkg> for clipboard copy/paste</flag>
- </use>
-</pkgmetadata>
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
deleted file mode 100644
index 8f65e8d0f..000000000
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit lua-single toolchain-funcs flag-o-matic
-
-DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
-HOMEPAGE="https://github.com/andmarti1424/sc-im"
-SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X plots wayland xls xlsx lua ods tmux"
-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="virtual/pkgconfig"
-S="${WORKDIR}/${P}/src"
-
-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
-
- PKGCONF=$(tc-getPKG_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=65536 \
- -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 $(${PKGCONF} --cflags libxls)
- LDLIBS+=" $(${PKGCONF} --libs libxls)"
- fi
- if use xlsx || use ods ; then
- append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
- LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
- fi
- if use xlsx ; then
- append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
- LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
- fi
- if use lua ; then
- append-cflags -DXLUA $(${PKGCONF} --cflags lua)
- LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"
- fi
- append-cflags $(${PKGCONF} --cflags ncursesw) || append-cflags $(${PKGCONF} --cflags ncurses)
- LDLIBS+=" $(${PKGCONF} --libs ncursesw)" || LDLIBS+=" $(${PKGCONF} --libs ncurses)"
-}
-
-src_compile() {
- emake LDLIBS="${LDLIBS}" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="/usr" install
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-08-29 23:18 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-14 10:38 [gentoo-commits] repo/proj/guru:dev commit in: app-office/sc-im/ Dex Conner
-- strict thread matches above, loose matches on Subject: below --
2022-08-29 23:18 Efe İzbudak
2022-06-27 22:13 Dex Conner
2022-05-07 5:57 Dex Conner
2022-05-04 6:38 Dex Conner
2022-04-26 12:44 Dex Conner
2022-04-24 15:26 Dex Conner
2022-04-24 6:33 Dex Conner
2022-04-18 10:22 Dex Conner
2022-04-16 10:08 Dex Conner
2022-04-15 5:41 Dex Conner
2022-04-14 16:24 Dex Conner
2022-04-13 16:34 Dex Conner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox