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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 18 insertions, 31 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/Manifest b/net-analyzer/sguil-client/Manifest
index 89faf643f0d7..f8f10372c518 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST sguil-client-0.6.1.tar.gz 204032 RMD160 5109dfaf5c4756926037735967d2333605ada7cf SHA1 f62259f8fa60392c6172bd638c8bf82c1b1181eb SHA256 c493cce8c6c1d5802c2ee3d2e0b7bed913ec511bda565ad697250b23a7809dc9
-EBUILD sguil-client-0.6.1.ebuild 1642 RMD160 24c374fd6cfb87fb8559a9f0ff598b3d2eaa9f14 SHA1 a017735e5694fe8a30a1ecb62616ab8458c1ae92 SHA256 000e4ab012c7516fd1ebccbcca8135c13e5d5a366e3b6601896ffdddfda0f290
-MISC ChangeLog 1138 RMD160 0a17537484051856598b84e804c6e66cc0a299b9 SHA1 5d0edad76484e1c04c75719c46e0f42b72ea7ef3 SHA256 8ebd2acbfb50f5cc4ffe6158850832bf6c79bdc5833a6edf6c6d26ef147f3595
+EBUILD sguil-client-0.6.1.ebuild 1492 RMD160 d61274898788ce70ed26d970242a0531cca9412e SHA1 df69a2c855d7345a65e1cd7a3dfb09487a6f5c79 SHA256 d8de641a81898685811710b5358627ff96716b67a04bcd65e24d89d1b2658af0
+MISC ChangeLog 1275 RMD160 02d3a9092f2634a0742d1f03b339aa0ab22da206 SHA1 47413b8a74da386617621955fb636672595a9f38 SHA256 803917d09c7abee95730ced695b190db8a7b1f18a424da43ce3c272069caa0ea
 MISC metadata.xml 161 RMD160 404fe32f194325ecc180c31feaed3b71cff5e438 SHA1 aa4aff2479db4b6a96f99889365cb17375ba8c4d SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkinEDEACgkQV3J2n04EauzdqwCeIZ7TOUNWhgVlio9KEq1J4lrQ
-8F4AnRT4S9yhc+3IJ8S6i/3ymFnReeuY
-=iBpI
------END PGP SIGNATURE-----
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/*
 }