summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnant Narayanan <anant@gentoo.org>2007-12-11 17:32:51 +0000
committerAnant Narayanan <anant@gentoo.org>2007-12-11 17:32:51 +0000
commit485bd59ddcd87cf524bebf38f6572854ea003d69 (patch)
tree793e78cd19b3eb936fcde594496e704c35988187
parentarm/s390/sh stable (diff)
downloadgentoo-2-485bd59ddcd87cf524bebf38f6572854ea003d69.tar.gz
gentoo-2-485bd59ddcd87cf524bebf38f6572854ea003d69.tar.bz2
gentoo-2-485bd59ddcd87cf524bebf38f6572854ea003d69.zip
Fix tk versioning (bug #196055)
(Portage version: 2.1.4_rc9)
-rw-r--r--net-analyzer/nam/ChangeLog5
-rw-r--r--net-analyzer/nam/nam-1.11-r1.ebuild10
2 files changed, 10 insertions, 5 deletions
diff --git a/net-analyzer/nam/ChangeLog b/net-analyzer/nam/ChangeLog
index f423f29f98b2..bbba9745543c 100644
--- a/net-analyzer/nam/ChangeLog
+++ b/net-analyzer/nam/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/nam
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.15 2007/07/26 13:40:29 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.16 2007/12/11 17:32:51 anant Exp $
+
+ 11 Dec 2007; <anant@gentoo.org> nam-1.11-r1.ebuild:
+ Fix tk versioning (Patch thanks to Paul Tobias). Fixes bug #196055.
26 Jul 2007; Anant Narayanan <anant@gentoo.org> metadata.xml:
Add myself to metadata.
diff --git a/net-analyzer/nam/nam-1.11-r1.ebuild b/net-analyzer/nam/nam-1.11-r1.ebuild
index 272d49f5fade..08c2e4917d0d 100644
--- a/net-analyzer/nam/nam-1.11-r1.ebuild
+++ b/net-analyzer/nam/nam-1.11-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11-r1.ebuild,v 1.2 2007/07/22 07:54:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11-r1.ebuild,v 1.3 2007/12/11 17:32:51 anant Exp $
-inherit eutils
+inherit eutils versionator
DESCRIPTION="Network Simulator GUI for NS"
HOMEPAGE="http://www.isi.edu/nsnam/nam"
@@ -33,15 +33,17 @@ src_unpack() {
src_compile() {
local tclver=$(best_version ">=dev-lang/tcl-8.4.4")
einfo "Using ${tclver}"
+ tclver=$(get_version_component_range 1-3 "${tclver:13}")
local tkver=$(best_version ">=dev-lang/tk-8.4.4")
einfo "Using ${tkver}"
+ tkver=$(get_version_component_range 1-3 "${tkver:12}")
econf \
--mandir=/usr/share/man \
--enable-release \
- --with-tcl-ver=${tclver:13} \
- --with-tk-ver=${tkver:12} \
+ --with-tcl-ver=${tclver} \
+ --with-tk-ver=${tkver} \
$(use_enable debug) \
|| die "econf failed"