Cleanup. Use get_abi_LIBDIR instead of lib. Minor improvements.

(Portage version: 2.2_rc31/svn/Linux x86_64)

svn path=/sunrise/; revision=8482

3 files changed, 23 insertions, 27 deletions

diff --git a/www-plugins/nexus_personal_SE-bin/ChangeLog b/www-plugins/nexus_personal_SE-bin/ChangeLog
index 64a797a6a..7d5122569 100644
--- a/www-plugins/nexus_personal_SE-bin/ChangeLog
+++ b/www-plugins/nexus_personal_SE-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 May 2009; Christian Ruppert <idl0r@gentoo.org>
+  nexus_personal_SE-bin-4.10.0.21-r1.ebuild:
+  Cleanup. Use get_abi_LIBDIR instead of lib. Minor improvements.
+
   01 May 2009; Christian Asseburg (Zoominee) <christian@asseburg.com>
   +nexus_personal_SE-bin-4.10.0.21-r1.ebuild, +metadata.xml:
   Initial import for bug 268117. Thanks to lots of clever people on the Gentoo
diff --git a/www-plugins/nexus_personal_SE-bin/Manifest b/www-plugins/nexus_personal_SE-bin/Manifest
index f75b89225..7189ff9ca 100644
--- a/www-plugins/nexus_personal_SE-bin/Manifest
+++ b/www-plugins/nexus_personal_SE-bin/Manifest
@@ -1,4 +1,4 @@
 DIST LinuxPersonal-4.10.0.21.tgz 2867707 RMD160 0ddad8ff72e2598f2ee0802cb4d9c3878c9fd422 SHA1 2d01ea221c6ab76dc0c9fa7e98ca43aa24722cce SHA256 a76d8aa5e8d20d59b5b01143941e7644e8b3d0f0579eef3522ccfb367650dde1
-EBUILD nexus_personal_SE-bin-4.10.0.21-r1.ebuild 2493 RMD160 4026c9a9dc54450f68cf6ebddf393731d82e0c07 SHA1 eef70982661a44fd26e5075a29f24ca3818c2e9a SHA256 fca25062f583e7f654f57ddc49f3f8a2a8382e73679436f7a237520441d121df
-MISC ChangeLog 359 RMD160 e0c83807faa4766c9b5ea13d8378f995f9b826ba SHA1 b2c823297c77856700c6a8e7c316c31755a4a2f4 SHA256 7dce5a2563be645efcf5969c51228b68a4b2c9ba4b9ac01d9f84dc06b6e96173
+EBUILD nexus_personal_SE-bin-4.10.0.21-r1.ebuild 2309 RMD160 266efb830566f10ec16b87f0cde6e9b6e0845740 SHA1 c4d8495204dff221e567be7c03d2b08f32288093 SHA256 f36acbe2d8cf03eb5a8a96031d2f7339672485680f90a9cfcf1775315d1f1c5a
+MISC ChangeLog 523 RMD160 de6130ab9be4b0c7218d39fdc2bc8e2309479a79 SHA1 e6e869aad714a4024e74ab850b8be68d7e8e65d6 SHA256 aa2cbdbda027754fc7121fd146038d023bbc5236d7814cb0f7a617f376dead5b
 MISC metadata.xml 263 RMD160 55c5e06f431b1e6741ba885e033f2f744e11e044 SHA1 773fd0b7e323ff8b5a2e1c96d2472337ddbe7303 SHA256 7632995a3213d86c1bf9e99fb2f8a3c06fbafa681b6b40681ed6ae8f737eee24
diff --git a/www-plugins/nexus_personal_SE-bin/nexus_personal_SE-bin-4.10.0.21-r1.ebuild b/www-plugins/nexus_personal_SE-bin/nexus_personal_SE-bin-4.10.0.21-r1.ebuild
index 4ced10247..700360a79 100644
--- a/www-plugins/nexus_personal_SE-bin/nexus_personal_SE-bin-4.10.0.21-r1.ebuild
+++ b/www-plugins/nexus_personal_SE-bin/nexus_personal_SE-bin-4.10.0.21-r1.ebuild
@@ -37,23 +37,18 @@ RESTRICT="strip"
 
 QA_TEXTRELS="opt/${P}/*.so"
 
-#This could be done for amd64 support.
-#pkg_setup() {
-#	if ! has_multilib_profile && use amd64; then
-#		die "Requires multilib on amd64."
-#	fi
-#}
-
 src_install() {
 	local id=/opt/${P}
 	local ubin=/usr/local/bin
+	local lib=$(get_abi_LIBDIR x86)
 
 	exeinto ${id}
 	doexe *.so personal.bin persadm || die "doexe failed."
-	make_wrapper personal ${id}/personal.bin \
-		${id} ${id} || die "make_wrapper failed."
-	make_wrapper persadm "${id}/persadm" \
-		${id} ${id} || die "make_wrapper failed."
+
+	make_wrapper personal ${id}/personal.bin ${id} ${id} \
+		|| die "make_wrapper failed."
+	make_wrapper persadm "${id}/persadm" ${id} ${id} || die "make_wrapper failed."
+
 	dosym /usr/bin/personal ${ubin}/personal || die "dosym failed."
 	dosym /usr/bin/persadm ${ubin}/persadm || die "dosym failed."
 
@@ -73,31 +68,28 @@ src_install() {
 
 	make_desktop_entry personal "Nexus Personal" ${PN} Utility
 
-	local ld=lib
-# amd64
-#	if has_multilib_profile; then
-#		local ld=$(get_abi_LIBDIR x86)
-#	fi
-	dosym ${id}/libplugins.so \
-		/usr/${ld}/nsbrowser/plugins/libnexuspersonal.so \
+	dosym ${id}/libplugins.so /usr/${lib}/nsbrowser/plugins/libnexuspersonal.so \
 		|| die "dosym failed."
 
-	dosym /usr/${ld}/libcurl.so ${id}/libcurl-gnutls.so.4 \
+	dosym /usr/${lib}/libcurl.so ${id}/libcurl-gnutls.so.4 \
 		|| die "dosym failed."
 
 	for i in ${BROWSERS}; do
-		if use $i; then
-			make_wrapper $i-nexus $i \
-				${id} ${id}
+		if use ${i}; then
+			make_wrapper ${i}-nexus ${i} ${id} ${id}
 		fi
 	done
 }
 
 pkg_postinst() {
+	einfo
 	for i in ${BROWSERS}; do
-		if use $i; then
-			einfo "Start $i-nexus for BankID plugin support."
+		if use ${i}; then
+			einfo "Run '${i}-nexus' for BankID plugin support."
 		fi
 	done
-	einfo "For all other browsers, export LD_LIBRARY_PATH=\$\{LD_LIBRARY_PATH\}\$\{LD_LIBRARY_PATH:+:\}${id} for BankID plugin support, then start your browser."
+	einfo "For all other browsers:"
+	einfo "\texport LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:${ROOT}opt/${P}\""
+	einfo "for BankID plugin support, then start your browser."
+	einfo
 }