Version bump. Cleanup old.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 10 insertions, 71 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index d743f51400d1..b8e9899150b2 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/konversation
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.112 2014/01/08 03:44:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.113 2014/01/15 04:55:38 mrueg Exp $
+
+*konversation-1.5 (15 Jan 2014)
+
+  15 Jan 2014; Manuel Rüger <mrueg@gentoo.org> +konversation-1.5.ebuild,
+  -files/konversation-1.5_rc1-setting-admin-mode.patch,
+  -konversation-1.5_rc1-r1.ebuild, -konversation-1.5_rc2.ebuild:
+  Version bump. Cleanup old.
 
 *konversation-1.5_rc2 (08 Jan 2014)
 
diff --git a/net-irc/konversation/files/konversation-1.5_rc1-setting-admin-mode.patch b/net-irc/konversation/files/konversation-1.5_rc1-setting-admin-mode.patch
deleted file mode 100644
index 6daa49782bf8..000000000000
--- a/net-irc/konversation/files/konversation-1.5_rc1-setting-admin-mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5b79cf8cad9781f37f52f77a71353ea4caf64698
-Author: Cathy J. Fitzpatrick <cathy@cathyjf.com>
-Date:   Mon Feb 18 16:46:53 2013 -0700
-
-    Fix for setting mode +a or -a
-    
-    Previously, setting or removing mode +a on a nick in a channel called
-    ChannelNick::setOwner(), so setting +a on a nick made the nick appear
-    as an owner of the channel, rather than as an admin. This commit
-    fixes the problem by correctly calling ChannelNick::setAdmin() instead.
-    
-    CCBUG:153580
-
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 3ceddb0..6911473 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -1495,7 +1495,7 @@ void Channel::updateMode(const QString& sourceNick, char mode, bool plus, const
-             }
-             if (parameterChannelNick)
-             {
--                parameterChannelNick->setOwner(plus);
-+                parameterChannelNick->setAdmin(plus);
-                 emitUpdateInfo();
-             }
-             break;
diff --git a/net-irc/konversation/konversation-1.5_rc2.ebuild b/net-irc/konversation/konversation-1.5.ebuild
index 668b9aa5bf03..e9fcbb419633 100644
--- a/net-irc/konversation/konversation-1.5_rc2.ebuild
+++ b/net-irc/konversation/konversation-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5_rc2.ebuild,v 1.1 2014/01/08 03:44:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.ebuild,v 1.1 2014/01/15 04:55:38 mrueg Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A user friendly IRC Client for KDE4"
 HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/src/${MY_P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${MY_PV}/src/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS="~amd64 ~x86"
diff --git a/net-irc/konversation/konversation-1.5_rc1-r1.ebuild b/net-irc/konversation/konversation-1.5_rc1-r1.ebuild
deleted file mode 100644
index f5a08778b46f..000000000000
--- a/net-irc/konversation/konversation-1.5_rc1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5_rc1-r1.ebuild,v 1.1 2013/06/17 21:51:43 johu Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB es et fi fr gl he hu it ja
-kk km lt nb nds nl pl pt pt_BR ru si sk sl sr sr@ijekavian sr@ijekavianlatin
-sr@latin sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A user friendly IRC Client for KDE4"
-HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/src/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="+crypt debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	crypt? ( app-crypt/qca:2 )
-"
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/qca-ossl )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-setting-admin-mode.patch" )
-
-src_configure() {
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-	)
-	kde4-base_src_configure
-}