Version bump. Cleanup old.

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

5 files changed, 13 insertions, 77 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/Manifest b/net-irc/konversation/Manifest
index 4c337fdb6153..b7c365d73fe5 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,9 +1,6 @@
-AUX konversation-1.5_rc1-setting-admin-mode.patch 980 SHA256 a61ed70cd5f91ca99e052d0649c4b385dbeb246d8d29e6cf00117c3640a97cb5 SHA512 9580fc0e5a0543247e185d400a80625d747591c861d7924c306a918cb3b062d518d41fd5b606706c302ee58841f5a34bae8b96a0cf7a30c04a9cb1f681e11e65 WHIRLPOOL 4ab845dcbddfcb2f5b25913f0a609737031a6f41227ff2b98625d3325adb78a57d40e13490bf1d1f23f72a6e6c6b4556df18cb9b2e1128929526fd7c7fef9a40
 DIST konversation-1.4.tar.xz 2902368 SHA256 db4e605a27dd6012972aa4d2c07cd4736f9e6a68febb41a5d59f3614d6d21b0c SHA512 c6c6a16a3bf46dd5f48bb36cc19b208558017222ce26e0657d12846899fc57c87b6bc900bcce95ec470a2305bb182eed31e1523757d244b150c6d1070e8624d2 WHIRLPOOL 962ebe3f3a8f05a14416601cf804473e50de9fdd546e09a95369951e4db461f50161e39be487110743082b8795d9d53ea2e05a6cceeb3978734334b473f14876
-DIST konversation-1.5-rc1.tar.xz 3118760 SHA256 c21db20be5c1067246d8b1fbc9d96a99e50e042873bcbe3ae74c5a9cee9b969a SHA512 7cc595bd23e9c1c0e39c5b1161bdea78dc3e3b52bb5823ea19dd4762d3329d8015841df34a7d3f390dbfc3155ee65cabaddb134cb9a858d936226b5589723d2c WHIRLPOOL 2ba5a3ebdefa46652c292181a5ad8047f6180909388ea14b1412432a67ef19fc85799fe247b33da63cee3111e6b9c0f85cf615e91a1868898ae64f7ff4ea3b69
-DIST konversation-1.5-rc2.tar.xz 3167804 SHA256 a2e9e94ae6a86dc7eb5ec84bc9272ac4f8ebafd846fb16ef11e9700aacefb99e SHA512 49dbb8e096cd501f81266e50e3f44b0937062d03af10a4b77a0849c9f91a743407ed6790ceb8ab4c3edd65e03001fcaff4b79d6f8d5402af84e623dca2157a99 WHIRLPOOL 44609571d71cf7ab94cbf76a85c2123d5b4aed454f3d197e688247ea3be04955f02f655ce9468d6ca1117597933e26c2c5773e80172581609042c9198c140d94
+DIST konversation-1.5.tar.xz 3169284 SHA256 382de6217ec1e27c292ec33473a31b893863dc699c79669f5ef364152719546f SHA512 b70307911e59547311864b1268f53a36e32a95f4691379f569bacd7bc7d05624fb6b79fc4830430bf1b821480a9a1776d68548dfe12aba63d38cd0d358b71302 WHIRLPOOL d9c1b0544c7e9a2f9d602c312140ee2079497a580a3ef51e7c987d852f898ec7edbf261211d7935fadd5393107b79725d9b7561be8242ae8b1559fb75234e5b1
 EBUILD konversation-1.4.ebuild 1053 SHA256 0fb101f98edae2ef29dfbd95c1f4fe3bed72097bf1c2ba46f676ef9852f44ff7 SHA512 a12dd903422f0d7054eeb109bdce35bdfb000fa8c98fc7b6164df16ec71def789648e91a8e3dcc53f24d15f5751443b76e3a172bc5562a72faee39bf611ad2d1 WHIRLPOOL f588654e02d144c93928d3c52a836891e8e88be49b7f3cb4e47cd42800a9290186c97ad329f7ee813d0984d2da098597349e9554fe9cb7ec78b9b66032241314
-EBUILD konversation-1.5_rc1-r1.ebuild 1098 SHA256 fa0e1a680269197d1e004c70a9f2a8e67061ae6dbed7b5a8f24d9333930bc57b SHA512 42323ee508a72dfac2458f69bbef63c8372bdec9884903527be5f366bd0b7fd669ce5177fabbb0f9dd0473ae4d9d27dee3e9a3af708c37286eeb935bc974ff06 WHIRLPOOL d42869d702012a64da5c7894de4b6246a4275639dcffd602d58ca46ee8b28591976d09ce94a14e04e6a86b08864ebf825062b00d2e6760f01bab5c9d42e5cb73
-EBUILD konversation-1.5_rc2.ebuild 1036 SHA256 2a96ce4d69d13a6e0db855c3eb314adce77ebf060e87387d07b21937fbb3a6a2 SHA512 5b20e5efc909b31c73771718b1ec2104573f0601a5da7b33e5180de7a9d37d74fbaee56c73d00d23f86dc36095d702255fea86a1b416e3af731e8bee75e258ca WHIRLPOOL 98f416e426752961ce149236a05f468601dae3309afddb1870d625bb84f0086a598b1be10d925834b0a64fbf95bd64944ea4003d7cd02db54ee4451b6e4668d1
-MISC ChangeLog 16467 SHA256 26703f68bad99a45795e2bf26429635155369fd8bb47f963ee18977f008a2dc6 SHA512 d7d117fb1893c42102360b6500c3d7fff8b6dacae97b6bbf673257a12839c8759a01dc33944205a656551bfe39313b43a11c8355f6fefd083427ad065c141afb WHIRLPOOL 9b36d614b3686fea5ac188f03b0b8ee1ce8367d25b851ee831c8333f29be3af285afc44061af32083d2e1ca8b21d5677485b0bc2bc6330ff6a5a9701892f7493
+EBUILD konversation-1.5.ebuild 1030 SHA256 bd5381b7155f789c0eb57e3baf78a220113ecc6a40e41be5d37e17a7c6740c2e SHA512 9ab722271e04261bb249bebaed629aadc48854e7cd9f9169abbaaa3c7b81c6e7e134fd8a4978a264d15ea5ca96e7c49300a9dd3c8c0694f41e1c3af58da052cc WHIRLPOOL 558253b8d49b0efce5fe300f5a49a4ec4693e4d3c36651f644071897e679828af8e47ec598730bb04571452f177b16e028f55be25ef04c1f1d9e655d5c463f55
+MISC ChangeLog 16725 SHA256 9f177ea223b30d4093fdd27a73458d868944cb1a58b14e712795d2f5ede0f462 SHA512 e6ae8b83f7fc27081f5a63824d4389913dc1fd67862e1f6d3867b516b69efee82a37e3d11cb6a18c396f514ad88b7c32869f3ad19a9f0f402cbab38a5fe81b98 WHIRLPOOL 19c06a2ca165c3429d79a7bc5edd688401a7d280d4b9fb8f720004003d51cd3d87329819a53ca60aa410f3590b9b2bbbde5965d088ab9e035ff91b9edca10246
 MISC metadata.xml 177 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce SHA512 65c9833c0dfd58cbec68d7c3d88849dbd9477cd76cc983fc580d531525998cf280c6b708b9d3eb970f9b6e18bcf21da194bbb0a1931efbfc4164b1709226cff0 WHIRLPOOL 427f0f186ab280f1f9aaa3f27f89fc69743a38848e0e2d369013da2c907faabc47e4a66497ae6079376c7742db639f42d07262bc011c0e8311cd6228a9867b48
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
-}