dont use pmake/base/glibc

3 files changed, 18 insertions, 47 deletions

diff --git a/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild b/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild
index 398ea9902520..316f16e2e6af 100644
--- a/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild
+++ b/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild
@@ -1,45 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild,v 1.9 2004/06/24 23:17:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeotiff/libgeotiff-1.2.0.ebuild,v 1.10 2004/06/30 02:08:22 vapier Exp $
 
-inherit base eutils
+inherit eutils
 
 DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
 HOMEPAGE="http://remotesensing.org/geotiff/geotiff.html"
 SRC_URI="ftp://ftp.remotesensing.org/pub/geotiff/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=media-libs/tiff-3.3.4
 	dev-libs/proj"
 
-src_unpack() {
-	base_src_unpack
-
-	#cd ${S}
-	#patch -p0 -s < ${FILESDIR}/geo_trans.diff
-}
-
 src_compile() {
 	econf || die
-	MAKEOPTS="-j1" pmake || die
+	emake -j1 || die
 }
 
 src_install() {
-	into /usr
-	exeinto /usr/bin
-	doexe bin/listgeo
-	doexe bin/geotifcp
-	doexe bin/makegeo
+	dobin bin/{listgeo,geotifcp,makegeo} || die
 	insinto usr/include
 	dolib.a libgeotiff.a
 	dolib.so libgeotiff.so.${PV}
 	dosym libgeotiff.so.${PV} usr/lib/libgeotiff.so
 	doins xtiffio.h xtiffiop.h geotiff.h geotiffio.h geovalues.h geonames.h geokeys.h geo_tiffp.h geo_config.h geo_keyp.h geo_normalize.h cpl_serv.h cpl_csv.h epsg_datum.inc epsg_gcs.inc epsg_pm.inc epsg_units.inc geo_ctrans.inc epsg_ellipse.inc epsg_pcs.inc epsg_proj.inc epsg_vertcs.inc geokeys.inc
-	mkdir -p ${D}/usr/share/epsg_csv
 	insinto usr/share/epsg_csv
 	doins csv/*.csv
 }
diff --git a/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild b/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild
index 03a489b4cfcb..c89fdb7e8bcb 100644
--- a/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild
+++ b/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild
@@ -1,45 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild,v 1.6 2004/06/24 23:17:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeotiff/libgeotiff-1.2.1.ebuild,v 1.7 2004/06/30 02:08:22 vapier Exp $
 
-inherit base eutils
+inherit eutils
 
 DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
 HOMEPAGE="http://remotesensing.org/geotiff/geotiff.html"
 SRC_URI="ftp://ftp.remotesensing.org/pub/geotiff/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=media-libs/tiff-3.6.0
 	dev-libs/proj"
 
-src_unpack() {
-	base_src_unpack
-
-	#cd ${S}
-	#patch -p0 -s < ${FILESDIR}/geo_trans.diff
-}
-
 src_compile() {
 	econf || die
-	MAKEOPTS="-j1" pmake || die
+	emake -j1 || die
 }
 
 src_install() {
-	into /usr
-	exeinto /usr/bin
-	doexe bin/listgeo
-	doexe bin/geotifcp
-	doexe bin/makegeo
+	dobin bin/{listgeo,geotifcp,makegeo} || die
 	insinto usr/include
 	dolib.a libgeotiff.a
 	dolib.so libgeotiff.so.${PV}
 	dosym libgeotiff.so.${PV} usr/lib/libgeotiff.so
 	doins xtiffio.h xtiffiop.h geotiff.h geotiffio.h geovalues.h geonames.h geokeys.h geo_tiffp.h geo_config.h geo_keyp.h geo_normalize.h cpl_serv.h cpl_csv.h epsg_datum.inc epsg_gcs.inc epsg_pm.inc epsg_units.inc geo_ctrans.inc epsg_ellipse.inc epsg_pcs.inc epsg_proj.inc epsg_vertcs.inc geokeys.inc
-	mkdir -p ${D}/usr/share/epsg_csv
 	insinto usr/share/epsg_csv
 	doins csv/*.csv
 }
diff --git a/dev-libs/shapelib/shapelib-1.2.10.ebuild b/dev-libs/shapelib/shapelib-1.2.10.ebuild
index 2c646d6e7542..8913aac93621 100644
--- a/dev-libs/shapelib/shapelib-1.2.10.ebuild
+++ b/dev-libs/shapelib/shapelib-1.2.10.ebuild
@@ -1,34 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/shapelib/shapelib-1.2.10.ebuild,v 1.4 2004/06/24 23:33:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/shapelib/shapelib-1.2.10.ebuild,v 1.5 2004/06/30 02:10:46 vapier Exp $
 
-inherit base eutils
+inherit eutils
 
 DESCRIPTION="ShapeLib"
 HOMEPAGE="http://gdal.velocet.ca/projects/shapelib/"
 SRC_URI="ftp://gdal.velocet.ca/pub/outgoing//${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	pmake || die
+	emake || die
 	make lib || die
 }
 
 src_install() {
-	into /usr
-	exeinto /usr/bin
-	doexe shpcreate
-	doexe shpdump
-	doexe shptest
-	doexe shpadd
-	doexe dbfcreate
-	doexe dbfdump
-	doexe dbfadd
+	dobin shp{create,dump,test,add} dbf{create,dump,add} || die
 	dolib.so .libs/libshp.so.1.0.1
 	dosym libshp.so.1.0.1 usr/lib/libshp.so
 	insinto /usr/include/libshp