Fix language iconv conversion to unicode and LICENSE to GPL-3 wrt Comment #5 in #170984, thanks to James Rowe.

Package-Manager: portage-2.1.4

3 files changed, 27 insertions, 36 deletions

diff --git a/app-text/diction/ChangeLog b/app-text/diction/ChangeLog
index 49b274eb9ae9..b256a9f9e959 100644
--- a/app-text/diction/ChangeLog
+++ b/app-text/diction/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/diction
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/diction/ChangeLog,v 1.27 2007/12/25 14:49:17 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/diction/ChangeLog,v 1.28 2008/01/16 10:26:18 drac Exp $
+
+  16 Jan 2008; Samuli Suominen <drac@gentoo.org> diction-1.11.ebuild:
+  Fix language iconv conversion to unicode and LICENSE to GPL-3 wrt Comment #5
+  in #170984, thanks to James Rowe.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing seemant from metadata.xml as per #202469. Assigning to
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index 811a9557bd65..b7fbe46fefa0 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX diction-1.07-style-fail-on-bad-lang.patch 638 RMD160 d7f16745a04a616cbad4c58aaae0c966135f67c3 SHA1 63a5dce01bd6b14cea441d99d2f122cdeb3df69c SHA256 f187a17b59d939779d649309340a0e412504f4198d0e58bbefd3bda7fb077730
 MD5 bb5337817cbef99ec5582625456212c1 files/diction-1.07-style-fail-on-bad-lang.patch 638
 RMD160 d7f16745a04a616cbad4c58aaae0c966135f67c3 files/diction-1.07-style-fail-on-bad-lang.patch 638
@@ -10,14 +7,14 @@ MD5 fb47492491f07382defc5427feda7273 files/diction-1.09-style-fail-on-bad-lang.p
 RMD160 702ca3937eac232f990439e1ecb62a2d44b53b0c files/diction-1.09-style-fail-on-bad-lang.patch 636
 SHA256 cf4d1b09e25a3356c4528aaa5270cf5debbeac217a9e53d8c69d3c7691fa9f63 files/diction-1.09-style-fail-on-bad-lang.patch 636
 DIST diction-1.11.tar.gz 141062 RMD160 c054eb3eb2ffec54d1d48f9e33f138e41c0d4429 SHA1 30c7c778959120d30fa67be9261d41de894f498b SHA256 35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6
