Convert iconv to a more portable syntax, and add virtual/libiconv dependency at buildtime for the iconv command.

Package-Manager: portage-2.1.2_rc2-r2

3 files changed, 28 insertions, 12 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index dc70c7f69666..9fd276b1df24 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.11 2006/10/17 22:44:53 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.12 2006/11/27 15:57:31 flameeyes Exp $
+
+  27 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> exiv2-0.11.ebuild:
+  Convert iconv to a more portable syntax, and add virtual/libiconv dependency
+  at buildtime for the iconv command.
 
   17 Oct 2006; Stefan Briesenick <sbriesen@gentoo.org> exiv2-0.9.1.ebuild,
   exiv2-0.10-r1.ebuild, exiv2-0.11.ebuild:
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index dbbf957dc428..5ad22074e92b 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exiv2-0.10-jpgimage.diff 710 RMD160 694f22e4e05aff1c6b49ead7b24f9437eb22298b SHA1 1c230a7315674f3a3b7c0363a96d1404a7e1e3c2 SHA256 2b2e641c9162159dc2e7ba85122585e96dbf86f7e7b6dbfe04b877badf51ed9a
 MD5 76171ce5e20ca1d1613e9a41b316cd0a files/exiv2-0.10-jpgimage.diff 710
 RMD160 694f22e4e05aff1c6b49ead7b24f9437eb22298b files/exiv2-0.10-jpgimage.diff 710
@@ -9,18 +12,18 @@ EBUILD exiv2-0.10-r1.ebuild 916 RMD160 454eaea83b1b2634731611713700c94aa801132f
 MD5 64109ca4378d9145ef8f4715b2af7a28 exiv2-0.10-r1.ebuild 916
 RMD160 454eaea83b1b2634731611713700c94aa801132f exiv2-0.10-r1.ebuild 916
 SHA256 5fa6da5666effbcce96921d007a37fda598cea65845f359d7827abd7a3006853 exiv2-0.10-r1.ebuild 916
-EBUILD exiv2-0.11.ebuild 872 RMD160 40d478bbb2bb60019fe41042c9092c0d0ccf8a9c SHA1 52411480093193e3864ff31155141f66960d13cd SHA256 4e8127e7ce83820cd20193976c2f01ef1f4fd6764f20f0adee99cb5db3e689ba
-MD5 ca51845c77806f39be81a1a76de4a0fc exiv2-0.11.ebuild 872
-RMD160 40d478bbb2bb60019fe41042c9092c0d0ccf8a9c exiv2-0.11.ebuild 872
-SHA256 4e8127e7ce83820cd20193976c2f01ef1f4fd6764f20f0adee99cb5db3e689ba exiv2-0.11.ebuild 872
+EBUILD exiv2-0.11.ebuild 915 RMD160 e32a90dca67e4e03f8806deeb492063871d09a7b SHA1 36bb6205deb8369063ccbba28035202262ea5ca4 SHA256 53db00fa9d444b84a0add0d014e72dad20fcc20b73a2db9e70425ad992d92026
+MD5 522098aa2e2c4254618f37a325403b73 exiv2-0.11.ebuild 915
+RMD160 e32a90dca67e4e03f8806deeb492063871d09a7b exiv2-0.11.ebuild 915
+SHA256 53db00fa9d444b84a0add0d014e72dad20fcc20b73a2db9e70425ad992d92026 exiv2-0.11.ebuild 915
 EBUILD exiv2-0.9.1.ebuild 637 RMD160 59016315a3528de527bb16d518b73b8200957b79 SHA1 6b92bc2fe39eab69ec769c9918e453be0f7738e6 SHA256 22029954b42fd73dcbd0c0096e36f3ed2051cd44f5b4492a1bb77db1a629eb42
 MD5 90f97e9c92801c5a80320d98884d1cfc exiv2-0.9.1.ebuild 637
 RMD160 59016315a3528de527bb16d518b73b8200957b79 exiv2-0.9.1.ebuild 637
 SHA256 22029954b42fd73dcbd0c0096e36f3ed2051cd44f5b4492a1bb77db1a629eb42 exiv2-0.9.1.ebuild 637
