Version bump. Drop old revision.

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 72 insertions, 30 deletions

diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog
index 0233e3e918d8..165607750160 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.96 2010/10/29 03:20:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.97 2010/12/13 22:31:09 eva Exp $
+
+*iso-codes-3.23 (13 Dec 2010)
+
+  13 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> -iso-codes-3.10.ebuild,
+  +iso-codes-3.23.ebuild:
+  Version bump. Drop old revision.
 
   29 Oct 2010; Jeroen Roovers <jer@gentoo.org> iso-codes-3.19.ebuild:
   Stable for HPPA (bug #339778).
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index e5fe67d3cc99..b961414fd058 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,8 +1,18 @@
-DIST iso-codes-3.10.tar.bz2 5351303 RMD160 baca11224b8bcf241c59383400d937d3f115c1c3 SHA1 6eba71d4bb19ccd3f9c84cb11e0af708532d00ae SHA256 ae33db43ed7b325754f4887ff53adac1fb2978eae71aadeda511a4c1f9e71274
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST iso-codes-3.19.tar.bz2 6010240 RMD160 5028bc75198d2ffda8243b06248992bb309ab243 SHA1 888ed054b113dc7506d3bff33fd25ad328fa3146 SHA256 e880d1e19e00cfa9db999e4c9520a9be288faf968f1a603419ce12f51d647879
 DIST iso-codes-3.21.tar.bz2 6118310 RMD160 33c9da5e67cc187b5ee14acb95c453d07b5616f9 SHA1 d3b7104c618ae6ddebf7a75d3caaf18013c5fece SHA256 2362169a9ee2f8940c52a76adf2564f59146103ecb895727a1c91aa6f0f5207d
-EBUILD iso-codes-3.10.ebuild 745 RMD160 231f1f1c5f78bdf42c5bb67757456cf6f6cb04c2 SHA1 d0835b4b5cfa33c42d1a22f0d8886ddfbd6419fc SHA256 d70184fdb3e25e24609bba4c573a401df64f39c66db891b07497d809f92257b7
+DIST iso-codes-3.23.tar.bz2 6159339 RMD160 3e1ec447ed90a8a119042ececad963e22a89e947 SHA1 799791ba2d3edc098fadbd0172be34c2f64c9968 SHA256 78b9f9dddf261775eab5eb6dc52d29e9b33279c501738d618c0b84dc32bcc951
 EBUILD iso-codes-3.19.ebuild 1373 RMD160 0fa4130a916cf1d622d6ab3adea8463c130e280c SHA1 63df397a7358e472d342cd3767bd8b4e79f771e4 SHA256 abd7ddd6caff9baee794335297778bc357c7701525a578201f12f04b64941fe5
 EBUILD iso-codes-3.21.ebuild 1390 RMD160 c916301bf03dec65f87522129df4110afb3550d7 SHA1 7fb1ce5ed7f81771279031e51abe01b720af0685 SHA256 9bde3a84757962614edff6682705ebbdecf50db825557d4fddc1b3bf3ab646bd
-MISC ChangeLog 12417 RMD160 f66e8d8b2537b51071e503c6b7d8e969a06397a3 SHA1 454676f37afdd2fb83cdc1cfd7da6252c6705442 SHA256 b5b57c17a5d080076dc5bcbd9b07e9f32645d6504178d78a9c6359d89025fa07
+EBUILD iso-codes-3.23.ebuild 1461 RMD160 d8e7a4d0b041cb6dee4e5067608d7f7370b72228 SHA1 e6c44789be24702679e8c07172b0cdb7b205c434 SHA256 be3cf28f3a7163571dc81125d463f4881489d9c994291046199ef91698844723
+MISC ChangeLog 12588 RMD160 c3bd0fe637e620ad0dcf22d3d34e163604f7898e SHA1 d1f4bb6078e13ec2debc93bda7fca904f77967a3 SHA256 35a4b45162d06756d50cd3bef2dfc059de1f1376bfe7465d8ecc3389d1531d3a
 MISC metadata.xml 387 RMD160 110fb26a8d959cfaa9ded0d5aaf4f3f26860eb66 SHA1 90b5f3b6d4b059b26db56f689f494a854b79f216 SHA256 d5252ca9dce95b72fa3153d212126bfa4594a1cf6868bff0dc205e46891a05e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0GnrkACgkQ1fmVwcYIWAZdsACfZSc9gCzL13to6+EuEvBoCxwW
+j1cAoI8Ff0IKg7L9y5jm1on8xsM/B815
+=O2mQ
+-----END PGP SIGNATURE-----
diff --git a/app-text/iso-codes/iso-codes-3.10.ebuild b/app-text/iso-codes/iso-codes-3.10.ebuild
deleted file mode 100644
index a7517b1ef149..000000000000
--- a/app-text/iso-codes/iso-codes-3.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.10.ebuild,v 1.7 2009/12/10 15:46:17 jer Exp $
-
-EAPI="2"
-
-DESCRIPTION="Provides the list of country and language names"
-HOMEPAGE="http://alioth.debian.org/projects/pkg-isocodes/"
-SRC_URI="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/gettext
-	|| (
-		>=dev-lang/python-2.3[-build,xml]
-		dev-python/pyxml )"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc ChangeLog README TODO
-}
diff --git a/app-text/iso-codes/iso-codes-3.23.ebuild b/app-text/iso-codes/iso-codes-3.23.ebuild
new file mode 100644
index 000000000000..ad2bef2949ed
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.23.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.23.ebuild,v 1.1 2010/12/13 22:31:09 eva Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Provides the list of country and language names"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-isocodes/"
+SRC_URI="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gettext"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local linguas_bak=${LINGUAS}
+	local mylinguas=""
+
+	for norm in iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3; do
+		einfo "Preparing ${norm}"
+
+		mylinguas=""
+		LINGUAS=${linguas_bak}
+		strip-linguas -i "${S}/${norm}"
+
+		for loc in ${LINGUAS}; do
+			mylinguas="${mylinguas} ${loc}.po"
+		done
+
+		if [ -n "${mylinguas}" ]; then
+			sed -e "s:pofiles =.*:pofiles = ${mylinguas}:" \
+				-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo}:" \
+				-i "${S}/${norm}/Makefile.am" "${S}/${norm}/Makefile.in" \
+				|| die "sed in ${norm} folder failed"
+		fi
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc ChangeLog README TODO || die "dodoc failed"
+}