summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2018-10-20 12:54:20 +0200
committerPacho Ramos <pacho@gentoo.org>2018-10-20 13:38:58 +0200
commita8a2042810aa136c71da1e8a75133bc7936588eb (patch)
tree815d3e8b6a75b1e06de53826018659ef463761a1
parentnet-misc/sitecopy: Update sources and ebuild (diff)
downloadgentoo-a8a2042810aa136c71da1e8a75133bc7936588eb.tar.gz
gentoo-a8a2042810aa136c71da1e8a75133bc7936588eb.tar.bz2
gentoo-a8a2042810aa136c71da1e8a75133bc7936588eb.zip
app-editors/xmlcopyeditor: Don't depend automagically in enchant
Thanks-to: Juergen Rose Thanks-to: Chris Mayo Closes: https://bugs.gentoo.org/629814 Signed-off-by: Pacho Ramos <pacho@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
-rw-r--r--app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch19
-rw-r--r--app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild (renamed from app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild)15
2 files changed, 28 insertions, 6 deletions
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch
new file mode 100644
index 00000000000..435b777b43d
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch
@@ -0,0 +1,19 @@
+--- xmlcopyeditor-1.2.1.3.orig/configure.ac
++++ xmlcopyeditor-1.2.1.3/configure.ac
+@@ -139,13 +139,9 @@
+ AC_CHECK_HEADER(expat.h, ,
+ AC_MSG_ERROR([Expat headers not found]))
+
+-# Check enchant is available
+-PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"],
+- # otherwise Check ASPELL is available
+- [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
+- AC_MSG_ERROR([Aspell headers not found]))]
+-)
+-
++# Check Aspell is available
++AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
++ AC_MSG_ERROR([Aspell headers not found]))
+ AC_SUBST(ASPELL_LIBS)
+
+ # Check gtk
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index f8f58ca6770..d56c500752b 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-
+EAPI=6
WX_GTK_VER="3.0"
inherit autotools wxwidgets
@@ -23,14 +22,18 @@ RDEPEND="
dev-libs/xerces-c[icu]
dev-libs/libpcre
!aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
- aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )"
+ aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )
+"
DEPEND="${RDEPEND}
dev-libs/boost
- dev-util/intltool"
+ dev-util/intltool
+"
-DOCS=( AUTHORS ChangeLog README NEWS )
+PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch )
src_prepare() {
+ default
+
# bug #440744
sed -i -e 's/ -Wall -g -fexceptions//g' configure.ac || die
eautoreconf