[gentoo-commits] repo/gentoo:master commit in: app-text/expander/, app-text/expander/files/
commit: 7184d0d1b3e808e77232f9334120fc68e010e5d2
Author: Sam James gentoo org>
AuthorDate: Sun Sep 18 01:34:19 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 18 01:34:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7184d0d1
app-text/expander: EAPI 8, fix implicit func. declarations
Closes: https://bugs.gentoo.org/870898
Signed-off-by: Sam James gentoo.org>
...der-2.0.5-r2.ebuild => expander-2.05-r3.ebuild} | 16 +++---
.../expander/files/expander-2.05-clang15.patch | 60 ++
...0.5-gentoo.patch => expander-2.05-gentoo.patch} | 0
3 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild
b/app-text/expander/expander-2.05-r3.ebuild
similarity index 69%
rename from app-text/expander/expander-2.0.5-r2.ebuild
rename to app-text/expander/expander-2.05-r3.ebuild
index 6684a72038d5..ee8a110a01e6 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -1,21 +1,23 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="Expander is a utility that acts as a filter for text editors"
HOMEPAGE="http://www.nedit.org;
-SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz;
+SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz;
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang15.patch
+)
src_compile() {
emake -C src CC="$(tc-getCC)"
@@ -35,7 +37,7 @@ src_install() {
pkg_postinst() {
elog
- elog "Instructions for using expander with NEdit are in
/usr/share/doc/${PF}/INSTALL"
- elog "Macro, definition and template files can be found in
/usr/share/${P}"
+ elog "Instructions for using expander with NEdit are in
${EROOT}/usr/share/doc/${PF}/INSTALL"
+ elog "Macro, definition and template files can be found in
${EROOT}/usr/share/${P}"
elog
}
diff --git a/app-text/expander/files/expander-2.05-clang15.patch
b/app-text/expander/files/expander-2.05-clang15.patch
new file mode 100644
index ..a7ae9bed3ddf
--- /dev/null
+++ b/app-text/expander/files/expander-2.05-clang15.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/870898
+--- a/src/align_columns.c
b/src/align_columns.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+
+
/**/
+ /* SYMBOL DEFINITIONS
*/
+--- a/src/align_comments.c
b/src/align_comments.c
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+
+
/*===*/
+ /* SYMBOL DEFINITIONS
*/
+--- a/src/boxcomment.c
b/src/boxcomment.c
+@@ -59,6 +59,7 @@
+ #include
+ #include
+ #include
++#include
+
+
/**/
+ /* SYMBOL DEFINITIONS
*/
+--- a/src/expander.c
b/src/expander.c
+@@ -114,6 +114,7 @@
+ #include
+ #include
+ #include
++#include
+
+ /*==*/
+ /* MACRO DEFINITIONS */
+@@ -1264,7 +1265,7 @@ bool_t locate_definition(
+ bool_t ignore_definition = FALSE;
+ inti;
+ char line[ MAXBUF ];
+-static level = 0;
++static int level = 0;
+
+ /*-
+ * Recursion protection.
+--- a/src/where_is.c
b/src/where_is.c
+@@ -54,6 +54,7 @@
+ #include
+ #include
+ #include
++#include
+
+ typedef int bool_t;
+
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch
b/app-text/expander/files/expander-2.05-gentoo.patch
similarity index 100%
rename from app-text/expander/files/expander-2.0.5-gentoo.patch
rename to app-text/expander/files/expander-2.05-gentoo.patch
[gentoo-commits] repo/gentoo:master commit in: app-text/expander/
commit: 6f487c47cee7f2d24398a3f0d125edb994b26e80
Author: David Seifert gentoo org>
AuthorDate: Sat Mar 19 23:16:58 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sat Mar 19 23:16:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f487c47
app-text/expander: quote $(tc-*) calls
Signed-off-by: David Seifert gentoo.org>
app-text/expander/expander-2.0.5-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild
b/app-text/expander/expander-2.0.5-r2.ebuild
index c1ddd2ee423e..6684a72038d5 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
- emake -C src CC=$(tc-getCC)
+ emake -C src CC="$(tc-getCC)"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-text/expander/
commit: fc7e885bf5412e5fd096290b92dd7006a4b36521
Author: David Seifert gentoo org>
AuthorDate: Tue Jan 21 21:50:50 2020 +
Commit: David Seifert gentoo org>
CommitDate: Tue Jan 21 21:50:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7e885b
app-text/expander: Port to EAPI 7
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
app-text/expander/expander-2.0.5-r2.ebuild | 32 ++
1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild
b/app-text/expander/expander-2.0.5-r2.ebuild
index 1c4a5c12ffb..c1ddd2ee423 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Expander is a utility that acts as a filter for text editors"
HOMEPAGE="http://www.nedit.org;
@@ -12,35 +12,25 @@
SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
emake -C src CC=$(tc-getCC)
}
src_install() {
- cd src
- dobin expander boxcomment align_columns align_comments where_is
+ dobin src/{expander,boxcomment,align_columns,align_comments,where_is}
dosym boxcomment /usr/bin/unboxcomment
- insinto /usr/share/${P}
- doins "${S}"/service
- for x in defs macros misc templates ; do
- insinto /usr/share/${P}/${x}
- doins "${S}"/${x}/*
- done
-
- cd "${S}"/docs
- doman *.1
+ einstalldocs
+ dodoc USAGE
+ doman docs/*.1
- cd "${S}"
- dodoc ChangeLog INSTALL README USAGE
+ insinto /usr/share/${P}
+ doins -r service defs macros misc templates
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: app-text/expander/
commit: 46869219130a65b026804e49e69b14dda6e84c03
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Apr 17 20:45:16 2017 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Apr 17 20:46:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46869219
app-text/expander: [QA] Create relative rather than absolute symlinks.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../expander/{expander-2.0.5-r1.ebuild => expander-2.0.5-r2.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-text/expander/expander-2.0.5-r1.ebuild
b/app-text/expander/expander-2.0.5-r2.ebuild
similarity index 91%
rename from app-text/expander/expander-2.0.5-r1.ebuild
rename to app-text/expander/expander-2.0.5-r2.ebuild
index 6f6904bc6d2..1c4a5c12ffb 100644
--- a/app-text/expander/expander-2.0.5-r1.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -27,7 +27,7 @@ src_compile() {
src_install() {
cd src
dobin expander boxcomment align_columns align_comments where_is
- dosym /usr/bin/boxcomment /usr/bin/unboxcomment
+ dosym boxcomment /usr/bin/unboxcomment
insinto /usr/share/${P}
doins "${S}"/service
