net-im/mcabber: removed old insecure version, renamed a patch to match the current version

Package-Manager: portage-2.3.0

6 files changed, 13 insertions, 141 deletions

diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 19120719b19b..49a5b8c06b05 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,2 +1 @@
-DIST mcabber-0.10.2_p20131025.tar.gz 399025 SHA256 90f4e583a7ea929abcd243dc970d64db53f1f577a4a76dc55432eaa86b5ce007 SHA512 4910acfb3d0f6341e0926bff740186d3039a47f15fd075409ecd940b6388b9bb3bf35cb88eb675e6063eaefba6f4421ca7c07e18cb307a1c7b3206c077feeeb1 WHIRLPOOL 12b9ea8d5dd2e70afeeaab18f8361bd57a5c9850bfc70e953800efe5319d632881163c48d904efc07aadb9cb1a33c09d9b034537e4fe3102793da084bd246e97
 DIST mcabber-1.0.4.tar.bz2 605462 SHA256 63b6bc003fcceba4dc4b273ed1c71643c4f8d95e8696543d53f64a7672b1ce0a SHA512 f4f85abcdfa341489e47ba5290e9cce79cdd749753155003e3a9b5edd145e158c91d0a32fe07983196be5729134279f21fbe94511a41b98b793b415157b6b15b WHIRLPOOL 09f7d6e53e352a0e7087da0ddb1a9f5a717c447c2e7a3d9d3e1b14409e8dd4e95472a60af743a0fbb64d4ee296b8eb6654cfb3ce6030ea8abd95ba863eacb7f1
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
deleted file mode 100644
index 015d3693ee97..000000000000
--- a/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/mcabber-0.10.3-vim-ftdetect.patch b/net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch
deleted file mode 100644
index 015d3693ee97..000000000000
--- a/net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/mcabber-1.0.4-vim-ftdetect.patch b/net-im/mcabber/files/mcabber-1.0.4-vim-ftdetect.patch
new file mode 100644
index 000000000000..8d5aa10cec27
--- /dev/null
+++ b/net-im/mcabber/files/mcabber-1.0.4-vim-ftdetect.patch
@@ -0,0 +1,12 @@
+diff -urN mcabber-1.0.4.orig/contrib/vim/mcabber_log-ftdetect.vim mcabber-1.0.4/contrib/vim/mcabber_log-ftdetect.vim
+--- mcabber-1.0.4.orig/contrib/vim/mcabber_log-ftdetect.vim	2016-11-21 20:47:26.000000000 +0100
++++ mcabber-1.0.4/contrib/vim/mcabber_log-ftdetect.vim	2016-12-13 17:02:02.529854526 +0100
+@@ -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.ebuild b/net-im/mcabber/mcabber-0.10.2_p20131025.ebuild
deleted file mode 100644
index e6fa9eb281d2..000000000000
--- a/net-im/mcabber/mcabber-0.10.2_p20131025.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic autotools
-
-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"
-
-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_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable crypt gpgme) \
-		$(use_enable otr) \
-		$(use_enable aspell) \
-		$(use_enable spell enchant) \
-		$(use_enable modules) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# clean unneeded language documentation
-	for i in ${LANGS}; do
-		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
-	done
-
-	dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
-	dodoc doc/README_PGP.txt
-
-	# 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
-}
diff --git a/net-im/mcabber/mcabber-1.0.4.ebuild b/net-im/mcabber/mcabber-1.0.4.ebuild
index 5faa43afa69a..95830c00db74 100644
--- a/net-im/mcabber/mcabber-1.0.4.ebuild
+++ b/net-im/mcabber/mcabber-1.0.4.ebuild
@@ -43,7 +43,7 @@ AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
 PATCHES=(
-	"${FILESDIR}/${PN}-0.10.3-vim-ftdetect.patch"
+	"${FILESDIR}/${P}-vim-ftdetect.patch"
 )
 
 pkg_setup() {