From d3d7b6a3dfb8b5da150f290ce1e5b418e166aec5 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 5 Sep 2016 16:31:40 +0200 Subject: app-editors/joe: Revbump to fix linking against sys-libs/ncurses[tinfo] Also get rid of remaining QA issues as pointed out by Soap__ again. This hopefully fixes bug #579172 as well. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler --- app-editors/joe/files/joe-4.3-tinfo.patch | 30 ++++++++++++++++++++ app-editors/joe/joe-4.3-r1.ebuild | 46 +++++++++++++++++++++++++++++++ app-editors/joe/joe-4.3.ebuild | 39 -------------------------- 3 files changed, 76 insertions(+), 39 deletions(-) create mode 100644 app-editors/joe/files/joe-4.3-tinfo.patch create mode 100644 app-editors/joe/joe-4.3-r1.ebuild delete mode 100644 app-editors/joe/joe-4.3.ebuild (limited to 'app-editors/joe') diff --git a/app-editors/joe/files/joe-4.3-tinfo.patch b/app-editors/joe/files/joe-4.3-tinfo.patch new file mode 100644 index 000000000000..fd259e183fd0 --- /dev/null +++ b/app-editors/joe/files/joe-4.3-tinfo.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Lars Wendler +# Date 1473084371 -7200 +# Mon Sep 05 16:06:11 2016 +0200 +# Node ID ae8afbceeed4e446a63ad3111291a98d1390ade2 +# Parent 57c0a14aedcb8eef82d5828721b55aac02847ee7 +configure.ac: search for ncurses' tinfo library if available + +ncurses can be built to split out the lowlevel terminfo library +from ncurses library. In this case there's a libtinfo.so file +alongside the usual libncurses*.so files. +This patch adds tinfo to AC_SEARCH_LIBS when ncurses support +is enabled. Without this patch configure silently fails to find +tgetflag and thus does not link to ncurses at all. +I've tested this change on both, ncurses with separate tinfo lib +and ncurses without separate tinfo lib and in both cases joe +successfully links against ncurses. + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -39,7 +39,7 @@ + curses=$enableval, curses=yes) + + if test "$curses" = "yes"; then +- search_libs="ncurses curses" ++ search_libs="tinfo ncurses curses" + fi + + AC_ARG_ENABLE(termcap, diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild new file mode 100644 index 000000000000..446ac94c11d8 --- /dev/null +++ b/app-editors/joe/joe-4.3-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" +HOMEPAGE="https://sourceforge.net/projects/joe-editor/" +SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" + +LICENSE="GPL-1+ CC-BY-3.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +IUSE="xterm" + +DEPEND=">=sys-libs/ncurses-5.2-r2:0=" +RDEPEND="${DEPEND} + xterm? ( >=x11-terms/xterm-239 )" + +DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) + +PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" ) + +src_prepare() { + default + # Enable xterm mouse support in the rc files + if use xterm; then + cd "${S}"/rc || die + local i + for i in *rc*.in; do + sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die + done + fi + eautoreconf +} + +pkg_postinst() { + if use xterm; then + elog "To enable full xterm clipboard you need to set the allowWindowOps" + elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" + elog "This is false by default due to potential security problems on some" + elog "architectures (see bug #91453)." + fi +} diff --git a/app-editors/joe/joe-4.3.ebuild b/app-editors/joe/joe-4.3.ebuild deleted file mode 100644 index c1aed9e73d33..000000000000 --- a/app-editors/joe/joe-4.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" -HOMEPAGE="https://sourceforge.net/projects/joe-editor/" -SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" - -LICENSE="GPL-1+ CC-BY-3.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="xterm" - -DEPEND=">=sys-libs/ncurses-5.2-r2:0=" -RDEPEND="xterm? ( >=x11-terms/xterm-239 )" - -DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) - -src_prepare() { - default - # Enable xterm mouse support in the rc files - if use xterm; then - cd "${S}"/rc || die - for i in *rc*.in; do - sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die - done - fi -} - -pkg_postinst() { - if use xterm; then - elog "To enable full xterm clipboard you need to set the allowWindowOps" - elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" - elog "This is false by default due to potential security problems on some" - elog "architectures (see bug #91453)." - fi -} -- cgit v1.2.3-65-gdbad