jer 15/03/23 05:39:40
Modified: wireshark-99999999.ebuild wireshark-1.12.4.ebuild
wireshark-1.99.5.ebuild ChangeLog
Log:
Use qmake-utils.eclass to find moc/uic (bug #488640).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.9 net-analyzer/wireshark/wireshark-99999999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.8&r2=1.9
Index: wireshark-99999999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wireshark-99999999.ebuild 28 Jan 2015 23:04:20 -0000 1.8
+++ wireshark-99999999.ebuild 23 Mar 2015 05:39:40 -0000 1.9
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.8
2015/01/28 23:04:20 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.9
2015/03/23 05:39:40 jer Exp $
EAPI=5
-inherit autotools eutils fcaps git-r3 multilib qt4-r2 user
+inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/";
@@ -153,8 +153,10 @@
$(use_with portaudio) \
$(use_with qt4) \
$(use_with qt5) \
- $(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
- $(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
+ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
$(use_with sbc) \
$(use_with smi libsmi) \
$(use_with ssl gnutls) \
1.5 net-analyzer/wireshark/wireshark-1.12.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild?r1=1.4&r2=1.5
Index: wireshark-1.12.4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wireshark-1.12.4.ebuild 6 Mar 2015 09:55:37 -0000 1.4
+++ wireshark-1.12.4.ebuild 23 Mar 2015 05:39:40 -0000 1.5
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v 1.4
2015/03/06 09:55:37 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v 1.5
2015/03/23 05:39:40 jer Exp $
EAPI=5
-inherit autotools eutils fcaps multilib qt4-r2 user
+inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/";
@@ -148,8 +148,10 @@
$(use_with portaudio) \
$(use_with qt4) \
$(use_with qt5) \
- $(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
- $(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
+ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
$(use_with sbc) \
$(use_with smi libsmi) \
$(use_with ssl gnutls) \
1.2 net-analyzer/wireshark/wireshark-1.99.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild?r1=1.1&r2=1.2
Index: wireshark-1.99.5.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark-1.99.5.ebuild 20 Mar 2015 06:40:34 -0000 1.1
+++ wireshark-1.99.5.ebuild 23 Mar 2015 05:39:40 -0000 1.2
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild,v 1.1
2015/03/20 06:40:34 jer Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild,v 1.2
2015/03/23 05:39:40 jer Exp $
EAPI=5
-inherit autotools eutils fcaps multilib qt4-r2 user
+inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/";
@@ -149,8 +149,10 @@
$(use_with portaudio) \
$(use_with qt4) \
$(use_with qt5) \
- $(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
- $(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
+ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
$(use_with sbc) \
$(use_with smi libsmi) \
$(use_with ssl gnutls) \
1.701 net-analyzer/wireshark/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.701&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.701&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.700&r2=1.701
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.700
retrieving revision 1.701
diff -u -r1.700 -r1.701
--- ChangeLog 20 Mar 2015 06:40:34 -0000 1.700
+++ ChangeLog 23 Mar 2015 05:39:40 -0000 1.701
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.700
2015/03/20 06:40:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.701
2015/03/23 05:39:40 jer Exp $
+
+ 23 Mar 2015; Jeroen Roovers <j...@gentoo.org> wireshark-1.12.4.ebuild,
+ wireshark-1.99.5.ebuild, wireshark-99999999.ebuild:
+ Use qmake-utils.eclass to find moc/uic (bug #488640).
*wireshark-1.99.5 (20 Mar 2015)
