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

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

8 files changed, 23 insertions, 217 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/Manifest b/kde-misc/krename/Manifest
index 85ed553318d2..4d9967c93958 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,11 +1,14 @@
-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
-DIST krename-4.0.1.tar.bz2 214259 RMD160 de55c0ccb20432c6001650728f5fb4e134f048a1 SHA1 b4d2ab43836a43224f69c9767c7ff14fffdea6b7 SHA256 42ccdaeb7c261a366b43bbce5edb6584516e8506c3ba71314049103dbef168f9
-DIST krename-4.0.2.tar.bz2 219610 RMD160 6cf346aa3d4ba86d317573261aa8e8f4025e77fa SHA1 cc605e7e7c539fcb84f531260be7264cbcd1a687 SHA256 71119c5de54162fcb925657b6fa3d0986b17d8b65534b5e3faf9187303ccb4ab
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST krename-4.0.3.tar.bz2 221515 RMD160 cb246d8491bf8e16556d7b94589849699e516db4 SHA1 bd0d4317f5a01469c2fe7a111ece9191ee57fb0b SHA256 9a8f6903faf734423eef6cc42e9cc1a59071e0b8d09ea3a8fc38a60627e51d54
-EBUILD krename-4.0.1.ebuild 959 RMD160 9bd8e4bdb6634aa660dc6f72ee10e82c69121d77 SHA1 95a118b8acee9af6f3ad451677c316b39f253585 SHA256 d1f1cdfce06e9f145be31e23d611b818d96dfa6173ef68b05e920dfb12728888
-EBUILD krename-4.0.2.ebuild 795 RMD160 bec5e1c5f8dd8f28056368a86e96fcc70ba4ba2d SHA1 edef32b718c2f0a98988c01100d23f1ec4ddf3bf SHA256 df76fe3e1ad5e0fc3a0ed5d48366e04350693eb444fad9899866b6cb59c1c42c
-EBUILD krename-4.0.3.ebuild 796 RMD160 63c779b79ac40c718c1228ce40d50d0bc375d217 SHA1 cf821db6a072e1ad2a2e7643631e957850434f44 SHA256 ec885dc64ae5c251025d3da3d5c979d8ec6127dc7bd9a5461c031c78072bcd01
-MISC ChangeLog 11901 RMD160 d5d15c43ba4be344d4e2646f57cb633d547068b3 SHA1 4df77833a65ef826b0968c4533c303fbf1abeb56 SHA256 b9d60e3d2675db0b15ff9447fe92ad6cc79a214a0dcf5702824d6c0a996ca566
+EBUILD krename-4.0.3.ebuild 794 RMD160 909f1b06f114904d43450bfda6397895a9b04a63 SHA1 c0b1bb22cc59e420e5c7e9aff2729e74309d6eb4 SHA256 330d00dd9c74093be018303646b1d90d88cb845ff083d75c80888a802c62c0e2
+MISC ChangeLog 12200 RMD160 31281d8a3c55bc33422d8184001a9d862b583efa SHA1 ca682c4ae6bba56c303d49af9c61a8f067a6a884 SHA256 51a6de75af1eb63beeb7079185ad666d210f2984e4af2faa7c01feff26a29d75
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwfpDEACgkQHB6c3gNBRYcDTgCfeRtXQRKfK4vJMHhiELRdC058
+4lQAoK4z6/MoeXFitV5/nrBqSv6TbZQO
+=yreP
+-----END PGP SIGNATURE-----
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 )