Add patch for exiv2.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 68 insertions, 14 deletions

diff --git a/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog
index f9ec45d432be..ac3b0fe3d470 100644
--- a/kde-misc/krename/ChangeLog
+++ b/kde-misc/krename/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krename
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.54 2009/10/18 18:21:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.55 2009/10/20 17:05:13 scarabeus Exp $
+
+  20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.0.0-fix_exiv2_support.patch, krename-4.0.1.ebuild:
+  Add patch for exiv2.
 
   18 Oct 2009; Markus Meier <maekke@gentoo.org> krename-4.0.1.ebuild:
   x86 stable, bug #288460
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 5ff76ce16a69..3fd239f535ba 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.0.0-fix_automagicness.patch 797 RMD160 de940673e2de81d5e8a93932e40eef38255bd4ce SHA1 f4dfdb392474cbc312ff83e9de7ef01fff81b601 SHA256 8429bce9fad196ef298fa85d2c9ac04b9c3b8e9dd8946c246f18b8bb63a4c4b3
+AUX 4.0.0-fix_exiv2_support.patch 1937 RMD160 b441c25311e9c2cbac8adb96cc5d48602c798929 SHA1 d45fdda59a052e6bafc11bde88ec966cc90b9718 SHA256 1e8bf8942077bca5fe9272bfd2d9e34f7d87887e1605a43ea48bb94201a5ff8d
 AUX 4.0.0-fix_taglib_support.patch 1988 RMD160 5c291a82db430e6b93e225e0566355fa30156e58 SHA1 fe811093b565572f3d8320b28ec879fb0264d0f5 SHA256 2165839c3d44ea0a823829f5c97eb907f4350d69c8ec6fbf59166076f9837fba
 AUX krename-3.0.14-desktop-entry-diff 255 RMD160 22f556f01152ebfe7c657504591101526e518a27 SHA1 3f4a054b9835da6fbe806261de7331dd4576cd8d SHA256 0a74b621bb396faadef1b92a3aaef1ce1c75dca5c55f70cef7c4e35a648bf208
 DIST krename-3.0.12.pdf 525778 RMD160 3fa3af24ddc6ce2d79d74858c563383400be39f2 SHA1 53d641dddf3a7c57b775632aeba885ba49b1b8ef SHA256 7c93bac59a508b8ca1e92409d0b5bf3b772bc518c1d2e0fa11d2e5a52dda4849
@@ -9,13 +7,6 @@ DIST krename-3.0.14.tar.bz2 712821 RMD160 ba427cd1bb2746f45953122ea5dc872aaf24df
 DIST krename-4.0.1.tar.bz2 214259 RMD160 de55c0ccb20432c6001650728f5fb4e134f048a1 SHA1 b4d2ab43836a43224f69c9767c7ff14fffdea6b7 SHA256 42ccdaeb7c261a366b43bbce5edb6584516e8506c3ba71314049103dbef168f9
 EBUILD krename-3.0.14-r1.ebuild 1471 RMD160 74356d26047aa88fe1687468bc095e62b2119a04 SHA1 238afe1b923c62a6231346bccdd91103c4912ace SHA256 130f8a24b87d9a0e94644e211b801b1e9f8fedf279ee56a669e091a3a8ac085e
 EBUILD krename-3.0.14.ebuild 1419 RMD160 57e134a79dc64cb6893f7d25e01aff32907b6b62 SHA1 037bfb869e8684e559e9303ecbeb3daaea26aea6 SHA256 6da5fa65ba5a919feda54ea9d1d778466c881c6c38e04394660fbd90b925b8a8