-EBUILD diction-1.11.ebuild 924 RMD160 b80e21d8d72aa30d0b2cc5f2b8350db66255f244 SHA1 833d3714150d74ca4b78e8fec64e2c374034b52f SHA256 1d56933f79a0dc96959d10a0f5f0455e282a1b28591828f9ab16c50a1723522f
-MD5 cd48c29162441286f09e3936033849d8 diction-1.11.ebuild 924
-RMD160 b80e21d8d72aa30d0b2cc5f2b8350db66255f244 diction-1.11.ebuild 924
-SHA256 1d56933f79a0dc96959d10a0f5f0455e282a1b28591828f9ab16c50a1723522f diction-1.11.ebuild 924
-MISC ChangeLog 3893 RMD160 28c7ef658b05e3970512a8b1c48ed9f80b00c9bd SHA1 bc964485dfab127a926b16316aa27d5b0f9b05d2 SHA256 929bec2cd9a84ae90684cfc59ea0fe103a3ef6f3172c05b7cc32b98c41680ac9
-MD5 2834dad287f57af496ef2c8e83ed6e1a ChangeLog 3893
-RMD160 28c7ef658b05e3970512a8b1c48ed9f80b00c9bd ChangeLog 3893
-SHA256 929bec2cd9a84ae90684cfc59ea0fe103a3ef6f3172c05b7cc32b98c41680ac9 ChangeLog 3893
+EBUILD diction-1.11.ebuild 843 RMD160 b91719b46ef15166e3666b64305cd8c970e48df2 SHA1 a30406f1ca105afc5e3d5c817f7ad14c187037da SHA256 250cc76201c4dc5fa7859ed84d1c37f74846e287eca2745e4327aacff04816dd
+MD5 f64d315badb9b8fd5f9f749f17350de1 diction-1.11.ebuild 843
+RMD160 b91719b46ef15166e3666b64305cd8c970e48df2 diction-1.11.ebuild 843
+SHA256 250cc76201c4dc5fa7859ed84d1c37f74846e287eca2745e4327aacff04816dd diction-1.11.ebuild 843
+MISC ChangeLog 4077 RMD160 0e2759c42234471381101b1a12e40a42c72263c1 SHA1 a1c67752108608de4df5feced28159ffeba103f5 SHA256 22a56b2ce6f59c8f33d9a9c02866ac7a0a61d6d3ce815e190ebbf8293dfbbf32
+MD5 bb252f706dab15289387e87c2cea0aff ChangeLog 4077
+RMD160 0e2759c42234471381101b1a12e40a42c72263c1 ChangeLog 4077
+SHA256 22a56b2ce6f59c8f33d9a9c02866ac7a0a61d6d3ce815e190ebbf8293dfbbf32 ChangeLog 4077
 MISC metadata.xml 923 RMD160 81a56f87971db00dae3a6b28500d394b3454c704 SHA1 3ac9de599b6e58504eb6551182947c0ffd5957d8 SHA256 d23c21d7ff8f36aef96e95a5b19b97bcdc45b9dfa3970fa01fb8322531cbe990
 MD5 22f7b6e5a5b1d660c816535a2172de77 metadata.xml 923
 RMD160 81a56f87971db00dae3a6b28500d394b3454c704 metadata.xml 923
@@ -25,10 +22,3 @@ SHA256 d23c21d7ff8f36aef96e95a5b19b97bcdc45b9dfa3970fa01fb8322531cbe990 metadata
 MD5 15f1e30d44f1234cb2f16a2719b3547c files/digest-diction-1.11 238
 RMD160 43a6fb91da8653f824ef97999a8b7d4e54be37e5 files/digest-diction-1.11 238
 SHA256 987dbd13dbfc436ff719081f9b2686e6b218ad67ac58558dce51236c7bd55412 files/digest-diction-1.11 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHcRlpyuNVb5qfaOYRAoZNAJ9HTLvGdXCXBuI83SQ6UhqOD8f48wCgxIGe
-Po6EgkM4RRnhU9lUilV8jMY=
-=UJbN
------END PGP SIGNATURE-----
diff --git a/app-text/diction/diction-1.11.ebuild b/app-text/diction/diction-1.11.ebuild
index 4bd8cb2d0d7a..58894b004bdb 100644
--- a/app-text/diction/diction-1.11.ebuild
+++ b/app-text/diction/diction-1.11.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.11.ebuild,v 1.2 2007/10/13 22:46:50 mr_bones_ Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 2 -)
+# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.11.ebuild,v 1.3 2008/01/16 10:26:18 drac Exp $
 
 DESCRIPTION="Diction and style checkers for english and german texts"
 HOMEPAGE="http://www.gnu.org/software/diction/diction.html"
-SRC_URI="http://www.moria.de/~michael/diction/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="unicode"
 
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
+DEPEND="sys-devel/gettext
+	virtual/libintl"
 
 src_unpack() {
-	unpack "${A}"; cd "${S}"
+	unpack ${A}
+	cd "${S}"
 	if use unicode; then
-		iconv -f ISO-8859-1 -t UTF-8 de > de.new || die "charset conversion failed."
-		mv de.new de
+		for lang in de nl; do
+			iconv -f ISO-8859-1 -t UTF-8 ${lang} > ${lang}.new || die "iconv failed."
+			mv ${lang}.new ${lang}
+		done
 	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc NEWS README
 }