old

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 15 insertions, 53 deletions

diff --git a/kde-misc/basket/ChangeLog b/kde-misc/basket/ChangeLog
index 512c4075e96a..efd739fca669 100644
--- a/kde-misc/basket/ChangeLog
+++ b/kde-misc/basket/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/basket
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/ChangeLog,v 1.11 2011/03/10 13:02:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/basket/ChangeLog,v 1.12 2011/05/04 11:08:39 scarabeus Exp $
+
+  04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/basket-1.80-crypt.patch:
+  old
 
   10 Mar 2011; <angelos@gentoo.org> basket-1.81.ebuild:
   QA: Fixed VIRTUALX_REQUIRED
diff --git a/kde-misc/basket/files/basket-1.80-crypt.patch b/kde-misc/basket/files/basket-1.80-crypt.patch
deleted file mode 100644
index dc8aa68b4400..000000000000
--- a/kde-misc/basket/files/basket-1.80-crypt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r -u basket-1.80-vanilla/CMakeLists.txt basket-1.80/CMakeLists.txt
---- basket-1.80-vanilla/CMakeLists.txt	2010-03-20 21:20:57.000000000 +0100
-+++ basket-1.80/CMakeLists.txt	2010-03-28 22:04:43.000000000 +0200
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 2.4)
- 
-+OPTION(ENABLE_CRYPT "build encryption support" ON)
-+
- find_package(KDE4 REQUIRED)
- find_package(QImageBlitz REQUIRED)
- find_package(Gpgme)
-@@ -15,13 +17,14 @@
- 
- include(MacroLibrary)
- 
--IF(GPGME_FOUND)
-+IF(GPGME_FOUND AND ENABLE_CRYPT)
-   SET(HAVE_LIBGPGME 1)
-   SET(LARGEFILE_SOURCE_1)
-   ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
--ELSE(GPGME_FOUND)
--  MESSAGE("GPG not found, configuring without")
--ENDIF(GPGME_FOUND)
-+  MESSAGE("Configuring with GPG support")
-+ELSE(GPGME_FOUND AND ENABLE_CRYPT)
-+  MESSAGE("Configuring without GPG support")
-+ENDIF(GPGME_FOUND AND ENABLE_CRYPT)
- 
- #TODO: find meinproc
- 
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 6f59a99746d4..244e121cf432 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.47 2011/02/13 20:06:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.48 2011/05/04 11:07:51 scarabeus Exp $
+
+  04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kdiff3-0.9.95-desktop-entry.patch:
+  old
 
   13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kdiff3-0.9.95.ebuild:
   old
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch b/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch
deleted file mode 100644
index 467155fc02c3..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.95-desktop-entry.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -ur kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop kdiff3-0.9.95/src-QT4/kdiff3.desktop
---- kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop	2009-03-03 21:34:53.000000000 +0200
-+++ kdiff3-0.9.95/src-QT4/kdiff3.desktop	2009-10-13 17:08:39.000000000 +0300
-@@ -60,3 +60,4 @@
- Comment[zh_CN]=一个文件和目录的比较和合并的工具
- Comment[zh_TW]=一個檔案與目錄比較與合併的工具
- Terminal=false
-+Categories=Qt;KDE;Development;
diff --git a/kde-misc/ktrafficanalyzer/ChangeLog b/kde-misc/ktrafficanalyzer/ChangeLog
index bb68f9e0318c..b02fe97b56c7 100644
--- a/kde-misc/ktrafficanalyzer/ChangeLog
+++ b/kde-misc/ktrafficanalyzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/ktrafficanalyzer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ktrafficanalyzer/ChangeLog,v 1.6 2011/01/31 06:09:19 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ktrafficanalyzer/ChangeLog,v 1.7 2011/05/04 11:03:24 scarabeus Exp $
+
+  04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/ktrafficanalyzer-0.5.3-gcc45.patch:
+  old
 
   31 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -ktrafficanalyzer-0.5.3.ebuild, ktrafficanalyzer-0.5.4.1.ebuild:
diff --git a/kde-misc/ktrafficanalyzer/files/ktrafficanalyzer-0.5.3-gcc45.patch b/kde-misc/ktrafficanalyzer/files/ktrafficanalyzer-0.5.3-gcc45.patch
deleted file mode 100644
index 3fa571549adb..000000000000
--- a/kde-misc/ktrafficanalyzer/files/ktrafficanalyzer-0.5.3-gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru KTrafficAnalyzer-0.5.3-orig/lib/SYSTrafficInterface.cpp KTrafficAnalyzer-0.5.3/lib/SYSTrafficInterface.cpp
---- KTrafficAnalyzer-0.5.3-orig/lib/SYSTrafficInterface.cpp	2009-12-10 16:03:34.000000000 +0200
-+++ KTrafficAnalyzer-0.5.3/lib/SYSTrafficInterface.cpp	2010-06-03 20:08:38.242803467 +0300
-@@ -21,7 +21,7 @@
- SYSTrafficInterface::SYSTrafficInterface() {
- //	printf( "Constructor of SYSTrafficInterface!\n" );
- 
--	TrafficInterface::TrafficInterface();
-+	TrafficInterface();
- }
- 
- //Read traffic differences for interface interfaceName