commit: 8c02bac95717d67ba193b228a0c8202df9d949a3 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Mar 19 17:13:58 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Mar 19 17:13:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c02bac9
dev-libs/libtecla: clean up ebuild Closes: https://bugs.gentoo.org/891767 Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-libs/libtecla/files/libtecla-1.6.1-install.patch | 5 ++--- dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch | 5 ++--- dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch | 2 -- dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch | 8 ++++---- dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch | 4 ++-- dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch | 4 ++-- dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch | 4 ++-- dev-libs/libtecla/libtecla-1.6.3-r1.ebuild | 10 ++-------- 8 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-install.patch b/dev-libs/libtecla/files/libtecla-1.6.1-install.patch index 999d46c58185..769b98c6abb5 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.1-install.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.1-install.patch @@ -1,6 +1,5 @@ -diff -Naur libtecla/Makefile.in libtecla.new/Makefile.in ---- libtecla/Makefile.in 2004-10-31 15:30:57.000000000 -0500 -+++ libtecla.new/Makefile.in 2008-06-03 08:59:27.000000000 -0400 +--- a/Makefile.in ++++ b/Makefile.in @@ -15,10 +15,10 @@ prefix=@prefix@ diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch b/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch index 1935c3894f76..7c6461bb5060 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch @@ -1,8 +1,7 @@ # prevent build system from stripping files (bug #239877). -diff -Naur libtecla/Makefile.in libtecla.new/Makefile.in ---- libtecla/Makefile.in 2004-10-31 15:30:57.000000000 -0500 -+++ libtecla.new/Makefile.in 2008-10-07 06:17:22.000000000 -0400 +--- a/Makefile.in ++++ b/Makefile.in @@ -260,7 +260,7 @@ install_bin: $(BINDIR) $(PROGRAMS) $(PROGRAMS_R) progs="$(PROGRAMS) $(PROGRAMS_R)"; \ diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch index 1815f8571566..467cde20c2de 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch @@ -1,8 +1,6 @@ Makefile.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index a44371a..dfd44b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -217,7 +217,7 @@ install_inc: $(INCDIR) diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch index 68c9e947b987..67dcb3e71daa 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch @@ -1,5 +1,5 @@ ---- libtecla/Makefile.rules.orig 2014-11-10 00:36:53.000000000 +0300 -+++ libtecla/Makefile.rules 2016-04-13 10:37:36.234418914 +0300 +--- a/Makefile.rules ++++ b/Makefile.rules @@ -54,19 +54,19 @@ demos: $(DEMO_PROGS) @@ -24,8 +24,8 @@ $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS) #----------------------------------------------------------------------- ---- libtecla/configure.in.orig 2014-11-10 01:15:29.000000000 +0300 -+++ libtecla/configure.in 2016-04-13 10:32:25.916263565 +0300 +--- a/configure.in ++++ b/configure.in @@ -490,7 +490,7 @@ VERSION_OPT='' fi diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch index 89f30a6ea31a..41e7b628b359 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch @@ -1,5 +1,5 @@ ---- libtecla/Makefile.rules.orig 2016-04-13 11:13:10.000000000 +0300 -+++ libtecla/Makefile.rules 2016-04-13 11:17:45.628234106 +0300 +--- a/Makefile.rules ++++ b/Makefile.rules @@ -165,5 +165,5 @@ # Include file dependencies. #----------------------------------------------------------------------- diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch index b62104ae1d35..01552220e24a 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch @@ -1,5 +1,5 @@ ---- libtecla/Makefile.rules.orig 2014-11-10 00:36:53.000000000 +0300 -+++ libtecla/Makefile.rules 2016-04-13 10:37:36.234418914 +0300 +--- a/Makefile.rules ++++ b/Makefile.rules @@ -54,19 +54,19 @@ demos: $(DEMO_PROGS) diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch index b88940e49b8b..0d7c14b6c172 100644 --- a/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch +++ b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch @@ -1,5 +1,5 @@ ---- libtecla/configure.in.orig 2016-04-13 11:12:15.000000000 +0300 -+++ libtecla/configure.in 2016-04-13 11:43:05.632287268 +0300 +--- a/configure.in ++++ b/configure.in @@ -426,6 +426,9 @@ AC_ARG_WITH(file-system, AC_HELP_STRING([--with-file-system], [Does the target have a filesystem (default=yes)]), AC_DEFINE(WITHOUT_FILE_SYSTEM), ) diff --git a/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild b/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild index 4487a6f6dfe6..d0214a052aab 100644 --- a/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild +++ b/dev-libs/libtecla/libtecla-1.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,12 +8,11 @@ inherit autotools flag-o-matic DESCRIPTION="Tecla command-line editing library" HOMEPAGE="https://www.astro.caltech.edu/~mcs/tecla/"; SRC_URI="https://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"; -S="${WORKDIR}"/libtecla +S="${WORKDIR}/libtecla" LICENSE="icu" SLOT="0" KEYWORDS="amd64 ~arm ppc ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" DEPEND="sys-libs/ncurses:=" RDEPEND="${DEPEND}" @@ -31,14 +30,9 @@ PATCHES=( src_prepare() { default - mv configure.in configure.ac || die eautoreconf } -src_configure() { - econf $(use_enable static-libs) -} - src_compile() { emake \ OPT="" \
