fix bug #409499

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 142 insertions, 3 deletions

diff --git a/net-im/mcabber/ChangeLog b/net-im/mcabber/ChangeLog
index 12725eea63b2..4d7de3eca5ef 100644
--- a/net-im/mcabber/ChangeLog
+++ b/net-im/mcabber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/mcabber
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.61 2013/11/09 19:20:45 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.62 2014/03/30 12:49:40 wschlich Exp $
+
+*mcabber-0.10.2_p20131025-r1 (30 Mar 2014)
+
+  30 Mar 2014; Wolfram Schlich <wschlich@gentoo.org>
+  +files/mcabber-0.10.2_p20131025-vim-ftdetect.patch,
+  +mcabber-0.10.2_p20131025-r1.ebuild:
+  fix bug #409499
 
 *mcabber-0.10.2_p20131025 (09 Nov 2013)
 
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 0c3a634f4d1e..dc1193b2a0bd 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,3 +1,4 @@
+AUX mcabber-0.10.2_p20131025-vim-ftdetect.patch 610 SHA256 e19d9c6dc04736f31933f71adc8bbf9f1bccd377eea3790e33334632f54024d5 SHA512 6465fe2c782f3b3ed739d1aeb75e8f3dee22a349420d249aa2f6cdbba0ccb6384d6c78b0f7cd35cd0c4356a3f343e15376b84e7eb3ba722752f865591804dce1 WHIRLPOOL b68814b59cf3ff0327333374aeac33f4dc0c45303beeafdd76952c257abb06f4ad945712cd0ed560b4b3d156a9bd96b472dcf142d7a5877e2a978097c237b3d2
 DIST mcabber-0.10.0.tar.bz2 552111 SHA256 ef1bb95238a32f841c6e7032550b40197643843b6e459f44ad53c558f5d75c03
 DIST mcabber-0.10.1.tar.bz2 554682 SHA256 00cb9c0b272a44559c4207fe37ecd43c5cdff88d1e3a0ed2ba5eec10d9638888 SHA512 2117fe1f9af3d8b4722fbbdab379d941fd19409a5eac05641820bf75682aaeae194577ad8357c37fd11038ed22aeafa545a121df0a87e6b0915ef83a06af0489 WHIRLPOOL 864950a1c8017216bf893b953adbf81d138d2ef1820d6758eb76abb139623c23f026418cad6bcf135f7f5f615bac55194e1d9db9f329bfb89fe4e965d09fdb98
 DIST mcabber-0.10.2.tar.bz2 604378 SHA256 e246d153f93a75b4f45879f447434db070503c9903bf3f995af396b3b94586f8 SHA512 976c29ec753a364392ba6b5280c9031d9eb8884236b7d07fbeaa69a731806706f72b93a0bbbca1eca4f11325412d5beff62b14d94acca912841b8b820c2b3652 WHIRLPOOL b448d34025c2e8eb67ff7ccbfe831bbefd609c436ae83516d96060afaba2053a984dfb0aaf2607216b4868c9d05536001b36ee0a4c910c5ce134c0f623d12c04
@@ -5,6 +6,7 @@ DIST mcabber-0.10.2_p20131025.tar.gz 399025 SHA256 90f4e583a7ea929abcd243dc970d6
 EBUILD mcabber-0.10.0-r1.ebuild 3140 SHA256 d9dd831f5187b5cbeba463038546f67903f3750b4a4c82622b6a09ea330f39dc SHA512 0f5986c23f4ae71c0f85a758620e73128669799a2006fe14b4201c1dbfbeeb4ae38d780be3726db990a79b80a3205a783cad37a0df766f8745b89934123775b7 WHIRLPOOL 1270639d013baf303e049faaf3c6ccb8610cbbb12f710b73e44d6048bd7eefcd4dd6b898f4bb9ee76eac6d96c51e0a70d13452b9898cc6f95bf9e43d90a018b1
 EBUILD mcabber-0.10.1-r1.ebuild 3102 SHA256 e6771ce233ae6747befa2aa5551bdca0b9ba685dd00f964ca0aa0f5724f6152f SHA512 918bc20dd6c2d01fc82ed612733e81140d3e425fa0594066e40eb3217302c640c578169089b066123e60c38777e9ed844ca31be0f700dfc10c7cb7174400dfd2 WHIRLPOOL b23113c7f3b7b69ca5b951096b45f1e19f00e2016cc24de03911ed743a665ad7bc4d779edeb90a1dc6073b87cf7bbe79bc4429660dfea11dcfb44140b2c89b7a
 EBUILD mcabber-0.10.2.ebuild 3141 SHA256 b0d8c2f937e705fb7bf643cfc580fa7f3f6e9d54992977fc7d5edbadc69613cd SHA512 c7cb65d3e7391b478742bc2ce67a1f37e3100c0ed11e8b8b6fad201d069573f9add75652ab406c495f7a2d821f7b6ba53cc73fac757501fe00512d43b6a35bae WHIRLPOOL 7cd7380447d0387731e8f66c6de54a058192b7ad8a2367bc24b24f096e61060093d1593adb532fca003eb8331eac7cc814b3a7fb98762003c81e0e0420571f92
