* [gentoo-commits] repo/gentoo:master commit in: sys-libs/slang/files/, sys-libs/slang/
@ 2016-10-31 20:31 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-10-31 20:31 UTC (permalink / raw
To: gentoo-commits
commit: bc1309ae7befbb07bbab0f40dc8e3e8d15342d8c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 20:20:12 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 20:31:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1309ae
sys-libs/slang: Bump to version 2.3.1
Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-libs/slang/Manifest | 1 +
sys-libs/slang/files/slang-2.3.1-slsh-libs.patch | 11 ++++
sys-libs/slang/slang-2.3.1.ebuild | 78 ++++++++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index ab09b3d..a4b3bed 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,2 +1,3 @@
DIST slang-2.2.4.tar.bz2 1427363 SHA256 9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db SHA512 aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f WHIRLPOOL 5a0c81ef103116733df952fec8593f476bd57c9b2799ee566b0bf93dfd465709ef5f565a369d89a92bfd13cfc7577a047c46116bcac2f0b3176e50556c7484e1
DIST slang-2.3.0.tar.bz2 1532986 SHA256 f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050 WHIRLPOOL 395dc36d2f571ed19d88ee1f1c3594ab50d3a955949724d46582191430aa0c23cf3f78f966b184f3220ab86f2939e4601821160455159783793df30597c53257
+DIST slang-2.3.1.tar.bz2 1577864 SHA256 a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d SHA512 9d485c6f758fbeada82c2ed6c48ecf6e101a3875a1d63ef1b6f5d9ccb1844645f23b9bddf3ba0e5c9f807f2e8394415c14788f00cfcd5a4d6fa153387be6648b WHIRLPOOL 3b6b5eb3ab89b98e1522483b84f284479561218a6f75efbd67a6435afd1f73a912ef1b093b2d656d10e9d060cf3658dbc11e32a6ce31b324d8c2208d7b78512b
diff --git a/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
new file mode 100644
index 00000000..b31d8a1
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
@@ -0,0 +1,11 @@
+--- slang-2.3.1/slsh/Makefile.in
++++ slang-2.3.1/slsh/Makefile.in
+@@ -92,7 +92,7 @@
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
++ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+ cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.3.1.ebuild b/sys-libs/slang/slang-2.3.1.ebuild
new file mode 100644
index 00000000..26598fe
--- /dev/null
+++ b/sys-libs/slang/slang-2.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib-minimal
+
+DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
+HOMEPAGE="http://www.jedsoft.org/slang/"
+SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="cjk pcre png readline static-libs zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="sys-libs/ncurses:0=
+ pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+ cjk? ( >=dev-libs/oniguruma-5.9.5[${MULTILIB_USEDEP}] )
+ readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
+ )"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.1-slsh-libs.patch
+)
+
+src_prepare() {
+ default
+
+ # avoid linking to -ltermcap race with some systems
+ sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+ # we use the GNU linker also on Solaris
+ sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
+ -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+ # slang does not support configuration from another dir
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=slang
+ use readline && myconf=gnu
+
+ econf \
+ --with-readline=${myconf} \
+ $(use_with pcre) \
+ $(use_with cjk onig) \
+ $(use_with png) \
+ $(use_with zlib z)
+}
+
+multilib_src_compile() {
+ emake elf $(use static-libs && echo static)
+
+ pushd slsh >/dev/null
+ emake slsh
+ popd
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install $(use static-libs && echo install-static)
+}
+
+multilib_src_install_all() {
+ rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
+ dodoc NEWS README *.txt doc/{,internal,text}/*.txt
+ docinto html
+ dodoc doc/slangdoc.html slsh/doc/html/*.html
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/slang/files/, sys-libs/slang/
@ 2022-08-12 18:16 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-08-12 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 6b958c3066d63c0aff06188e299454b7c3910390
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 17:52:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 18:16:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b958c30
sys-libs/slang: add 2.3.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/slang/Manifest | 1 +
sys-libs/slang/files/slang-2.3.3-slsh-libs.patch | 21 ++++++
sys-libs/slang/slang-2.3.3.ebuild | 83 ++++++++++++++++++++++++
3 files changed, 105 insertions(+)
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 026bb6d4230c..d258c25d37ec 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1 +1,2 @@
DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
+DIST slang-2.3.3.tar.bz2 1646311 BLAKE2B 2f304b25e807fe38b544479f4a6e98723816d08cda576177a270df736d7db8992a478f980333afc10a7bc0b5dc5508e49b33a13de02f0466f065efdfa3b7b351 SHA512 f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490
diff --git a/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch
new file mode 100644
index 000000000000..15062ee7d420
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch
@@ -0,0 +1,21 @@
+Fix build issue:
+```
+make -j32 -j1 -C slsh slsh
+make: Entering directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh'
+x86_64-pc-linux-gnu-gcc -m32 amd64objs/slsh.o amd64objs/readline.o -o amd64objs/slsh -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -Wl,-export-dynamic -L/usr/lib -Wl,-R/usr/lib -L/usr/lib -lslang -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -lreadline -ldl -lm
+/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/../../../../x86_64-pc-linux-gnu/bin/ld.bfd: cannot find -lslang: No such file or directory
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:95: amd64objs/slsh] Error 1
+make: Leaving directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh'
+```
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -92,7 +92,7 @@ slsh: $(OBJDIR)/slsh
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+- $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
++ $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+ cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.3.3.ebuild b/sys-libs/slang/slang-2.3.3.ebuild
new file mode 100644
index 000000000000..8332aeb6fc27
--- /dev/null
+++ b/sys-libs/slang/slang-2.3.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
+HOMEPAGE="https://www.jedsoft.org/slang/"
+
+if [[ ${PV} == *_pre* ]] ; then
+ MY_P="${PN}-pre${PV/_pre/-}"
+ SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz"
+ S="${WORKDIR}/${MY_P}"
+else
+ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
+ https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cjk pcre png readline static-libs zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="
+ sys-libs/ncurses:=
+ cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
+ pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:=[${MULTILIB_USEDEP}] )
+ readline? ( >=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.3-slsh-libs.patch
+)
+
+src_prepare() {
+ default
+
+ # Avoid linking to -ltermcap race with some systems
+ sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+ # We use the GNU linker also on Solaris
+ sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
+ -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+ # slang does not support configuration from another dir
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-readline=$(usex readline gnu slang)
+ $(use_with pcre)
+ $(use_with cjk onig)
+ $(use_with png)
+ $(use_with zlib z)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake elf $(usex static-libs static '')
+ emake -C slsh slsh
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install $(usex static-libs install-static '')
+}
+
+multilib_src_install_all() {
+ rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
+
+ local -a DOCS=( NEWS README *.txt doc/{,internal,text}/*.txt )
+ local -a HTML_DOCS=( doc/slangdoc.html slsh/doc/html/*.html )
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/slang/files/, sys-libs/slang/
@ 2024-02-21 7:10 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-02-21 7:10 UTC (permalink / raw
To: gentoo-commits
commit: e2b4a39461adb558b3dbe8bdcadde871a07c0c64
Author: Michal Rostecki <vadorovsky <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 1 07:10:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 07:07:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b4a394
sys-libs/slang: Fix the build with LLD 17
LLD 17 rightfully complains about the undefined symbol being present
in the version script, which is also not used anywhere.
Closes: https://bugs.gentoo.org/915818
Signed-off-by: Michal Rostecki <vadorovsky <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35129
Signed-off-by: Sam James <sam <AT> gentoo.org>
...move-undefined-symbol-from-version-script.patch | 30 ++++++++++++++++++++++
sys-libs/slang/slang-2.3.3.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/sys-libs/slang/files/slang-2.3.3-remove-undefined-symbol-from-version-script.patch b/sys-libs/slang/files/slang-2.3.3-remove-undefined-symbol-from-version-script.patch
new file mode 100644
index 000000000000..d3085797d1f8
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.3.3-remove-undefined-symbol-from-version-script.patch
@@ -0,0 +1,30 @@
+From f0d959a496cf47482904c62c91312aba5153f423 Mon Sep 17 00:00:00 2001
+From: Michal Rostecki <vadorovsky@gmail.com>
+Date: Thu, 1 Feb 2024 08:02:44 +0100
+Subject: [PATCH] Remove the undefined SLang_Rline_Quit symbol from the version
+ script
+
+This symbol is not defined and not used anywhere, it was present only
+in the version file, which triggered the following error when linking
+with LLD 17:
+
+ ld.lld: error: version script assignment of 'SLANG2' to symbol 'SLang_Rline_Quit' failed: symbol not defined
+---
+ src/slang.ver | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/slang.ver b/src/slang.ver
+index aa030c9..4b01f9f 100644
+--- a/src/slang.ver
++++ b/src/slang.ver
+@@ -70,7 +70,6 @@ SLANG2 {
+ SLang_Last_Key_Char;
+ SLang_Load_File_Hook;
+ SLang_Num_Function_Args;
+- SLang_Rline_Quit;
+ SLang_TT_Baud_Rate;
+ SLang_TT_Read_FD;
+ SLang_TT_Write_FD;
+--
+2.43.0
+
diff --git a/sys-libs/slang/slang-2.3.3.ebuild b/sys-libs/slang/slang-2.3.3.ebuild
index 2cf06ca437c9..1cf13c918011 100644
--- a/sys-libs/slang/slang-2.3.3.ebuild
+++ b/sys-libs/slang/slang-2.3.3.ebuild
@@ -37,6 +37,7 @@ MAKEOPTS+=" -j1"
PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-slsh-libs.patch
+ "${FILESDIR}"/${PN}-2.3.3-remove-undefined-symbol-from-version-script.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/slang/files/, sys-libs/slang/
@ 2024-06-09 18:54 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2024-06-09 18:54 UTC (permalink / raw
To: gentoo-commits
commit: fd0f743a4dad567468b1c4da75434640808e048a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 18:47:53 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 18:54:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0f743a
sys-libs/slang: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-libs/slang/Manifest | 1 -
sys-libs/slang/files/slang-2.3.1-slsh-libs.patch | 11 ----
sys-libs/slang/slang-2.3.2.ebuild | 78 ----------------------
sys-libs/slang/slang-2.3.3.ebuild | 84 ------------------------
4 files changed, 174 deletions(-)
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index d258c25d37ec..602539baa6f0 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,2 +1 @@
-DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
DIST slang-2.3.3.tar.bz2 1646311 BLAKE2B 2f304b25e807fe38b544479f4a6e98723816d08cda576177a270df736d7db8992a478f980333afc10a7bc0b5dc5508e49b33a13de02f0466f065efdfa3b7b351 SHA512 f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490
diff --git a/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
deleted file mode 100644
index b31d8a1c45dd..000000000000
--- a/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- slang-2.3.1/slsh/Makefile.in
-+++ slang-2.3.1/slsh/Makefile.in
-@@ -92,7 +92,7 @@
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
-- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
-+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
- cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
deleted file mode 100644
index 4dbae877427b..000000000000
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
-HOMEPAGE="http://www.jedsoft.org/slang/"
-if [[ "${PV}" = *_pre* ]] ; then
- MY_P="${PN}-pre${PV/_pre/-}"
- SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_P}"
-else
- SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
- http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cjk pcre png readline static-libs zlib"
-
-# ncurses for ncurses5-config to get terminfo directory
-RDEPEND="
- sys-libs/ncurses:0=
- cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
- pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MAKEOPTS+=" -j1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.1-slsh-libs.patch
-)
-
-src_prepare() {
- default
-
- # avoid linking to -ltermcap race with some systems
- sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
- # we use the GNU linker also on Solaris
- sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
- -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
-
- # slang does not support configuration from another dir
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --with-readline=$(usex readline gnu slang)
- $(use_with pcre)
- $(use_with cjk onig)
- $(use_with png)
- $(use_with zlib z)
- )
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake elf $(usex static-libs static '')
- emake -C slsh slsh
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install $(usex static-libs install-static '')
-}
-
-multilib_src_install_all() {
- rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
- local -a DOCS=( NEWS README *.txt doc/{,internal,text}/*.txt )
- local -a HTML_DOCS=( doc/slangdoc.html slsh/doc/html/*.html )
- einstalldocs
-}
diff --git a/sys-libs/slang/slang-2.3.3.ebuild b/sys-libs/slang/slang-2.3.3.ebuild
deleted file mode 100644
index 1cf13c918011..000000000000
--- a/sys-libs/slang/slang-2.3.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
-HOMEPAGE="https://www.jedsoft.org/slang/"
-
-if [[ ${PV} == *_pre* ]] ; then
- MY_P="${PN}-pre${PV/_pre/-}"
- SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_P}"
-else
- SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
- https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cjk pcre png readline static-libs zlib"
-
-# ncurses for ncurses5-config to get terminfo directory
-RDEPEND="
- sys-libs/ncurses:=
- cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
- pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:=[${MULTILIB_USEDEP}] )
- readline? ( >=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MAKEOPTS+=" -j1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.3-slsh-libs.patch
- "${FILESDIR}"/${PN}-2.3.3-remove-undefined-symbol-from-version-script.patch
-)
-
-src_prepare() {
- default
-
- # Avoid linking to -ltermcap race with some systems
- sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
- # We use the GNU linker also on Solaris
- sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
- -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
-
- # slang does not support configuration from another dir
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --with-readline=$(usex readline gnu slang)
- $(use_with pcre)
- $(use_with cjk onig)
- $(use_with png)
- $(use_with zlib z)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake elf $(usex static-libs static '')
- emake -C slsh slsh
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install $(usex static-libs install-static '')
-}
-
-multilib_src_install_all() {
- rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
-
- local -a DOCS=( NEWS README *.txt doc/{,internal,text}/*.txt )
- local -a HTML_DOCS=( doc/slangdoc.html slsh/doc/html/*.html )
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-09 18:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-09 18:54 [gentoo-commits] repo/gentoo:master commit in: sys-libs/slang/files/, sys-libs/slang/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2024-02-21 7:10 Sam James
2022-08-12 18:16 Sam James
2016-10-31 20:31 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox