From d1fff08fbe12e71abdd070149a0776c6bb4229c8 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Wed, 3 Jul 2013 07:30:37 +0000
Subject: Remove failing sed that is no longer necessary, wrt bug #475572.

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C
---
 kde-base/kopete/ChangeLog            |  5 ++++-
 kde-base/kopete/Manifest             | 18 +++++++++---------
 kde-base/kopete/kopete-4.10.5.ebuild | 11 ++---------
 3 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'kde-base')

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 6d6ea7abbed2..fbe135af3fbb 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.382 2013/07/02 16:48:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.383 2013/07/03 07:30:12 kensington Exp $
+
+  03 Jul 2013; Michael Palimaka <kensington@gentoo.org> kopete-4.10.5.ebuild:
+  Remove failing sed that is no longer necessary, wrt bug #475572.
 
 *kopete-4.10.5 (02 Jul 2013)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index d9059e8353bb..cf45a58d15e2 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -5,17 +5,17 @@ AUX kopete-4.10.3-v4l.patch 1400 SHA256 0bd8befa2d488e461531d6e108305fb47e95612e
 DIST kdenetwork-4.10.4.tar.xz 8911092 SHA256 e681cd08ec512303b08fddb847f26b612c10dee51b6746b32be30c4bed71a9ba SHA512 39e0fca390410d12e9d3c99b9258dcb4c7f50856ec36891106e253ddccca719cfae2ded7e955003a31589a4073094c4b3ec7eaa3cad680f4fc5e067207c98151 WHIRLPOOL a0affc43cbc911d018b6d4077b5e55a15115592d655d88657ceab6c5d11078c735c733960b3999e4194d1f81085ed6d37f2ca3e6821371b61c6e3ef3db29433c
 DIST kdenetwork-4.10.5.tar.xz 9030076 SHA256 d308c7f4f14e5ca91d69e661538e051335de389ca1eb9a74c1cd92ad40092ad3 SHA512 0a24c22cc2a0b18828f059e1a1b4eba3639bb1970628bafa07f6462708b37a7feacbd5353bc5114eb7c74f199957620fded38373af26089935ed23f8832f0f45 WHIRLPOOL 63931d477bb03d9eb5b8fd1d6d7787e13d650774680d9daf9027caa464158cedb2e6138dde98cb40364fd74c08d8195dd9b344bae57a2d9872d179da993c1e09
 EBUILD kopete-4.10.4.ebuild 4241 SHA256 c9cf3db913f202c2ed920ece1fa9d086a71e70b300d4b93d4dec0091e935171f SHA512 69af8b8bdcfd3f800d297f06fe75ca745a58e52adec8826b3b91da518e60872f6210de30ba61a60b817be38b16ee683d2ae42ae9caf387e35603ae4ad4c383d3 WHIRLPOOL eff6e58cd2c7466963d7bc8269977eebb3da5c8ccac5903e6abffba6595c6aaa9521dee16a158dc6be61506cf1556b5daf88ce1e0f3f5e16099e44c3656efed2
