Adding patch to resolve bug #118240

(Portage version: 2.1_pre4-r1)

5 files changed, 74 insertions, 14 deletions

diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog
index d4589e485047..af0d049c6d84 100644
--- a/app-text/iso-codes/ChangeLog
+++ b/app-text/iso-codes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/iso-codes
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.19 2006/02/07 05:11:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.20 2006/02/17 21:27:27 compnerd Exp $
+
+*iso-codes-0.49-r1 (17 Feb 2006)
+
+  17 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/iso-codes-0.49-fix-version.patch, +iso-codes-0.49-r1.ebuild:
+  Adding patch for version reporting.  Resolves bug #118240.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> iso-codes-0.49.ebuild:
   Mark 0.49 stable on alpha
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 6a20653a47be..8d90cc2acfa8 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ce355c3096bcbd90f729d86c33f49f20 ChangeLog 2594
-RMD160 a238f16e808e5d73e2f375e80ae2bec7201aec21 ChangeLog 2594
-SHA256 32fb8d64135d2383d8b445efb7901dd484c8740e11a6bddedc1284d5afc5aa31 ChangeLog 2594
+MD5 6cc7af786a43a89e677cca8856b7db00 ChangeLog 2816
+RMD160 8bcb317eb7a41169c9b56f82fbf766ba6e6f4d10 ChangeLog 2816
+SHA256 1cd06fda92cf38c0c20e7ccc69c4591bf7c205e5604baff736852839410cf9b2 ChangeLog 2816
 MD5 f0bffb8e6476f755092bfe57861f352f files/digest-iso-codes-0.47 72
 RMD160 7d122adb1f68e325e9d95190bcbafe6ceb98fd0f files/digest-iso-codes-0.47 72
 SHA256 b42ab5871052fb8b5149a7b68d706221f1807b07377b76d0088122dd668be2df files/digest-iso-codes-0.47 72
@@ -13,22 +10,24 @@ SHA256 b42ab5871052fb8b5149a7b68d706221f1807b07377b76d0088122dd668be2df files/di
 MD5 91c41799ad34136b5c3481feef989039 files/digest-iso-codes-0.49 72
 RMD160 cd1802c6895182554b6ef0b074dbb9344f21b5be files/digest-iso-codes-0.49 72
 SHA256 c09114ae68313c6d81331bb6665030504d31f65e2b89916487101f326d4b6065 files/digest-iso-codes-0.49 72
+MD5 cd1c05b2c3163b3e8edf553bd62894df files/digest-iso-codes-0.49-r1 262
+RMD160 4d65cd2121507935b86e64d23a4528f10294553b files/digest-iso-codes-0.49-r1 262
+SHA256 16fd3c30abf048eef9633bbfe17f0743b040f1be0250ac149402fd7f1f675e35 files/digest-iso-codes-0.49-r1 262
+MD5 b1b357693165a5d3d035c8dfdeabff32 files/iso-codes-0.49-fix-version.patch 321
+RMD160 ea926d147e7100a11792e8c54bc65a4e620ee2a1 files/iso-codes-0.49-fix-version.patch 321
+SHA256 391bbdcd494fbb3052927538416b44cc71347938fc165801c29eb671c7ab7337 files/iso-codes-0.49-fix-version.patch 321
 MD5 5f712fd7cbbd045a4ee0b06b6e466c43 iso-codes-0.47-r1.ebuild 867
 RMD160 554f2f49aba28ab0941967309c527186d74ca861 iso-codes-0.47-r1.ebuild 867
 SHA256 2fcf680d4e6fbb301daca5351b2f827b72b1d129845af622043838442b552ed7 iso-codes-0.47-r1.ebuild 867
 MD5 3db66b5bb868269ce04d441af6790a36 iso-codes-0.47.ebuild 830
 RMD160 4ce1c046e477e6a414227135aed67d08fd37cd71 iso-codes-0.47.ebuild 830
 SHA256 d2bed309fe137057a0a24af34a7affe4c1fac378704601868e4ca4a2784a95a3 iso-codes-0.47.ebuild 830
