s/einfo/elog/

Misc ebuild cleanups

(Portage version: 2.1.2_rc4-r6)

2 files changed, 23 insertions, 26 deletions

diff --git a/net-libs/osptoolkit/ChangeLog b/net-libs/osptoolkit/ChangeLog
index 5b4875d8af29..09c86db9868f 100644
--- a/net-libs/osptoolkit/ChangeLog
+++ b/net-libs/osptoolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/osptoolkit
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.5 2006/10/06 22:53:41 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.6 2007/01/06 16:09:05 drizzt Exp $
+
+  06 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> osptoolkit-3.3.4.ebuild:
+  s/einfo/elog/
+  Misc ebuild cleanups
 
   06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   osptoolkit-3.3.4.ebuild:
diff --git a/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild b/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild
index eafb789eb050..6202716ca07f 100644
--- a/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild
+++ b/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild,v 1.3 2006/10/06 22:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.3.4.ebuild,v 1.4 2007/01/06 16:09:05 drizzt Exp $
+
+inherit eutils
 
 DESCRIPTION="OSP (Open Settlement Protocol) library"
 HOMEPAGE="http://www.transnexus.com/"
@@ -12,47 +14,38 @@ KEYWORDS="x86"
 
 IUSE=""
 
-RDEPEND="virtual/libc
-	dev-libs/openssl"
-
+RDEPEND="dev-libs/openssl"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/TK-${PV//./_}-20051103
+S="${WORKDIR}"/TK-${PV//./_}-20051103
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/\$(LIBDIR):" \
 		src/Makefile
 }
 
 src_compile() {
-	cd ${S}/src
-	emake build || die "emake libosp failed"
-
-	cd ${S}/enroll
-	emake linux || die "emake enroll failed"
-
-	cd ${S}/test
-	emake linux || die "emake test failed"
+	emake -C src build || die "emake libosp failed"
+	emake -C enroll linux || die "emake enroll failed"
+	emake -C test linux || die "emake test failed"
 }
 
 src_install() {
-	dodir /usr/include /usr/lib
+	dodir /usr/include /usr/$(get_libdir)
 
-	cd ${S}/src
-	make INSTALL_PATH=${D}/usr LIBDIR=lib \
+	make -C src INSTALL_PATH="${D}"/usr LIBDIR=$(get_libdir) \
 		install || die "make install failed"
 
 	sed -i  -e "s:^\(OPENSSL_CONF\).*:\1=/etc/ssl/openssl.cnf:" \
 		-e "s:^\(RANDFILE\).*:\1=/etc/ssl/.rnd:" \
-		${S}/bin/enroll.sh
+		bin/enroll.sh
 
-	dosbin ${S}/bin/enroll*
-	newbin ${S}/bin/test_app osp_test_app
+	dosbin bin/enroll*
+	newbin bin/test_app osp_test_app
 
-	cd ${S}
 	dodoc *.txt
 
 	insinto /usr/share/doc/${PF}
@@ -60,6 +53,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "The OSP test application is located in ${ROOT}usr/bin/osp_test_app"
-	einfo "See ${ROOT}usr/share/doc/${PF}/test.cfg for a sample test.cfg for osp_test_app"
+	elog "The OSP test application is located in ${ROOT}usr/bin/osp_test_app"
+	elog "See ${ROOT}usr/share/doc/${PF}/test.cfg for a sample test.cfg for osp_test_app"
 }