Drop redundant patch.

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)

4 files changed, 8 insertions, 40 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index ea5f5aeff021..cf556394fbe1 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.11 2011/10/17 15:06:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.12 2011/10/17 15:25:57 scarabeus Exp $
+
+  17 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/calligra-2.3.74-jpeglcms-2.patch, calligra-2.3.82.ebuild,
+  calligra-9999.ebuild:
+  Drop redundant patch.
 
 *calligra-2.3.82 (17 Oct 2011)
 
diff --git a/app-office/calligra/calligra-2.3.82.ebuild b/app-office/calligra/calligra-2.3.82.ebuild
index 7d580ebb1518..63361900f114 100644
--- a/app-office/calligra/calligra-2.3.82.ebuild
+++ b/app-office/calligra/calligra-2.3.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.82.ebuild,v 1.1 2011/10/17 15:06:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.82.ebuild,v 1.2 2011/10/17 15:25:57 scarabeus Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -106,10 +106,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch"
-)
-
 src_configure() {
 	local cal_ft
 
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 2c9729165c51..8431a6c261c1 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.2 2011/09/15 11:27:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.3 2011/10/17 15:25:57 scarabeus Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -106,10 +106,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch"
-)
-
 src_configure() {
 	local cal_ft
 
diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
deleted file mode 100644
index d58c0834baa9..000000000000
--- a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN calligra-2.3.81.old/krita/plugins/formats/jpeg/CMakeLists.txt calligra-2.3.81/krita/plugins/formats/jpeg/CMakeLists.txt
---- calligra-2.3.81.old/krita/plugins/formats/jpeg/CMakeLists.txt	2011-09-15 13:13:23.521381587 +0200
-+++ calligra-2.3.81/krita/plugins/formats/jpeg/CMakeLists.txt	2011-09-15 13:13:51.571381250 +0200
-@@ -1,6 +1,6 @@
- add_subdirectory(tests)
- 
--include_directories( ${KRITA_INCLUDES} ${LCMS_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR})
-+include_directories( ${KRITA_INCLUDES} ${LCMS2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR})
- 
- set(libkritaconverter_LIB_SRCS
-     kis_jpeg_converter.cc
-@@ -16,7 +16,7 @@
- 
- kde4_add_plugin(kritajpegimport ${kritajpegimport_PART_SRCS})
- 
--target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegimport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
- 
- install(TARGETS kritajpegimport  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-@@ -31,7 +31,7 @@
- 
- kde4_add_plugin(kritajpegexport ${kritajpegexport_PART_SRCS})
- 
--target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegexport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
- 
- install(TARGETS kritajpegexport  DESTINATION ${PLUGIN_INSTALL_DIR})
-