5 files changed, 6 insertions, 216 deletions
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 7d04f9ab9720..360da091cb60 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,9 +1,5 @@
 AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31
-DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
-DIST mcabber-1.1.0_bug699972.patch 1385 BLAKE2B f63316f93347b24f27e5f9a5c26de6ae1af199819efbf390915b06ba70c86ec35759c4529c20e3a7c4d8c84081bca008e90ceba8401032ba884d269355940e22 SHA512 d29acca9e710011a8f30dca1c0e281976d409d4072823527078e5f54e98fea4b637c9e52c998bc26a7a4c445d08acd3eea3a244441dac479c398dac0e786535a
 DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106
-EBUILD mcabber-1.1.0-r1.ebuild 2365 BLAKE2B f4849c02ae754dbd863bb71e09dd8c16fa482d853d1a80d2dd31539ad5f2cb366caa0bd2b730c7f3423046241fe64ac908ba9f1fc00cb2021fb3d9f60f264df4 SHA512 154c4cb818bc2f1da7213cb70e6f632c2fcad49cbeb2246322601a7c8d82862d05025f3130b6ebdb86e95a3ec1f1f2422c603cdcf877861a1499bbe2865e6af3
-EBUILD mcabber-1.1.0-r2.ebuild 2580 BLAKE2B f5f8d6ed2091ae3462e91cbb1355e349f6689d883d7078efa3ae15c69efe152cd20bd630cfb55562e09b95659da4173c396cfa3e10487edead86946429d4ef24 SHA512 22db79a6369bdcf6907c192b51a436dde79d41030e2dd4fa75000e80ad809757539639c7e57ddfe55fa4c6108362da7730bff1df407d70b42ba3f4eee863ad4c
-EBUILD mcabber-1.1.2.ebuild 2339 BLAKE2B 9854fe8ee70c79059f5fca115d5fced77ab9719d9f8916950241994e69e4501a7b8035ca115df23c3140c01d08e15358049373522aea5cb75701f7df1f3c49c4 SHA512 b2069a6f873ed5b5df98c917e871d0ac33d1bbc8d9d3eba3d414350f90cc48b36c2abc4f7bd9e6aaff241d94633e7799f89a95ad1f285e68b1c2da6acc67b7fc
-EBUILD mcabber-9999.ebuild 2341 BLAKE2B 98e6851f3ee8dc80ad2e8a45c37867eba3c5577eefc0fbd086ea30f6a1133e1bedb4c70feb7528b894b5490d448b118d192247e65da5d879b98a02f0cfa7cf6a SHA512 01184bea498e4adf608862a3d2f9dd97d15950f6d6154b654cc93e879e4e8effcd15736c33f4ea4cf109c8f776c2ec802ee084dd7e3cc10e3025ebc40084d2eb
+EBUILD mcabber-1.1.2.ebuild 2328 BLAKE2B ac140a7e0aeec7782fd551fb879b06c56ac74d18aa6e29904b4bfcc61f7fe6592bb564a61170ec900d57e051b7e3189296f866186e6e3e80bff864b28ef49b27 SHA512 0f312dfa7996e7f59c5bb2e8e8fdccf2c60217de74237c82192bba58cc333b87b92cdfff421efd8c71d286d0793db32ea427ea25fe0991fe6c9d975babb9d6ae
+EBUILD mcabber-9999.ebuild 2330 BLAKE2B cc46066f8e037e5b34591ab09892db38b5857c2788d58c95be2f39fecf0816f002e0d16fc8900243ede12cb8fa05ccc3a285c1fd1203016ef27c903ae48a029f SHA512 091256c469fc17d782713a96177b7cb4480e5b7b1591c27161afe7ed931a3f5a6446f3bda6033202b907637e22dd4619af0a776c7b278b005ad23454cc94855c
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/mcabber-1.1.0-r1.ebuild b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
deleted file mode 100644
index 304bdd5ce2c6..000000000000
--- a/net-im/mcabber/mcabber-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
-HOMEPAGE="http://mcabber.com/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
-	EHG_CHECKOUT_DIR="${WORKDIR}"
-	EHG_BOOTSTRAP="autogen.sh"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="aspell crypt idn otr spell ssl vim-syntax"
-
-LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when L10N var is set
-for i in ${LANGS}; do
-	IUSE="${IUSE} l10n_${i}"
-done;
-
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	aspell? ( app-text/aspell )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	idn? ( net-dns/libidn:= )
-	spell? ( app-text/enchant:0 )
-	dev-libs/glib:2
-	net-libs/libnsl:0=
-	sys-libs/ncurses:0=
-	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
-
-pkg_setup() {
-	if use aspell && use spell; then
-		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-modules \
-		$(use_enable crypt gpgme) \
-		$(use_enable otr) \
-		$(use_enable aspell) \
-		$(use_enable spell enchant) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	default
-
-	# clean unneeded language documentation
-	for i in ${LANGS}; do
-		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
-	done
-
-	# contrib themes
-	insinto /usr/share/${PN}/themes
-	doins "${S}"/contrib/themes/*
-
-	# contrib generic scripts
-	exeinto /usr/share/${PN}/scripts
-	doexe "${S}"/contrib/*.{pl,py}
-
-	# contrib event scripts
-	exeinto /usr/share/${PN}/scripts/events
-	doexe "${S}"/contrib/events/*
-
-	if use vim-syntax; then
-		cd contrib/vim/ || die
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins mcabber_log-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins mcabber_log-ftdetect.vim
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/mcabber/mcabber-1.1.0-r2.ebuild b/net-im/mcabber/mcabber-1.1.0-r2.ebuild
deleted file mode 100644
index 4cc9ca700fbe..000000000000
--- a/net-im/mcabber/mcabber-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
-HOMEPAGE="http://mcabber.com/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
-	EHG_CHECKOUT_DIR="${WORKDIR}"
-	EHG_BOOTSTRAP="autogen.sh"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}_bug699972.patch"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="aspell crypt idn otr spell ssl vim-syntax"
-
-LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when L10N var is set
-for i in ${LANGS}; do
-	IUSE="${IUSE} l10n_${i}"
-done;
-
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	aspell? ( app-text/aspell )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	idn? ( net-dns/libidn:= )
-	spell? ( app-text/enchant:0 )
-	dev-libs/glib:2
-	net-libs/libnsl:0=
-	sys-libs/ncurses:0=
-	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# only for patching 1.1.0 release, don't port to later ebuilds
-DEPEND+=" sys-devel/automake:1.14"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
-
-PATCHES=(
-	"${DISTDIR}/${P}_bug699972.patch"
-)
-
-pkg_setup() {
-	if use aspell && use spell; then
-		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-modules \
-		$(use_enable crypt gpgme) \
-		$(use_enable otr) \
-		$(use_enable aspell) \
-		$(use_enable spell enchant) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	default
-
-	# clean unneeded language documentation
-	for i in ${LANGS}; do
-		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
-	done
-
-	# contrib themes
-	insinto /usr/share/${PN}/themes
-	doins "${S}"/contrib/themes/*
-
-	# contrib generic scripts
-	exeinto /usr/share/${PN}/scripts
-	doexe "${S}"/contrib/*.{pl,py}
-
-	# contrib event scripts
-	exeinto /usr/share/${PN}/scripts/events
-	doexe "${S}"/contrib/events/*
-
-	if use vim-syntax; then
-		cd contrib/vim/ || die
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins mcabber_log-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins mcabber_log-ftdetect.vim
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/mcabber/mcabber-1.1.2.ebuild b/net-im/mcabber/mcabber-1.1.2.ebuild
index ef916f750572..616c5e554f8a 100644
--- a/net-im/mcabber/mcabber-1.1.2.ebuild
+++ b/net-im/mcabber/mcabber-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 0b84efe65300..9e0a12b1fef1 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"