Version bump. Remove pkgconfig file relocation - /usr/share/pkgconfig is the correct place for it as no binaries are installed. Clean out old.

(Portage version: 2.2_rc22/cvs/Linux 2.6.29-gentoo-r1 x86_64)

3 files changed, 9 insertions, 55 deletions

diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog
index 7075f5add2d6..76c37da78ebe 100644
--- a/app-text/iso-codes/ChangeLog
+++ b/app-text/iso-codes/ChangeLog
@@ -1,6 +1,13 @@
 # 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.65 2009/03/18 15:19:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.66 2009/04/10 23:04:20 leio Exp $
+
+*iso-codes-3.8 (10 Apr 2009)
+
+  10 Apr 2009; Mart Raudsepp <leio@gentoo.org> -iso-codes-3.2.ebuild,
+  -iso-codes-3.5.1.ebuild, +iso-codes-3.8.ebuild:
+  Version bump. Remove pkgconfig file relocation - /usr/share/pkgconfig is
+  the correct place for it as no binaries are installed. Clean out old.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> iso-codes-3.6.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/app-text/iso-codes/iso-codes-3.2.ebuild b/app-text/iso-codes/iso-codes-3.2.ebuild
deleted file mode 100644
index 5adf224bdb65..000000000000
--- a/app-text/iso-codes/iso-codes-3.2.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.2.ebuild,v 1.8 2008/09/26 15:16:09 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
-}
diff --git a/app-text/iso-codes/iso-codes-3.5.1.ebuild b/app-text/iso-codes/iso-codes-3.8.ebuild
index 577d3dc42135..3fd574022b3b 100644
--- a/app-text/iso-codes/iso-codes-3.5.1.ebuild
+++ b/app-text/iso-codes/iso-codes-3.8.ebuild
@@ -1,11 +1,9 @@
 # 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.5.1.ebuild,v 1.2 2009/02/13 16:59:23 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.8.ebuild,v 1.1 2009/04/10 23:04:20 leio 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"
@@ -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"