-EBUILD krename-4.0.1.ebuild 911 RMD160 9b5cf376d8408f8605f4bc2cd18fb99884b9dada SHA1 24344752c346327fd16f482ae8721f397ac72d66 SHA256 7ec108b2af7491c77598cec145230cb604e08c270bc1fb0e213e24194ba08d40
-MISC ChangeLog 11461 RMD160 c6e3f8b8cf617df54958b72e2989880dd3bb676f SHA1 e4eb3e79a3222d52beaa0e6c17941604f03d33aa SHA256 51176a73f155ab38c656dd506814e753a95c517417a6416985be175fdd1ea5ba
+EBUILD krename-4.0.1.ebuild 959 RMD160 9bd8e4bdb6634aa660dc6f72ee10e82c69121d77 SHA1 95a118b8acee9af6f3ad451677c316b39f253585 SHA256 d1f1cdfce06e9f145be31e23d611b818d96dfa6173ef68b05e920dfb12728888
+MISC ChangeLog 11605 RMD160 40fe55028e16a5866e492c982f9de318110340bf SHA1 bf3e156ef2801e59530ba898f0240386a8a36f69 SHA256 e6fc15f4b2ed35da953583495c9c7cf482af43c78772363f4aedb812e64818cf
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrbXK4ACgkQkKaRLQcq0GKfUgCgkAFtaO4tKHqE/iQY5UckyE6s
-vOkAnjw5vFOoNXVRXLLOfmTLEebqid5/
-=tlo2
------END PGP SIGNATURE-----
diff --git a/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch b/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
new file mode 100644
index 000000000000..74204c004d03
--- /dev/null
+++ b/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
@@ -0,0 +1,58 @@
+diff -urN krename-4.0.1.old/CMakeLists.txt krename-4.0.1/CMakeLists.txt
+--- krename-4.0.1.old/CMakeLists.txt	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/CMakeLists.txt	2009-10-20 18:59:12.000000000 +0200
+@@ -34,6 +34,7 @@
+ macro_log_feature(EXIV2_FOUND "Exiv2" "A library to access image metadata" "http://www.exiv2.org" FALSE "")
+ 
+ IF(EXIV2_FOUND)
++  ADD_DEFINITIONS( -DWITH_EXIV2 )
+   MESSAGE("-- The exiv2 library was found. KRename will be built with exiv2 support.")
+ ELSE(EXIV2_FOUND)
+   MESSAGE("-- The exiv2 library was not found. KRename will not be built with exiv2 support.")
+diff -urN krename-4.0.1.old/src/CMakeLists.txt krename-4.0.1/src/CMakeLists.txt
+--- krename-4.0.1.old/src/CMakeLists.txt	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/src/CMakeLists.txt	2009-10-20 18:55:35.000000000 +0200
+@@ -25,7 +25,6 @@
+   batchrenamer.cpp
+   customdialog.cpp
+   datetimeplugin.cpp
+-  exiv2plugin.cpp
+   exthistorycombo.cpp
+   filedialogextwidget.cpp
+   fileplugin.cpp
+@@ -51,6 +50,13 @@
+   translitplugin.cpp
+   )
+ 
++IF ( EXIV2_FOUND )
++	SET(krename_SRCS
++		${krename_SRCS}
++		exiv2plugin.cpp
++	)
++ENDIF ( EXIV2_FOUND )
++
+ IF ( TAGLIB_FOUND )
+ 	SET(krename_SRCS 
+ 		${krename_SRCS}
+diff -urN krename-4.0.1.old/src/pluginloader.cpp krename-4.0.1/src/pluginloader.cpp
+--- krename-4.0.1.old/src/pluginloader.cpp	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/src/pluginloader.cpp	2009-10-20 18:58:44.000000000 +0200
+@@ -21,7 +21,9 @@
+ #include "plugin.h"
+ 
+ #include "datetimeplugin.h"
++#ifdef WITH_EXIV2
+ #include "exiv2plugin.h"
++#endif
+ #include "fileplugin.h"
+ #include "increasecounterplugin.h"
+ #include "permissionsplugin.h"
+@@ -125,7 +127,7 @@
+ #ifndef _WIN32
+     m_plugins.append( new DateTimePlugin( this ) );
+ #endif // _WIN32
+-#ifdef HAVE_EXIV2
++#ifdef WITH_EXIV2
+     m_plugins.append( new Exiv2Plugin( this ) );
+ #endif // HAVE_EXIV2
+ 	m_plugins.append( new IncreaseCounterPlugin( this ) );
diff --git a/kde-misc/krename/krename-4.0.1.ebuild b/kde-misc/krename/krename-4.0.1.ebuild
index 8b511a398f31..bc46987ba6b2 100644
--- a/kde-misc/krename/krename-4.0.1.ebuild
+++ b/kde-misc/krename/krename-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.1.ebuild,v 1.4 2009/10/18 18:21:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.1.ebuild,v 1.5 2009/10/20 17:05:13 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/4.0.0-fix_automagicness.patch
 	"${FILESDIR}"/4.0.0-fix_taglib_support.patch
+	"${FILESDIR}"/4.0.0-fix_exiv2_support.patch
 )
 
 src_configure() {