From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 21 Oct 2005 02:45:14 +0000 (+0000)
Subject: cleanup ebuild and use $(get_libdir) instead of /lib #109804
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f88505f522d62e1b56b1593faf8c80d179139f1;p=gentoo.git

cleanup ebuild and use $(get_libdir) instead of /lib #109804
Package-Manager: portage-2.0.53_rc5
---

diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index eb911a192e79..47de1b55596d 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 MD5 fa09b198e494a1086b748a70d8c82b98 ChangeLog 3433
 MD5 3e474572fe4df01c7632a78f013c6d1e STLport-4.5.3-r3.ebuild 1086
-MD5 9bc93614f7fe1e68a404de378b15d2c2 STLport-4.6.2-r2.ebuild 1290
+MD5 9ae2d5e0911688042ea4ee50791841ae STLport-4.6.2-r2.ebuild 1395
 MD5 f480213ed01d6d7700f14c15cb0f5229 STLport-5.0_rc2.ebuild 1317
 MD5 2f3f666186f0f3ba7e64d101c9f5c05d files/4.6.2-gcc-includes.patch 812
 MD5 7949a0c399ae8cd1c8c6d7ada426848f files/4.6.2-optimize.patch 999
@@ -19,7 +19,7 @@ MD5 4817a0bcc65305e3dd392deee8e84e0c metadata.xml 246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDTGX8gIKl8Uu19MoRAlF/AJ0cjmZE4iDF/Yn2oMDwv6k7odIF6wCfXsGV
-k9OYc4eL34CO905FzpmofIc=
-=Pqse
+iD8DBQFDWFbZgIKl8Uu19MoRAqI2AJ0eew8dzRXMjaliwljSQxwubry82QCfSzAZ
+9nqPzQjHSIFtfh2F9tBtwPI=
+=iy4+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/STLport/STLport-4.6.2-r2.ebuild b/dev-libs/STLport/STLport-4.6.2-r2.ebuild
index 451fff55c334..7bf045bda432 100644
--- a/dev-libs/STLport/STLport-4.6.2-r2.ebuild
+++ b/dev-libs/STLport/STLport-4.6.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.6.2-r2.ebuild,v 1.4 2005/06/15 12:59:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.6.2-r2.ebuild,v 1.5 2005/10/21 02:45:14 vapier Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="C++ STL library"
 HOMEPAGE="http://www.stlport.org/"
@@ -13,39 +13,38 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-optimize.patch
-	epatch ${FILESDIR}/${PV}-gcc-includes.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-optimize.patch
+	epatch "${FILESDIR}"/${PV}-gcc-includes.patch
 	sed -i 's:-D_STLP_REAL_LOCALE_IMPLEMENTED::' src/gcc-linux.mak
-	if use ppc; then
-		epatch ${FILESDIR}/STLport-vector.patch
+	if use ppc ; then
+		epatch "${FILESDIR}"/STLport-vector.patch
 	fi
 }
 
 src_compile() {
-	cd src
-	emake -f gcc-linux.mak || die "Compile failed"
+	emake -C src -f gcc-linux.mak || die "Compile failed"
 }
 
 src_install() {
 	dodir /usr/include
-	cp -R ${S}/stlport ${D}/usr/include
-	rm -rf ${D}/usr/include/stlport/BC50
-	chmod -R a+r ${D}/usr/include/stlport
+	cp -R "${S}"/stlport "${D}"/usr/include || die "doins include"
+	rm -rf "${D}"/usr/include/stlport/BC50
+	chmod -R a+r "${D}"/usr/include/stlport
 
-	dodir /usr/lib
-	cp -R ${S}/lib/* ${D}/usr/lib/
-	dosym libstlport_gcc_stldebug.so /usr/lib/libstlport_gcc_debug.so
-	rm -rf ${D}/usr/lib/obj
+	dodir /usr/$(get_libdir)
+	cp -R "${S}"/lib/* "${D}"/usr/$(get_libdir)/ || die "doins libs"
+	dosym libstlport_gcc_stldebug.so /usr/$(get_libdir)/libstlport_gcc_debug.so
+	rm -rf "${D}"/usr/$(get_libdir)/obj
 
-	cd ${S}/etc/
+	cd "${S}"/etc/
 	dodoc ChangeLog* README TODO *.txt
 
-	cd ${S}
+	cd "${S}"
 	dohtml -r doc
 }