Drop redundant patch.

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

5 files changed, 24 insertions, 57 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/Manifest b/app-office/calligra/Manifest
index b45980e96d4c..290cae866e73 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,26 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX calligra-2.3.74-jpeglcms-2.patch 1363 RMD160 f30b29b5306a52838dd0bee7a58516ad63073736 SHA1 3832378d50ad2dc916354ed048e13cd686394844 SHA256 26a2287f414b4562b848c4f26430aebd89d199310d4ef5c8d2f8e7ef415e62ed
 DIST calligra-2.3.82.tar.bz2 116160730 RMD160 d7a7b0cd4ea96d2cf7b0cf779f5b1e237b3a0aa6 SHA1 7583319f72b4ff66b11dedfc4b07491654f22274 SHA256 a42ec989341c1395d8df3406f1cd43c23710b27ccacb1054b28aa18c8200b52f
-EBUILD calligra-2.3.82.ebuild 5583 RMD160 dfff738db7d878ca09f54b74597144df482fa576 SHA1 a481658df2e5e49bf12749b7fff7d540fce98eaf SHA256 fb5cd4adb05fff6c3a427edc27bedb64f1f60e19bc0225fb9fe814e507943580
-EBUILD calligra-9999.ebuild 5581 RMD160 040dec9bc505c2224312fd4e459184dcdb3ead75 SHA1 d4115b22c834f06a1fcf0a2e6d4e8e52481f4295 SHA256 9be9764ecdd8c6ead2b4bc3a03ef7d52a88f362b996028a82dbed7899f48aadf
-MISC ChangeLog 2116 RMD160 e9c3b5414e6a9a0ff12fb254f2d8524bd4721078 SHA1 457bb90ff4b9417a7e7b4a57171b2dcef2224300 SHA256 282d3105f3c6f3b6d38a3df820b888a57a2f9824fa7d3a42f829e971e9acce2c
+EBUILD calligra-2.3.82.ebuild 5525 RMD160 ba3b03aa82896981f0bc80ca555625793d473818 SHA1 13a79e91b7e54e970cfe3bc72ee36dced21c3ccb SHA256 a636e9f560606e83a69d46f5be427499c866a1687c6577cc1eef864628c7556e
+EBUILD calligra-9999.ebuild 5523 RMD160 dccb9b227f41fc0d403160c3e3807296f0ce0c0a SHA1 4dfd18c118556bbfa72df923541135500b1bf979 SHA256 d2e4c9b52fa11a6ac531b87d4a984d62e3963f586f01b0dde3272aea8a1ce3cc
+MISC ChangeLog 2287 RMD160 e2688ce7641ead06ec32de34fa426479ae1b800e SHA1 65514de46c51ae8c57e895a11ce88136194a3df3 SHA256 6b8374dee21fd996e98afe269e94130f3d6d3be2dca2cd140dd0232b6de495f8
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOnEQIAAoJEOSiRoyO7jvol9wQAJf0iv7Gx5Smqs5IhPzlCwnG
-cq80csjgcu4Pzbcl6dKpCV57fJUAMk3cqo3Q9qh11HZJSNf0vHLvOtg1FOLrgKPH
-bilNzCDIfWpn3qyBfGs3aLJToEf3XdWSyE56CprwQpQRMKbLE2GK1iejzctGYQQl
-ugl7lS0eVXi4rPIedGuQZFiqpCfBmHek8aBx04co4uBepldWQC3A8G8NDAx0ZMxa
-UF8DiSBT7jVo+uDzSMFHbFZTClCwi5Ffi8Dcgi8w89yydXfLK6nOpCj9c0N521Uy
-bB/+ziyQvhX6mDKa/QNOARxfX9oGVELp4gyA7rcTPZows1LFtvPy3cEndvI3jVE7
-/TOB1w71bXdp1uy7IoqdqsbZMslMb5+d7xAonNiRkGAxgorujvwPveztVO4yL01R
-P5ggEJwg6hWpY+eRrA54qBQrrDEP5lYfirCHCrKKyBPsi9Q9kz+G/K0FxuEqVxG/
-sLAW7l+Wl9APn9jFvfSU1Wq0+q8KEnbzJTuOJyRykOgz8QHwzw05e0N8zYjTBfkL
-P8p82oOfvoPSlNASi39Pi3UGnD2SG3TXvTsBsL15LBJ9fPgEo5z4J6mWumVwVPX1
-pwmePZzJaUyXyMJ/lTNf+AzX8srcOj2ly+9BaytmfYfqSzrGjZleP6ty7VSrq8ov
-NlqofYBi2TZ1v7yjfEts
-=b7rc
+iQIcBAEBAgAGBQJOnEi1AAoJEOSiRoyO7jvoiCQQAI6sk+VXD+cWNHJjPEEL2vlG
+N4hGIQUujvo8cc8f7Cv0eIjHoYXj149aa9vMDf+ZoiFyrFfI+yy6UkVXAMYgEquq
+OF933WpztwoQ2huBcq3cty3NqfgQMo2wQMBFVXjx9BSKnOhFOoxBsbtq1xztbZWD
+iNAaHBsqhG9mttPHuKj0mRruw1bKVc27bgVGrSHkTNViAJfrf0+uh/iQE2qveUU0
+S/XTpq6Nk6sbnznpH8TlPUy/T+ZCgQR8hFiQ8YLMZznT+QQdCEYtAOIfoZrD0qU8
+w+p7lnzB0VHsCIn8psswkCTRezUaxNsZI15MlW/un896bqW4mvoyVpFi3lykx5ZQ
+oaCkTmxipBbTefKulwNt6Kd1yyycq7MPLSRGPEEAHLC1R9mCkKTkRQ4y65wTMkgv
+indpS8nPh2oHzzkWCsqtsognTTxnjTFPZ+4VlllPFaL5wTQel0NjQVt1+19mROAW
+FNJhcFWOJp9eHVnHWflmanEWYs8YJmuitWiuK7TAQa8h55zydz0QT2mhzSAIr9Qv
+M5LKXUf22w6SuVrvSWE4+d9C/K3cJePUsFlJetolInPEXulo+7+aYeGcV8KeDEyA
+UMhiNDR5aoLkbg3UlRNCWTdTToSv44XQs8s5iL5rkEwpmKoCybBwxi3ket7MuXfk
+r29osptFz/6k0mLXOtsw
+=IaX3
 -----END PGP SIGNATURE-----
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})
-