gentoo resync : 30.09.2018

4 files changed, 140 insertions, 38 deletions

diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 059587637caa..f292ce8ed710 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,6 +1,8 @@
+AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31
 DIST mcabber-1.0.5.tar.bz2 605483 BLAKE2B 557ec5f4db6d2dab41fdb3110a165867d354f98f11c3d4ded34abe6b8fed5a895dd0e948bad94ca1694f61f398535f4d7701ddfd9d77a79c89cc9e0b54f587d0 SHA512 81b67899245902f495af7b44a5a0d710db69da731a00fb9ed84bdc0f88d5dc662f340817b1eaa843802c95105846234743eba52117f18bf12dd37a0da61d414d
 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
 EBUILD mcabber-1.0.5.ebuild 3283 BLAKE2B f74e6bf2aee41fb4756cdb4b12890adf3552e4447ff9df4f555ccfffdb85833c8e0fc57a55fa9db55ce6037efef16e7d98b52c00ddfa937e842b0112faf2eee7 SHA512 2db587bce1cf262276b7e109e6594ba7bf102594c95dde94fc36a9a140410b6eb71771bef913e98c7d245cf31dc328021f02ea8d01e3c51ffc15a3198f5473ea
+EBUILD mcabber-1.1.0-r1.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29
 EBUILD mcabber-1.1.0.ebuild 3285 BLAKE2B 07a9712f85075fe021f6585b07674f2b71e8b7eb5a10965c7f979ad5138b0093685e4b2115ee25590cc5e4fd584d78b05ae9dc6c648457885eeed407b9aa94ff SHA512 9b7791a3de2553605c91ba30e04f57580cc88d19b2fd20ce6d2486fd85cc96ff3993c12ceb015af1615273f4d1cd8795a1ca16bb7f24268e4ddf7bb54dfba5b8
-EBUILD mcabber-9999.ebuild 3138 BLAKE2B 513c61fd6f6eb5b9187d90985541dde50f6be5d15b708430bb7a36e4474a37f6568169074d25575a326b6375da07c2ab05744691aaa2288683c4263a9e4f9544 SHA512 888e91b54c4344e9c38096eec5c5aeb0de924c5d5a883d79427dc9cf5fd628310a4d8fdf712342572bd2ac89411825f793c26513bf4784a8b1cacc53dfea91e0
+EBUILD mcabber-9999.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/files/README.gentoo b/net-im/mcabber/files/README.gentoo
new file mode 100644
index 000000000000..dc394e6e5a4a
--- /dev/null
+++ b/net-im/mcabber/files/README.gentoo
@@ -0,0 +1,17 @@
+MCabber requires you to create a subdirectory .mcabber in your home
+directory and to place a configuration file there.
+An example mcabberrc was installed as part of the documentation.
+To create a new mcabberrc based on the example mcabberrc, execute the
+following commands:
+
+  mkdir -p ~/.mcabber
+  bzcat /usr/share/doc/mcabber*/mcabberrc.example.bz2 > ~/.mcabber/mcabberrc
+
+Then edit ~/.mcabber/mcabberrc with your favorite editor.
+
+See the CONFIGURATION FILE and FILES sections of the mcabber
+manual page (section 1) for more information.
+
+MCabber supports PGP encryption of messages. See README_PGP.txt for details.
+
+Check out /usr/share/mcabber/ for contributed themes and event scripts.
diff --git a/net-im/mcabber/mcabber-1.1.0-r1.ebuild b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..2f8476b1c214
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 )
+	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-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index ed7b028ed100..2f8476b1c214 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,22 +1,28 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit flag-o-matic autotools-utils mercurial
+inherit flag-o-matic readme.gentoo-r1
 
 DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
 HOMEPAGE="http://mcabber.com/"
-EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
-EHG_CHECKOUT_DIR="${WORKDIR}"
-EHG_BOOTSTRAP="autogen.sh"
-S="${WORKDIR}/${PN}"
+
+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"
-KEYWORDS=""
 
-IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+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
@@ -28,7 +34,7 @@ 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  )
+	idn? ( net-dns/libidn:= )
 	spell? ( app-text/enchant )
 	dev-libs/glib:2
 	net-libs/libnsl:0=
@@ -37,9 +43,6 @@ RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-## autotools-utils.eclass settings
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
 DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
 
 pkg_setup() {
@@ -49,19 +52,17 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--enable-modules \
 		$(use_enable crypt gpgme) \
 		$(use_enable otr) \
 		$(use_enable aspell) \
 		$(use_enable spell enchant) \
-		$(use_enable modules) \
 		$(use_with idn libidn)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
@@ -89,27 +90,10 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/ftdetect
 		doins mcabber_log-ftdetect.vim
 	fi
+
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	elog
-	elog "MCabber requires you to create a subdirectory .mcabber in your home"
-	elog "directory and to place a configuration file there."
-	elog "An example mcabberrc was installed as part of the documentation."
-	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
-	elog "following commands:"
-	elog
-	elog "  mkdir -p ~/.mcabber"
-	elog "  bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
-	elog
-	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
-	elog
-	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
-	elog "manual page (section 1) for more information."
-	elog
-	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
-	elog "See README_PGP.txt for details."
-	echo
-	einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
-	echo
+	readme.gentoo_print_elog
 }