[gentoo-commits] proj/musl:master commit in: app-text/enchant/

[gentoo-commits] proj/musl:master commit in: app-text/enchant/

[Anthony G. Basile]

commit:     1323232905e6a5ec92b6994500ac5106712c78e3
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jun 17 08:41:54 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:37:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=13232329

app-text/enchant: sync with tree

 app-text/enchant/enchant-1.6.1.ebuild                   | 17 +++++++----------
 app-text/enchant/metadata.xml                           |  1 -
 .../enchant/musl-compile-fix-add-cc-tag-libtool.patch   | 15 ---------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index bb4dfc7..c6a0f7d 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,19 +13,16 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
 
-IUSE="aspell +hunspell static-libs test zemberek"
-REQUIRED_USE="|| ( hunspell aspell zemberek )"
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
 
 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
 COMMON_DEPENDS="
 	>=dev-libs/glib-2.6:2
 	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )
-	zemberek? ( dev-libs/dbus-glib )
-"
-RDEPEND="${COMMON_DEPENDS}
-	zemberek? ( app-text/zemberek-server )
-"
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+RDEPEND="${COMMON_DEPENDS}"
+
 DEPEND="${COMMON_DEPENDS}
 	virtual/pkgconfig
 "
@@ -48,7 +45,6 @@ src_configure() {
 		$(use_enable aspell) \
 		$(use_enable hunspell myspell) \
 		$(use_enable static-libs static) \
-		$(use_enable zemberek) \
 		--disable-hspell \
 		--disable-ispell \
 		--disable-uspell \
@@ -60,3 +56,4 @@ src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+

diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 8a391be..2b8b7cf 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
 		<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
-		<flag name="zemberek">Adds support for <pkg>app-text/zemberek-server</pkg> spell checker server</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch b/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch
deleted file mode 100644
index e13a769..0000000
--- a/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure b/configure.new
-old mode 100755
-new mode 100755
-index 7d641bf..307d433
---- a/configure
-+++ b/configure
-@@ -11038,7 +11038,7 @@ esac
- LIBTOOL_DEPS=$ltmain
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CC'
- 
- 
-