Stable on amd64 and x86. Per bug #324573. Drop old.

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

7 files changed, 11 insertions, 208 deletions

diff --git a/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog
index f57189eed347..b8c89f730a1b 100644
--- a/kde-misc/krename/ChangeLog
+++ b/kde-misc/krename/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2009/12/28 11:33:32 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.58 2010/06/21 17:42:22 scarabeus Exp $
+
+  21 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/4.0.0-fix_automagicness.patch, -krename-4.0.2.ebuild,
+  -files/4.0.0-fix_exiv2_support.patch, krename-4.0.3.ebuild,
+  -files/4.0.0-fix_taglib_support.patch, -krename-4.0.1.ebuild:
+  Stable on amd64 and x86. Per bug #324573. Drop old.
 
 *krename-4.0.3 (28 Dec 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
deleted file mode 100644
index 0cbeb50d2392..000000000000
--- a/kde-misc/krename/files/4.0.0-fix_automagicness.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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_exiv2_support.patch b/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
deleted file mode 100644
index 74204c004d03..000000000000
--- a/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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/files/4.0.0-fix_taglib_support.patch b/kde-misc/krename/files/4.0.0-fix_taglib_support.patch
deleted file mode 100644
index 5c7a80f66be4..000000000000
--- a/kde-misc/krename/files/4.0.0-fix_taglib_support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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-4.0.1.ebuild b/kde-misc/krename/krename-4.0.1.ebuild
deleted file mode 100644
index bc46987ba6b2..000000000000
--- a/kde-misc/krename/krename-4.0.1.ebuild
+++ /dev/null
@@ -1,39 +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-4.0.1.ebuild,v 1.5 2009/10/20 17:05:13 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 )
-	!${CATEGORY}/${PN}:0
-"
-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() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with exif EXIV2)
-		$(cmake-utils_use_with taglib)
-	"
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/krename/krename-4.0.2.ebuild b/kde-misc/krename/krename-4.0.2.ebuild
deleted file mode 100644
index 5180e720f05c..000000000000
--- a/kde-misc/krename/krename-4.0.2.ebuild
+++ /dev/null
@@ -1,29 +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-4.0.2.ebuild,v 1.2 2009/12/28 11:33:32 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="debug exif taglib"
-
-DEPEND="exif? ( >=media-gfx/exiv2-0.13 )
-	taglib? ( >=media-libs/taglib-1.5 )"
-
-DOCS="AUTHORS README TODO"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with exif EXIV2)
-		$(cmake-utils_use_with taglib)"
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/krename/krename-4.0.3.ebuild b/kde-misc/krename/krename-4.0.3.ebuild
index 542c92009ce5..4be40112b7d8 100644
--- a/kde-misc/krename/krename-4.0.3.ebuild
+++ b/kde-misc/krename/krename-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.3.ebuild,v 1.1 2009/12/28 11:33:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.3.ebuild,v 1.2 2010/06/21 17:42:22 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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug exif taglib"
 
 DEPEND="exif? ( >=media-gfx/exiv2-0.13 )