Migration to EAPI 2, add get_libdir() fix, keyword ~amd64

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 16 insertions, 19 deletions

diff --git a/net-analyzer/sguil-client/ChangeLog b/net-analyzer/sguil-client/ChangeLog
index 334ee55f3913..27396ee01e3a 100644
--- a/net-analyzer/sguil-client/ChangeLog
+++ b/net-analyzer/sguil-client/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/sguil-client
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/ChangeLog,v 1.7 2008/08/16 17:37:01 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/ChangeLog,v 1.8 2009/03/08 02:54:25 cla Exp $
+
+  08 Mar 2009; Dawid Węgliński <cla@gentoo.org> sguil-client-0.6.1.ebuild:
+  Migration to EAPI 2, add get_libdir() fix, keyword ~amd64
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove strerror from metadata.xml (#89719)
diff --git a/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild b/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild
index 533d1dfe04ef..48d0b7e0ef55 100644
--- a/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild,v 1.4 2007/07/11 23:49:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/sguil-client-0.6.1.ebuild,v 1.5 2009/03/08 02:54:25 cla Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -10,12 +12,12 @@ HOMEPAGE="http://sguil.sf.net"
 SRC_URI="mirror://sourceforge/sguil/sguil-client-${MY_PV}.tar.gz"
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
 DEPEND=""
 RDEPEND="
-	>=dev-lang/tcl-8.3
+	>=dev-lang/tcl-8.3[-threads]
 	>=dev-lang/tk-8.3
 	>=dev-tcltk/itcl-3.2
 	>=dev-tcltk/tclx-8.3
@@ -27,22 +29,14 @@ RDEPEND="
 
 S="${WORKDIR}/sguil-${MY_PV}"
 
-pkg_setup() {
-	if built_with_use dev-lang/tcl threads ; then
-		eerror
-		eerror "Sguil does not run when tcl was built with threading enabled."
-		eerror "Please rebuild tcl without threads and reemerge this ebuild."
-		die
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i -e '/^set SGUILLIB /s:./lib:/usr/lib/sguil:' \
+	cd "${S}"
+	sed -i -e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
 		-e '/^set ETHEREAL_PATH /s:/usr/sbin/ethereal:/usr/bin/wireshark:' \
 		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
 		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
+		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
 		client/sguil.conf || die "sed failed"
 	sed -i -e 's:^exec wish:exec wishx': \
 		client/sguil.tk || die "sed failed"
@@ -52,8 +46,8 @@ src_install() {
 	dobin client/sguil.tk
 	insinto /etc/sguil
 	doins client/sguil.conf
-	mkdir -p "${D}/usr/lib/sguil"
-	cp -a ${S}/client/lib/* "${D}/usr/lib/sguil/"
+	insinto "/usr/$(get_libdir)/sguil"
+	doins "${S}"/client/lib/*
 	dodoc doc/*
 }