-MISC ChangeLog 1601 RMD160 1a814c6927495313be612cfb1299bd2a568f3bce SHA1 b54fa49c58d7cfb622b80bf1e6a8765492cd6153 SHA256 da64e826e9bb27bf9640e5b4dd3794b0b620572f38cdeb2d56a0b7bc31c2c562
-MD5 0948fae1c2ebaa3412b4396c97c65e28 ChangeLog 1601
-RMD160 1a814c6927495313be612cfb1299bd2a568f3bce ChangeLog 1601
-SHA256 da64e826e9bb27bf9640e5b4dd3794b0b620572f38cdeb2d56a0b7bc31c2c562 ChangeLog 1601
+MISC ChangeLog 1792 RMD160 b247c4cad7b13b3e99426e923334c67e6981dc4f SHA1 2ea3419296baa7bcdf1e69790c31e325b3db522e SHA256 d4db2025aa963d477c6fc95ffba0ed66fca802b8d3b15ed96d52639a1959d63a
+MD5 78134967bf5193cc6646cb9e51e9f086 ChangeLog 1792
+RMD160 b247c4cad7b13b3e99426e923334c67e6981dc4f ChangeLog 1792
+SHA256 d4db2025aa963d477c6fc95ffba0ed66fca802b8d3b15ed96d52639a1959d63a ChangeLog 1792
 MISC metadata.xml 387 RMD160 a39fbeaf5cdd2c1fa53275f5992eb854d9b68376 SHA1 9d36b8e2a13e6d79ba2f7f9d3375b9df4d8ab62e SHA256 e71c1b4b233bfb1b0db47dd829fb579559945f1cc60a8d070900fb20271a6045
 MD5 78f505e7067d34a3788aa0b63cb2cc1b metadata.xml 387
 RMD160 a39fbeaf5cdd2c1fa53275f5992eb854d9b68376 metadata.xml 387
@@ -34,3 +37,10 @@ SHA256 8af984c2e8df3ac2a2a6608a196d195fad557dcbaa7f24680da080f370aa6b2d files/di
 MD5 b8d240cc8285c0e096aa2af1f3e8b434 files/digest-exiv2-0.9.1 238
 RMD160 e340add6a03370dd2103233f6179e708e44cfd4a files/digest-exiv2-0.9.1 238
 SHA256 0a0c622a715cb6064236fed781699d855d0c26785b29cc09a4cd9f2d7ca068e0 files/digest-exiv2-0.9.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFawryAiZjviIA2XgRAmHfAJ9bn+2dF5pmQTpvy6CVQIPKH0AhdACfedZw
+ORLEV/yiH+BkMbqy74Y/3LY=
+=Hc4T
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/exiv2/exiv2-0.11.ebuild b/media-gfx/exiv2/exiv2-0.11.ebuild
index 8b53f473ea68..bb103ae0f7a1 100644
--- a/media-gfx/exiv2/exiv2-0.11.ebuild
+++ b/media-gfx/exiv2/exiv2-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.11.ebuild,v 1.2 2006/10/17 22:44:53 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.11.ebuild,v 1.3 2006/11/27 15:57:31 flameeyes Exp $
 
 inherit eutils
 
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc unicode"
 
-DEPEND="sys-libs/zlib"
+DEPEND="sys-libs/zlib
+	virtual/libiconv"
+RDEPEND="sys-libs/zlib"
 
 src_unpack() {
 	unpack ${A}
@@ -22,7 +24,7 @@ src_unpack() {
 	if use unicode; then
 		einfo "Converting docs to UTF-8"
 		for i in doc/cmd.txt; do
-			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+			iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
 		done
 	fi
 }