+EBUILD mcabber-0.10.2_p20131025-r1.ebuild 3397 SHA256 31e9409599458231374de7c8efc7a2da25b193fd1cd04d16d5bfaab1eb5bbf7c SHA512 1c6f3fba92b950a3b33b693143ca8d5d67fbe1c7b358b62a388e5a92f4c0e907e3192b114717e051064f9f3839c37e32e89bb1a53cba1312522b73b73f7cd9c5 WHIRLPOOL 7a5899bd27ab728f3dda8ad696c1e10aa68da1605fb40721d8d4a619abce7e20914fac6f45c064e0054a3e7a636efeaf028475ce32b2f1b31b50e72875511909
 EBUILD mcabber-0.10.2_p20131025.ebuild 3236 SHA256 459dd1b71236261a634bb875ef7cd47afbf886c3c164d3871b51c2d906a85ac2 SHA512 a65c516d0b17b262ff2ed3c3ae6c7598185509a16c83ca20fd54f5c4e7c07184532d890a429dcfbb05fa01a3f8e0f3b7346d1e6be1b43379a938e511b7524b05 WHIRLPOOL 819e9d48c090477eb5c7f2bbc1f9fdb06b1f2116ab7b114e6d4c2524abe50d313b0d73a65e49c7a827f673a64fe5316590600837a48b58f43d56b1e7d8b4dfc0
-MISC ChangeLog 8346 SHA256 1e0f05a9a6da02d976c426373047b22559c45d9ba1938b55e8723f5073aeec08 SHA512 07d83a9f5b6891679175ba292fafc03835329568bbd305cff611b653a78464174eabbab2fef7819a6e54abd423488948776a7146b8d61d11ba18d4413496d4ac WHIRLPOOL 33f171adb4980d3ba7159b67e3b28701617b309d7c8a61b5e48a6eb18662d0c82ef0e65da4054c9a392318a43e00139281042f20f4725e9ce22ba2c838aa068e
+MISC ChangeLog 8558 SHA256 4860c460a1816a85dec439c4c22f7a4a219f8265ac10ef0c608c96c3253ee4ce SHA512 6bb0f4ec7012a46c77a1bfb9765d5b8b6cb8c98e46fc8dd93441375e4faab57bc62924a5141cbc203cbfb22f61e73a5b0bd6f0e905ae7b9078b8419b6d0fcb1e WHIRLPOOL dc19bee53adebb8e8cebe78b210d990407f24bd2a73168c2697967bc141f3c014fc463425a000c857755aba18fe0c6cf4ddc27d23c549f6026d7dd00fa610da9
 MISC metadata.xml 744 SHA256 d3eac22e4b09b3fb0d21cb7a1f637719d0d0188c6b9bfde2527a02be9cf37371 SHA512 d6221fbd4a64056d06d7a39d1001cf6b4917de0c83721acaf4368c7359773e2cd17400ec8320f9098cfa57379cb4ace9d49a504be30e6c566d967c3000f3b908 WHIRLPOOL 685cc34382c653badcf8d4f97b1664564f988af9e654e002330247defef5f1abe4b16a0b681b6c127f0d657d579e8f9ee2dc0f2100271bbf2aaaa60b8febecd1
diff --git a/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch b/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch
new file mode 100644
index 000000000000..015d3693ee97
--- /dev/null
+++ b/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch
@@ -0,0 +1,12 @@
+diff -urN mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim
+--- mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim	2013-10-25 22:20:23.000000000 +0200
++++ mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim	2014-03-30 14:41:31.975129825 +0200
+@@ -1,7 +1,7 @@
+ "
+ " Save this file in your ~/.vim/ftdetect/ folder
+ 
+-function MCabber_log_ftdetect()
++function! MCabber_log_ftdetect()
+     if getline(1) =~ '^\u. \d\{8}T\d\d:\d\d:\d\dZ \d\{3} '
+       setlocal filetype=mcabber_log
+     endif
diff --git a/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild b/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild
new file mode 100644
index 000000000000..7ab5dba91683
--- /dev/null
+++ b/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild,v 1.1 2014/03/30 12:49:40 wschlich Exp $
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+REV="a18e1b488f1c"
+SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+
+S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${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
+	sys-libs/ncurses
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+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 )
+PATCHES=(
+	"${FILESDIR}/${P}-vim-ftdetect.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() {
+	local myeconfargs=(
+		$(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
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use linguas_${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
+}
+
+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
+}