6 files changed, 127 insertions, 26 deletions
diff --git a/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog
index e80fecbd6482..1f2b52778052 100644
--- a/kde-misc/krename/ChangeLog
+++ b/kde-misc/krename/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2009/06/01 18:07:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.50 2009/09/24 14:47:18 scarabeus Exp $
+
+*krename-4.0.0 (24 Sep 2009)
+
+  24 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.0.0-fix_automagicness.patch, -krename-3.9.3.ebuild,
+  +files/4.0.0-fix_taglib_support.patch, +krename-4.0.0.ebuild:
+  Version bump. Remove old.
 
 *krename-3.9.3 (01 Jun 2009)
 
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 326d09156715..30473e76cc2c 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,9 +1,11 @@
+AUX 4.0.0-fix_automagicness.patch 797 RMD160 de940673e2de81d5e8a93932e40eef38255bd4ce SHA1 f4dfdb392474cbc312ff83e9de7ef01fff81b601 SHA256 8429bce9fad196ef298fa85d2c9ac04b9c3b8e9dd8946c246f18b8bb63a4c4b3
+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
 DIST krename-3.0.14.tar.bz2 712821 RMD160 ba427cd1bb2746f45953122ea5dc872aaf24dfe3 SHA1 64a4a1aed5229f1b1534145ff33cfb21469ea5b9 SHA256 44b89bf2048472702a720b2318843f5f3eb2e904aec4222083b55b471f584355
-DIST krename-3.9.3.tar.bz2 202159 RMD160 70ad683ac3b653c961d4b455ac17bf8a20870f6c SHA1 ed9e68371b86b67951f2f35659301a15554ea74a SHA256 4c3243a624820d3a537adc078e65475f38ef08860a6c66e7947d94451c80bfa2
+DIST krename-4.0.0.tar.bz2 217301 RMD160 55bfc7d3d2197e15a0b494eb788ee2969dd30178 SHA1 8fee1aa5e235c78a621680eee007d39f2bafa5c5 SHA256 6c79dff6e159e3c862e4aacd31da70c1c2d16f98acbef0b4871ff212ea60f36f
 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-3.9.3.ebuild 557 RMD160 b9ff9b5cf6ab1ba6b11ba53ee1717d0837a268f1 SHA1 668f70aafa54635f4a41bcbffaf9232a0eeaa09e SHA256 9ff0fd373fbb17778d8788d709927ce048ac565a5a32d80d3cdf63ae015be4da
