diff options
| -rw-r--r-- | app-text/convmv/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/convmv/Manifest | 20 | ||||
| -rw-r--r-- | app-text/convmv/convmv-1.10.ebuild | 15 | ||||
| -rw-r--r-- | app-text/convmv/files/convmv-1.10-testcase-cleanup.patch | 75 |
4 files changed, 105 insertions, 11 deletions
diff --git a/app-text/convmv/ChangeLog b/app-text/convmv/ChangeLog index f79e183edcdb..8078a9988954 100644 --- a/app-text/convmv/ChangeLog +++ b/app-text/convmv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/convmv # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.21 2006/10/13 10:41:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.22 2006/11/13 10:24:00 robbat2 Exp $ + + 13 Nov 2006; Robin H. Johnson <robbat2@gentoo.org> + +files/convmv-1.10-testcase-cleanup.patch, convmv-1.10.ebuild: + Bug #151071, fix testsuite making assumptions about filesystem. 13 Oct 2006; Markus Rothe <corsair@gentoo.org> convmv-1.09.ebuild: Stable on ppc64 diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest index c64439967dab..dbd6d6c91914 100644 --- a/app-text/convmv/Manifest +++ b/app-text/convmv/Manifest @@ -1,3 +1,7 @@ +AUX convmv-1.10-testcase-cleanup.patch 2977 RMD160 94cd532743c3c5628a029e0525e5cb19616884ea SHA1 0c19a89fa82377da2232eb3f2cd44b85004ad84e SHA256 225dea4962c9e4dc653d467d8824ae86f579d9fe49bae9869b83f2225675f709 +MD5 08654efe8c576ae80c51a58a01589d47 files/convmv-1.10-testcase-cleanup.patch 2977 +RMD160 94cd532743c3c5628a029e0525e5cb19616884ea files/convmv-1.10-testcase-cleanup.patch 2977 +SHA256 225dea4962c9e4dc653d467d8824ae86f579d9fe49bae9869b83f2225675f709 files/convmv-1.10-testcase-cleanup.patch 2977 DIST convmv-1.05.tar.gz 16501 RMD160 2c3d09c7fe10782d85689ec96869e57dfeca9439 SHA1 06d720dd7e0bd768c700ebc9f30543b84aa61737 SHA256 4a0d1f1dc815906b3ad1d10da0902dd9068f7b6467b4e261e7a4ebcdc3880efa DIST convmv-1.08.tar.gz 20657 DIST convmv-1.09.tar.gz 21003 RMD160 f4164d07f2c4886003f8e6ca14334a5ab318e9e7 SHA1 b8d44519a1110a620afe37d367f0f31542156880 SHA256 e992cf5bd0abdc6a6d2cae54f9c73651cda0817113a88c381ac19bc85f48ea65 @@ -14,14 +18,14 @@ EBUILD convmv-1.09.ebuild 678 RMD160 1d650ee9fde906fc3784d34bf376ca04fa73daab SH MD5 8b0b5507e861ac12d26aa34a21e6ba1a convmv-1.09.ebuild 678 RMD160 1d650ee9fde906fc3784d34bf376ca04fa73daab convmv-1.09.ebuild 678 SHA256 e818ff210d9555c5199f79cfd99a64740c2298c151ee96405aff1e3caa0eb8c4 convmv-1.09.ebuild 678 -EBUILD convmv-1.10.ebuild 683 RMD160 7327e7c1d7d3f5d78fcf34379ad940e4c493118e SHA1 7a77f5d4cae1a6055aba59a439a912c1b302ce5c SHA256 a89564ad4e1eeaa17e363447b404f5283e9af00595966f98f02c9d4125fa7f81 -MD5 b4a4488bad4c34605e7e3d68165d155e convmv-1.10.ebuild 683 -RMD160 7327e7c1d7d3f5d78fcf34379ad940e4c493118e convmv-1.10.ebuild 683 -SHA256 a89564ad4e1eeaa17e363447b404f5283e9af00595966f98f02c9d4125fa7f81 convmv-1.10.ebuild 683 -MISC ChangeLog 2170 RMD160 841beb5e80740896e8b9ce0eeeb63e9c93b5ea81 SHA1 1029190e961442bf9bf2a5a601ef59f6e461252f SHA256 ad43b22810038281a1f2bcc0b7f0d0caef9bbe5322f3c6f51e25968bbb4cd228 -MD5 594437db1a87d79156e26df5499fca9a ChangeLog 2170 -RMD160 841beb5e80740896e8b9ce0eeeb63e9c93b5ea81 ChangeLog 2170 -SHA256 ad43b22810038281a1f2bcc0b7f0d0caef9bbe5322f3c6f51e25968bbb4cd228 ChangeLog 2170 +EBUILD convmv-1.10.ebuild 906 RMD160 9698d3779e6c84e65da8b3f21e6801243310931c SHA1 6fb2118b9bf7d23a997546a29cc24abb412058ea SHA256 db59ed10e311ef62b02488323636f3bef41d5dffa63fe29e18869f25139ebb68 +MD5 9cd2a00db334490356776da05c566922 convmv-1.10.ebuild 906 +RMD160 9698d3779e6c84e65da8b3f21e6801243310931c convmv-1.10.ebuild 906 +SHA256 db59ed10e311ef62b02488323636f3bef41d5dffa63fe29e18869f25139ebb68 convmv-1.10.ebuild 906 +MISC ChangeLog 2355 RMD160 e5d9a0fad78e367c389ebc26a165222e97e7fb97 SHA1 1b51173e83d3c744c6f791c48017b329a4cc5b5d SHA256 31a239ede8cb718719a9f5a23c6999ccf96678c90aac6d69db8681519dafcf3f +MD5 2761eee36c134e78e7985c400b5a4004 ChangeLog 2355 +RMD160 e5d9a0fad78e367c389ebc26a165222e97e7fb97 ChangeLog 2355 +SHA256 31a239ede8cb718719a9f5a23c6999ccf96678c90aac6d69db8681519dafcf3f ChangeLog 2355 MISC metadata.xml 227 RMD160 f5f0634a711ba86e4b09a18d7041a19d63c9dab7 SHA1 c1ce24553570154843237270b9f43c304d03073b SHA256 f8502ce290838ee791f56f0024d4180c8b6dc32dc7df01d1b6c50519050147f7 MD5 b5272451fe6c08bef4dd8feef9c335c8 metadata.xml 227 RMD160 f5f0634a711ba86e4b09a18d7041a19d63c9dab7 metadata.xml 227 diff --git a/app-text/convmv/convmv-1.10.ebuild b/app-text/convmv/convmv-1.10.ebuild index ce325f1b20fb..5a559c74a0b6 100644 --- a/app-text/convmv/convmv-1.10.ebuild +++ b/app-text/convmv/convmv-1.10.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 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.2 2006/10/02 22:36:05 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.10.ebuild,v 1.3 2006/11/13 10:24:00 robbat2 Exp $ + +inherit eutils DESCRIPTION="convert filenames to utf8 or any other charset" HOMEPAGE="http://j3e.de/linux/convmv" @@ -19,5 +21,14 @@ src_compile() { src_install() { einstall DESTDIR=${D} PREFIX=/usr || die "einstall failed" - dodoc CREDITS Changes GPL2 TODO VERSION testsuite.tar + dodoc CREDITS Changes TODO VERSION +} + +src_test() { + cd ${S} + tar xf 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/files/convmv-1.10-testcase-cleanup.patch b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch new file mode 100644 index 000000000000..208eaa33103b --- /dev/null +++ b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch @@ -0,0 +1,75 @@ +--- 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 ... |