Version bump. Remove old.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

5 files changed, 122 insertions, 23 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/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
+}