-MISC ChangeLog 10714 RMD160 b10c1f2b25cb739c14344fa188e6d1ee4dc669b1 SHA1 ea00540df929a5a6dcd1530ccba4ac17223eae8b SHA256 e9521dbdceec25f63ef796c77e7dbb11f50fee246da47a9167cf2c5e70966b14
+EBUILD krename-4.0.0.ebuild 894 RMD160 7ab42e5c1a18eb646d2f42f3237e6222f0f6eba1 SHA1 fe579955f1511422cf85ea523b0a757a6c5618b6 SHA256 ab09b7f01388212b38346cf14841bc8ba1717234027f86c7c796914d600861b3
+MISC ChangeLog 10955 RMD160 02a08b9732a1548173628ef747f081803e3d1678 SHA1 1cf384921f8419654034235adc2a4441a175c643 SHA256 b2f5e6374dc64b2b1993dfdb9377ab580d8684af73c49f475613089bfa74f2a6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/krename/files/4.0.0-fix_automagicness.patch b/kde-misc/krename/files/4.0.0-fix_automagicness.patch
new file mode 100644
index 000000000000..0cbeb50d2392
--- /dev/null
+++ b/kde-misc/krename/files/4.0.0-fix_automagicness.patch
@@ -0,0 +1,21 @@
+diff -urN krename-4.0.0.old/CMakeLists.txt krename-4.0.0/CMakeLists.txt
+--- krename-4.0.0.old/CMakeLists.txt	2009-08-26 22:39:28.000000000 +0200
++++ krename-4.0.0/CMakeLists.txt	2009-09-24 16:34:21.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ # Find taglib
+ set(TAGLIB_MIN_VERSION "1.5")
+-find_package(Taglib REQUIRED)
++macro_optional_find_package(Taglib REQUIRED)
+ macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.5.0" "")
+ 
+ IF(TAGLIB_FOUND)
+@@ -29,7 +29,7 @@
+ 
+ # Find exiv2
+ set(EXIV2_MIN_VERSION "0.13") # AccessMode was added in 0.13
+-find_package(Exiv2)
++macro_optional_find_package(Exiv2)
+ macro_log_feature(EXIV2_FOUND "Exiv2" "A library to access image metadata" "http://www.exiv2.org" FALSE "")
+ 
+ IF(EXIV2_FOUND)
diff --git a/kde-misc/krename/files/4.0.0-fix_taglib_support.patch b/kde-misc/krename/files/4.0.0-fix_taglib_support.patch
new file mode 100644
index 000000000000..5c7a80f66be4
--- /dev/null
+++ b/kde-misc/krename/files/4.0.0-fix_taglib_support.patch
@@ -0,0 +1,56 @@
+diff -urN krename-4.0.0.orig/CMakeLists.txt krename-4.0.0/CMakeLists.txt
+--- krename-4.0.0.orig/CMakeLists.txt	2009-09-24 16:35:53.000000000 +0200
++++ krename-4.0.0/CMakeLists.txt	2009-09-24 16:42:17.000000000 +0200
+@@ -22,6 +22,7 @@
+ macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.5.0" "")
+ 
+ IF(TAGLIB_FOUND)
++  ADD_DEFINITIONS( -DWITH_TAGLIB )
+   MESSAGE("-- The tablib library was found. KRename will be built with tablib support.")
+ ELSE(TAGLIB_FOUND)
+   MESSAGE("-- The tablib library was not found. KRename will not be built with tablib support.")
+diff -urN krename-4.0.0.orig/src/CMakeLists.txt krename-4.0.0/src/CMakeLists.txt
+--- krename-4.0.0.orig/src/CMakeLists.txt	2009-09-24 16:35:53.000000000 +0200
++++ krename-4.0.0/src/CMakeLists.txt	2009-09-24 16:37:30.000000000 +0200
+@@ -47,11 +47,17 @@
+   replacedialog.cpp
+   scriptplugin.cpp
+   systemplugin.cpp
+-  taglibplugin.cpp
+   tokenhelpdialog.cpp
+   translitplugin.cpp
+   )
+ 
++IF ( TAGLIB_FOUND )
++	SET(krename_SRCS 
++		${krename_SRCS}
++		taglibplugin.cpp
++	)
++ENDIF ( TAGLIB_FOUND )
++
+ kde4_add_ui_files( krename_SRCS 
+   customfilenamedlg.ui		
+   datetimepluginwidget.ui
+diff -urN krename-4.0.0.orig/src/pluginloader.cpp krename-4.0.0/src/pluginloader.cpp
+--- krename-4.0.0.orig/src/pluginloader.cpp	2009-09-24 16:35:53.000000000 +0200
++++ krename-4.0.0/src/pluginloader.cpp	2009-09-24 16:41:19.000000000 +0200
+@@ -27,7 +27,9 @@
+ #include "permissionsplugin.h"
+ #include "scriptplugin.h"
+ #include "systemplugin.h"
++#ifdef WITH_TAGLIB 
+ #include "taglibplugin.h"
++#endif
+ #include "translitplugin.h"
+ 
+ #include "../config-krename.h"
+@@ -132,7 +134,9 @@
+ #endif // _WIN32
+     m_plugins.append( new ScriptPlugin( this ) );
+     m_plugins.append( new SystemPlugin( this ) );
++#ifdef WITH_TAGLIB
+     m_plugins.append( new TagLibPlugin( this ) );
++#endif
+     m_plugins.append( new TranslitPlugin( this ) );
+     //this->loadFilePlugins();
+ 
diff --git a/kde-misc/krename/krename-3.9.3.ebuild b/kde-misc/krename/krename-3.9.3.ebuild
deleted file mode 100644
index 0a5ad2fb8367..000000000000
--- a/kde-misc/krename/krename-3.9.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-3.9.3.ebuild,v 1.1 2009/06/01 18:07:43 scarabeus Exp $
-
-EAPI="2"
-
-inherit kde4-base
-
-DESCRIPTION="KRename - a very powerful batch file renamer."
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/taglib-1.5"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:0
-	!${CATEGORY}/${PN}:4.1
-"
diff --git a/kde-misc/krename/krename-4.0.0.ebuild b/kde-misc/krename/krename-4.0.0.ebuild
new file mode 100644
index 000000000000..a183a1006b77
--- /dev/null
+++ b/kde-misc/krename/krename-4.0.0.ebuild
@@ -0,0 +1,37 @@
+# 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.0.ebuild,v 1.1 2009/09/24 14:47:18 scarabeus Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="bs cs de es fr hu it ja nl pl pt_BR ru sl sv tr uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="KRename - a very powerful batch file renamer."
+HOMEPAGE="http://www.krename.net/"
+SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="taglib exif"
+
+DEPEND="
+	exif? ( >=media-gfx/exiv2-0.13 )
+	taglib? ( >=media-libs/taglib-1.5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_automagicness.patch"
+	"${FILESDIR}/${PV}-fix_taglib_support.patch"
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with exif EXIV2)
+		$(cmake-utils_use_with taglib)
+	"
+
+	kde4-base_src_configure
+}