Version bump. Clean up old revisions.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 9 insertions, 56 deletions

diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog
index 86a9b5636932..e3b12c6dd363 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.75 2009/07/04 18:33:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.76 2009/08/31 21:17:45 eva Exp $
+
+*iso-codes-3.10 (31 Aug 2009)
+
+  31 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org> -iso-codes-3.3.ebuild,
+  -iso-codes-3.6.ebuild, +iso-codes-3.10.ebuild:
+  Version bump. Clean up old revisions.
 
   04 Jul 2009; Brent Baude <ranger@gentoo.org> iso-codes-3.8.ebuild:
   Marking iso-codes-3.8 ppc64 for bug 272502
diff --git a/app-text/iso-codes/iso-codes-3.6.ebuild b/app-text/iso-codes/iso-codes-3.10.ebuild
index f767b057ca1e..201dd79405bf 100644
--- a/app-text/iso-codes/iso-codes-3.6.ebuild
+++ b/app-text/iso-codes/iso-codes-3.10.ebuild
@@ -1,18 +1,16 @@
 # 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.6.ebuild,v 1.9 2009/04/13 11:31:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.10.ebuild,v 1.1 2009/08/31 21:17:45 eva Exp $
 
 EAPI="2"
 
-inherit eutils autotools
-
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
@@ -21,17 +19,6 @@ DEPEND="sys-devel/gettext
 		>=dev-lang/python-2.3[-build,xml]
 		dev-python/pyxml )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix install location for multilib machines
-	sed -e 's:(datadir)/pkgconfig:(libdir)/pkgconfig:g' \
-		-i Makefile.am || die "sed failed"
-
-	eautomake
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
diff --git a/app-text/iso-codes/iso-codes-3.3.ebuild b/app-text/iso-codes/iso-codes-3.3.ebuild
deleted file mode 100644
index fe6c1ff8ae84..000000000000
--- a/app-text/iso-codes/iso-codes-3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 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.3.ebuild,v 1.7 2008/11/22 16:07:44 jer Exp $
-
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix install location for multilib machines
-	sed -i -e 's:(datadir)/pkgconfig:(libdir)/pkgconfig:g' Makefile.am
-
-	eautomake
-}
-
-src_compile() {
-	econf || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc ChangeLog README TODO
-}