jer 15/03/13 11:47:07
Modified: ChangeLog cnet-3.3.1.ebuild
Log:
Fix building against any dev-lang/{tcl,tk} (bug #482318).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.20 net-analyzer/cnet/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/ChangeLog?rev=1.20&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/ChangeLog?rev=1.20&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 13 Mar 2015 06:13:42 -0000 1.19
+++ ChangeLog 13 Mar 2015 11:47:07 -0000 1.20
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/cnet
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.19
2015/03/13 06:13:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.20
2015/03/13 11:47:07 jer Exp $
+
+ 13 Mar 2015; Jeroen Roovers <j...@gentoo.org> cnet-3.3.1.ebuild,
+ +files/cnet-3.3.1-tcl.patch:
+ Fix building against any dev-lang/{tcl,tk} (bug #482318).
13 Mar 2015; Jeroen Roovers <j...@gentoo.org> cnet-3.3.1.ebuild:
Fix LICENSE.
1.3 net-analyzer/cnet/cnet-3.3.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild?r1=1.2&r2=1.3
Index: cnet-3.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cnet-3.3.1.ebuild 13 Mar 2015 06:13:42 -0000 1.2
+++ cnet-3.3.1.ebuild 13 Mar 2015 11:47:07 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild,v 1.2
2015/03/13 06:13:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-3.3.1.ebuild,v 1.3
2015/03/13 11:47:07 jer Exp $
EAPI=5
inherit eutils multilib toolchain-funcs
@@ -14,21 +14,28 @@
KEYWORDS="~amd64 ~x86"
IUSE="examples"
-DEPEND="
+RDEPEND="
>=dev-lang/tk-8.5
dev-libs/elfutils
x11-libs/libX11
"
-RDEPEND="${DEPEND}"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.3.1-gentoo.patch
+ epatch \
+ "${FILESDIR}"/${PN}-3.3.1-gentoo.patch \
+ "${FILESDIR}"/${PN}-3.3.1-tcl.patch
# Set libdir properly
sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h ||
die
sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die
epatch_user
+
+ tc-export PKG_CONFIG
}
src_compile() {