+MD5 674f3b6dac66ed9dcf9cb2e5185f9cdf iso-codes-0.49-r1.ebuild 1078
+RMD160 c1f7368988a923b04ae12bbfe6e8c2a7b08f643d iso-codes-0.49-r1.ebuild 1078
+SHA256 d6680c9b169f82da7311eb0e29884f4bf4c865a4b170a74a2b08c6ca9f32fb8b iso-codes-0.49-r1.ebuild 1078
 MD5 fae85531019613c298addef0cabbd33e iso-codes-0.49.ebuild 914
 RMD160 3d89d7c0f7cf4903944b78dd534f8077a1753ee9 iso-codes-0.49.ebuild 914
 SHA256 b59a8265ffaa464c7b9180db20189b77da4f637ecfc565780ff96edb8a640d8e iso-codes-0.49.ebuild 914
 MD5 e9817ec1ed09efcf042e9d64a3f947ce metadata.xml 387
 RMD160 110fb26a8d959cfaa9ded0d5aaf4f3f26860eb66 metadata.xml 387
 SHA256 d5252ca9dce95b72fa3153d212126bfa4594a1cf6868bff0dc205e46891a05e8 metadata.xml 387
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6Cv0JrHF4yAQTrARAjmcAJ9yhjk4Vz9QnlNEP6c6YD9gkFHZMwCfXRkP
-Z17t2mT/V+yrjkGQCU753so=
-=4Y5D
------END PGP SIGNATURE-----
diff --git a/app-text/iso-codes/files/digest-iso-codes-0.49-r1 b/app-text/iso-codes/files/digest-iso-codes-0.49-r1
new file mode 100644
index 000000000000..2aed27148b37
--- /dev/null
+++ b/app-text/iso-codes/files/digest-iso-codes-0.49-r1
@@ -0,0 +1,3 @@
+MD5 62b7f9469e00b92558d5d043a4be3910 iso-codes_0.49.orig.tar.gz 3698966
+RMD160 1475ccfed5d09b46004ccca517950484126b0d1b iso-codes_0.49.orig.tar.gz 3698966
+SHA256 54f6b12aadcda66e4437f4880fd4270aa38f0397acef907e1f3963aaca03625c iso-codes_0.49.orig.tar.gz 3698966
diff --git a/app-text/iso-codes/files/iso-codes-0.49-fix-version.patch b/app-text/iso-codes/files/iso-codes-0.49-fix-version.patch
new file mode 100644
index 000000000000..00d307cf2d5d
--- /dev/null
+++ b/app-text/iso-codes/files/iso-codes-0.49-fix-version.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2006-02-17 15:21:08.000000000 -0600
++++ configure.ac	2006-02-17 15:21:19.000000000 -0600
+@@ -16,7 +16,7 @@
+ dnl
+ dnl $Id: iso-codes-0.49-fix-version.patch,v 1.1 2006/02/17 21:27:27 compnerd Exp $
+ 
+-AC_INIT([ISO Codes],[0.47],[],[iso-codes])
++AC_INIT([ISO Codes],[0.49],[],[iso-codes])
+ 
+ AC_REVISION([$Revision: 1.1 $])
+ 
diff --git a/app-text/iso-codes/iso-codes-0.49-r1.ebuild b/app-text/iso-codes/iso-codes-0.49-r1.ebuild
new file mode 100644
index 000000000000..22cd58550d85
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-0.49-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-0.49-r1.ebuild,v 1.1 2006/02/17 21:27:27 compnerd Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Provides the list of country and language names"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-isocodes/"
+SRC_URI="mirror://debian/pool/main/i/iso-codes/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext
+		>=dev-lang/python-2.3
+		>=dev-python/pyxml-0.8.4
+		>=sys-devel/automake-1.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to fix up version reporting (bug #118240)
+	epatch ${FILESDIR}/${PN}-0.49-fix-version.patch
+
+	# fix install location for multilib machines
+	sed -i -e 's:(datadir)/pkgconfig:(libdir)/pkgconfig:g' Makefile.am
+
+	eaclocal
+	eautoconf
+	eautomake
+}
+
+src_install() {
+	econf || die "configure failed"
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc ChangeLog README TODO
+}