[gentoo-commits] repo/gentoo:master commit in: app-text/enchant/files/, app-text/enchant/

[Mart Raudsepp]

commit:     f0f6d899550a825cb044749275f0b70a109611b1
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 19:41:54 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 19:45:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f6d899

app-text/enchant: drop enchant-2 versions not in SLOT=2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-text/enchant/Manifest                          |  5 ---
 app-text/enchant/enchant-2.1.0.ebuild              | 51 ----------------------
 app-text/enchant/enchant-2.1.1.ebuild              | 45 -------------------
 app-text/enchant/enchant-2.1.2.ebuild              | 45 -------------------
 app-text/enchant/enchant-2.2.3.ebuild              | 45 -------------------
 app-text/enchant/enchant-2.2.4.ebuild              | 45 -------------------
 .../files/enchant-2.1.0-hunspell150_fix.patch      | 25 -----------
 7 files changed, 261 deletions(-)

diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index cd7ba07dd2c..2ca1681a21f 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,7 +1,2 @@
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
-DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
-DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
-DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-DIST enchant-2.2.4.tar.gz 953026 BLAKE2B c1745c365c4084d92988105e072b4776e7f565a53748fdda67ab792777ce78276de5f843ae095d7c025f4f08cfa5daa5e3f9c26acf4e98b0978d589c9e9e076b SHA512 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
 DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6

diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
deleted file mode 100644
index 7edc38a439e..00000000000
--- a/app-text/enchant/enchant-2.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-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= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-PATCHES=(
-	# Fix build with hunspell 1.5
-	# https://bugs.gentoo.org/show_bug.cgi?id=600952
-	"${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch
-)
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
deleted file mode 100644
index e6c8d4bc6a3..00000000000
--- a/app-text/enchant/enchant-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-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= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
deleted file mode 100644
index e6c8d4bc6a3..00000000000
--- a/app-text/enchant/enchant-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-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= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.3.ebuild
deleted file mode 100644
index f4146b3a703..00000000000
--- a/app-text/enchant/enchant-2.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-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= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/app-text/enchant/enchant-2.2.4.ebuild b/app-text/enchant/enchant-2.2.4.ebuild
deleted file mode 100644
index f4146b3a703..00000000000
--- a/app-text/enchant/enchant-2.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-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= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
deleted file mode 100644
index 1dac6c11ec5..00000000000
--- a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001
-From: Pacho Ramos <pacho@g.o>
-Date: Sun, 3 Sep 2017 11:05:42 +0200
-Subject: [PATCH] Fix hunspell 1.5 support
-
----
- providers/enchant_hunspell.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp
-index 609f856..0bc360f 100644
---- a/providers/enchant_hunspell.cpp
-+++ b/providers/enchant_hunspell.cpp
-@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang)
- 	if(hunspell == NULL){
- 		return false;
- 	}
--	char *enc = hunspell->get_dic_encoding();
-+	const char *enc = hunspell->get_dic_encoding();
- 
- 	m_translate_in = g_iconv_open(enc, "UTF-8");
- 	m_translate_out = g_iconv_open("UTF-8", enc);
--- 
-2.14.1
-