1.10 failed to convert some files for me. 1.15 work. Tested on ppc, ppc64 s390x x86 and amd64, commiting stable on all arches and removing old.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

6 files changed, 11 insertions, 184 deletions

diff --git a/app-text/convmv/ChangeLog b/app-text/convmv/ChangeLog
index 8b00bcbd36bc..bd450e94806b 100644
--- a/app-text/convmv/ChangeLog
+++ b/app-text/convmv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/convmv
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.39 2012/02/21 08:35:47 robbat2 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.40 2013/02/10 20:22:51 scarabeus Exp $
+
+  10 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> -convmv-1.10.ebuild,
+  -convmv-1.12.ebuild, -convmv-1.14.ebuild,
+  -files/convmv-1.10-testcase-cleanup.patch, convmv-1.15.ebuild:
+  1.10 failed to convert some files for me. 1.15 work. Tested on ppc, ppc64
+  s390x x86 and amd64, commiting stable on all arches and removing old.
 
 *convmv-1.15 (21 Feb 2012)
 
@@ -130,4 +136,3 @@
   08 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> convmv-1.05.ebuild,
   metadata.xml:
   initial commit
-
diff --git a/app-text/convmv/convmv-1.10.ebuild b/app-text/convmv/convmv-1.10.ebuild
deleted file mode 100644
index b5b09a51473a..000000000000
--- a/app-text/convmv/convmv-1.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.10.ebuild,v 1.15 2011/02/06 05:44:18 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX=/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-	# Never make assumptions as to the ordering of files inside a directory!
-	epatch "${FILESDIR}"/${PN}-1.10-testcase-cleanup.patch
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/convmv-1.12.ebuild b/app-text/convmv/convmv-1.12.ebuild
deleted file mode 100644
index 287b7325cca7..000000000000
--- a/app-text/convmv/convmv-1.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.12.ebuild,v 1.1 2008/06/07 01:53:16 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX=/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	# Patch merged by upstream
-	# Never make assumptions as to the ordering of files inside a directory!
-	#EPATCH_OPTS="-d ${S}/suite/" epatch "${FILESDIR}"/${PN}-1.10-testcase-cleanup.patch
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/convmv-1.14.ebuild b/app-text/convmv/convmv-1.14.ebuild
deleted file mode 100644
index d8970d9fbba1..000000000000
--- a/app-text/convmv/convmv-1.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.14.ebuild,v 1.2 2010/02/21 03:53:20 abcd Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX="${EPREFIX}"/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/convmv-1.15.ebuild b/app-text/convmv/convmv-1.15.ebuild
index bb7d97a4319e..6b67c902bb6a 100644
--- a/app-text/convmv/convmv-1.15.ebuild
+++ b/app-text/convmv/convmv-1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.15.ebuild,v 1.1 2012/02/21 08:35:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.15.ebuild,v 1.2 2013/02/10 20:22:51 scarabeus Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
deleted file mode 100644
index 208eaa33103b..000000000000
--- a/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- convmv-1.10.orig/suite/dotests.sh	2006-06-25 15:01:16.000000000 -0700
-+++ convmv-1.10/suite/dotests.sh	2006-11-13 02:18:13.373820717 -0800
-@@ -3,62 +3,62 @@
- # you might want to change this to GNU find's full path:
- FIND=find
- FINDEXP="%P -- %l\n"
--for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
-+for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
- #
- echo smartness-test
- rm -rf test.tmp
- cp -r test test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
- false
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
- #
- echo double-utf8 test
- ../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
- #
- ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
- #
- echo utf8-to-iso8859-15-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
- #
- echo iso8859-15-to-utf8-test
- rm -r test.tmp
- cp -r test-iso8859-15 test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
- #
- echo nfc-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
- #
- ../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
- #
- echo escaped-test
- rm -r test.tmp
- cp -r test-escaped test.tmp
- ../convmv --unescape --notest -r test.tmp
--$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
- #
- echo upper-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv --upper -f utf8 --notest -r test.tmp
--$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
-+$FIND TEST.TMP -printf "$FINDEXP" |sort >out.tmp
- diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
- 
- echo All tests successful, cleaning up now ...