-EBUILD kopete-4.10.5.ebuild 4334 SHA256 fb8438e7df6ba619832b127892a81c18f0f802189e2d5f14492ae6c78412c93c SHA512 7163ff81da3ada6330b3a88648baa781c8fe9d823d416cf9d86959e6a2ebf481d6f6bdd4b929a6d9c23a7fd28c498073feeb6079cbfad3e1e018ea7cc2cfc305 WHIRLPOOL f5120a3a1b8940dca29cef1e8c21ba4db567bd0a6cbd513855876faa4282cae0ff78f82f42c80799c11ed57d5b8b9bb6d5dc69fee0a77696e030dbb689cb9a26
-MISC ChangeLog 53325 SHA256 3696924b7938bdcb836414b21bc305eeab4de74ac45a220cf3f4239ea48d3431 SHA512 d270f4d88d569cf4195ac11d96908f7189a8bbefe951b0d0cc91c9eedb7ac9f9d30a4f8fbaa0544303b13234a7f3d0c7b4fcf73b62986df90bc5bb0cdb578b18 WHIRLPOOL 9e439d73b5640c8cc8b082ff0a11d21b048ffa38a3e37e759efbbcf578125b371d38bcbc40e284f339331c1fca3b1d4ec81480ca9003ff42a44e36ee929b753a
+EBUILD kopete-4.10.5.ebuild 4161 SHA256 ce20336dd068bd69209fa6c63ff7745f4bec4f8a6861b0dd4be7baa2ea0a0256 SHA512 0eb2433e274d756c449d9767f02dbb733a8db07e385956398277de34b77b251072d94381d60ca8afe567a059b16332e91114e4713ea9ed893e69c1c748c27c69 WHIRLPOOL a1de8dad6607b29f269949b1509748baa7302ddbc8cdc0be9c482bf54f3420c086e2f8b236112ed4af5643af156715273641014808555042790ae960779931cb
+MISC ChangeLog 53477 SHA256 4e6a60b192e07306ce9517e84c523605fa90543686d33f063deb21885d026d30 SHA512 357b8ad058142fde884bd0ae80f435e217f2680f99d59bd3c60c32882af7f7c3976bf50a14d6643065440f92626c87f235ba0d6bf7e6a6cccbc9ffd66622db19 WHIRLPOOL c09e3ff4ca95f6d4011afa47f43d0a209f5b6efed410870925f9f3e7446c365e760b2134103c7f6f1955df3d80cb92f59ab7df57bccdcc9e980c0a72d987baad
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR0wSUAAoJEO+t9ga+3I3aij4IAIGGkrazfUwdnly0o85v3AN6
-fmdZyqS2+0UlOwkE/bBt/yefU9QK7nhRLQprkvdNyd52mqr6NdmPT8Jlc18WQjYw
-NGEANexdvX9RSMTzGeqx3SzayDEOkk9rrcK01Y+H1EEB0CB1ewKjfsRU+tUtIRyR
-8rfsbQhhfFQEaR+Z3SJNaWwQOYFHRSbuvk+saCBjqh8XRAagkl0nc01htcJZdrON
-zzQF3d8VBPo4O4UmJNWJVdBp9jjvj5RrXJOm9vvJa05Ox4xTPtLtwxRoSjzCiGei
-xwll2tTjUfDatBuRRPa2K0nuq/Ad/Z0hUjbc68Yt0zWr0manLQr5e5GiNe6K71U=
-=iVTP
+iQEcBAEBCAAGBQJR09KmAAoJEMbwO6tnXQ0svcAH/jitNWJcYAJmAEFgJq+uN2WI
+Gl2y6w0yVPWCJ3r6UrD4cLOp8E6XpIxxaqGO0l5SEky+G4gfdFsoKVNDo+V8effP
+tnappamU7fkkXaTA+xuJ4MKvOEZhbpSAhRZW+7vqkPMxkcaletIMFTT5eWgX9/F9
+QtKt1HIN5fDlciSmcOb+cUztVEZSPsXgwiSI05BUThZ0Z4Pyk0ZHxNrYrOgT6UPe
+6qq6yATmFJ+fn5Z/N5ES3mEZJjdoSTRU7pEf0mgOTZ70W2uhdE+bfLIHHjdp0v//
+Lm40sD74CYGw4QYduMtKphKo7F6mf60mUQ62JMJsM6Tdy+QsKjW5wndkBCoUEKM=
+=q40g
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.10.5.ebuild b/kde-base/kopete/kopete-4.10.5.ebuild
index 4f6df56cb61e..6829913760d1 100644
--- a/kde-base/kopete/kopete-4.10.5.ebuild
+++ b/kde-base/kopete/kopete-4.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.5.ebuild,v 1.1 2013/07/02 16:48:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.5.ebuild,v 1.2 2013/07/03 07:30:12 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ else
 fi
 
 KDE_HANDBOOK="optional"
-inherit kde4-${KDE_ECLASS} multilib
+inherit kde4-${KDE_ECLASS}
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -114,13 +114,6 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-${KDE_ECLASS}_src_prepare
-}
-
 src_configure() {
 	local x x2
 	# Handle common stuff
-- 
cgit v1.2.3-65-gdbad