@@ -, +, @@
---
app-editors/joe/joe-4.2.ebuild | 14 ++++++++++++--
app-editors/joe/joe-4.3-r1.ebuild | 13 +++++++++++--
app-editors/joe/metadata.xml | 1 +
3 files changed, 24 insertions(+), 4 deletions(-)
--- a/app-editors/joe/joe-4.2.ebuild
+++ a/app-editors/joe/joe-4.2.ebuild
@@ -8,18 +8,28 @@ 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"
+LICENSE="GPL-1+ go? ( 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"
+IUSE="+go xterm"
DEPEND=">=sys-libs/ncurses-5.2-r2"
RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
+inherit autotools
+
src_prepare() {
default
+
+ # The Go syntax definition is licensed under more restrictive terms, so allow the user to disable it
+ if ! use go; then
+ sed -i 's~\b\(syntax\/\)\?go\.jsf\b~~g' configure.ac syntax/Makefile.am
+ rm syntax/go.jsf{,.in} || die 'rm go.jsf failed'
+ eautoreconf
+ fi
+
# Enable xterm mouse support in the rc files
if use xterm; then
cd "${S}"/rc
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ a/app-editors/joe/joe-4.3-r1.ebuild
@@ -10,10 +10,10 @@ 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"
+LICENSE="GPL-1+ go? ( 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"
+IUSE="+go xterm"
DEPEND=">=sys-libs/ncurses-5.2-r2:0="
RDEPEND="${DEPEND}
@@ -23,8 +23,17 @@ DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
+inherit autotools
+
src_prepare() {
default
+
+ # The Go syntax definition is licensed under more restrictive terms, so allow the user to disable it
+ if ! use go; then
+ sed -i 's~\b\(syntax\/\)\?go\.jsf\b~~g' configure.ac syntax/Makefile.am
+ rm syntax/go.jsf{,.in} || die 'rm go.jsf failed'
+ fi
+
# Enable xterm mouse support in the rc files
if use xterm; then
pushd "${S}"/rc &>/dev/null || die
--- a/app-editors/joe/metadata.xml
+++ a/app-editors/joe/metadata.xml
@@ -17,6 +17,7 @@
of VI.
--