Update to eapi4.

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

4 files changed, 21 insertions, 25 deletions

diff --git a/sci-geosciences/osm2pgsql/ChangeLog b/sci-geosciences/osm2pgsql/ChangeLog
index 45474fc7552c..00e7cb404a75 100644
--- a/sci-geosciences/osm2pgsql/ChangeLog
+++ b/sci-geosciences/osm2pgsql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/osm2pgsql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.5 2011/03/02 20:44:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.6 2011/06/01 11:40:40 scarabeus Exp $
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  osm2pgsql-20100413.ebuild, osm2pgsql-99999999.ebuild:
+  Update to eapi4.
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> osm2pgsql-20100413.ebuild,
   osm2pgsql-99999999.ebuild:
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f0a1131065ee..ce310addde85 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST osm2pgsql-20100413svn.tar.bz2 15993739 RMD160 ce7fd76105f7bb2b6e19407952744a7a5a5038a9 SHA1 17459b84b6b3db0fbb3f8ad3ff909db3ef8727a9 SHA256 853888cc49451aa0a6026dd49db8f5c2e34856e809f963a12e59a11130912396
-EBUILD osm2pgsql-20100413.ebuild 819 RMD160 89c313abfef0158f954f1d0d6b180474a2e81423 SHA1 cddd4ea0ec2711bee6f9be632da35102cbb3f6dc SHA256 3147d3aa3d20e2b6fb1a200e367abe3e8ada7c98de29e58865128372cea9ae3c
-EBUILD osm2pgsql-99999999.ebuild 872 RMD160 d2160cd6ded5b9e3923148e508f3e58b1848b9c1 SHA1 e33406d1ccfba2de245895f88b93c79224ba1016 SHA256 57106daf055de2671508d2b486262eb049a7397f012fdedf374a8fa7edb5fde7
-MISC ChangeLog 1125 RMD160 9a291a550950a95e4bdee8b31420950be85f3454 SHA1 9d14bbfd33ed19d32720e958e4ef168795ed0632 SHA256 7f448df1fc2fe511406fb995273ab46494199f4fd2701a9691bb4589b5594e77
+EBUILD osm2pgsql-20100413.ebuild 722 RMD160 4252b2a422c55fc93435fbe211bbcebbc2a0c289 SHA1 dc0b27a617d39e63add94ede6c2dfa965058f689 SHA256 863182a26737934870508a34730bd87a4c3c79daa6ff38194a049af8fd026496
+EBUILD osm2pgsql-99999999.ebuild 775 RMD160 85df852a5fbb3ddd93db387ca00c2324f1365f85 SHA1 f7c7519245029a93197bff26a6838d2ce12cd444 SHA256 c0324d2b93d7f0081fe75a75b90246b24866e9e99ee31621725b5938f0617380
+MISC ChangeLog 1261 RMD160 9b8e7e2e80079d1ec58cc3d2a46046fdb78bd932 SHA1 02e7532429b609189b2aca10ee0969488412e93c SHA256 6fe156b8e38f38eed559c0906e07fdf34214af890df3dc6b2488636efea1c2fd
 MISC metadata.xml 1354 RMD160 1856096e4faf1887389d58648ec5310edc2dbb6c SHA1 4358fe9bf0ed05454ce4fc248ba6d292a5260f80 SHA256 d6194d50628a7a576b7abe1f2c30bc24b7963b422a7463d7e09d2eba85c69d17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1urEoACgkQgAnW8HDreRY5nQCfcGJvMkxjwxzCvJCFAaDexB1P
-EdAAoLt9Z9CrQVeXbCH7AycyVPgKN6tc
-=1zlz
+iEYEARECAAYFAk3mJTUACgkQHB6c3gNBRYdolwCfQzXJFXw9W4lKfF0N0LiKrTTJ
+yZEAn285w3wfrGXcFX5Qf1HBJ5G6P219
+=ZTrc
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild
index 814ea159c8a3..08d3053705e5 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild,v 1.4 2011/03/02 20:44:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-20100413.ebuild,v 1.5 2011/06/01 11:40:40 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
@@ -28,12 +28,8 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${PN}
 
+DOCS=( README.txt )
+
 src_prepare() {
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc README.txt || die "dodoc failed"
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index b86e1b49c713..45284327551d 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild,v 1.3 2011/03/02 20:44:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild,v 1.4 2011/06/01 11:40:40 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils autotools subversion
+inherit autotools subversion
 
 ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/export/${PN}/"
 ESVN_PROJECT="${PN}"
@@ -29,13 +29,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+DOCS=( README.txt )
+
 src_prepare() {
 	esvn_clean
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc README.txt || die "dodoc failed"
-}