projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62a1af2)
Use qmake-utils.eclass to find moc/uic (bug #488640).
authorJeroen Roovers <jer@gentoo.org>
Mon, 23 Mar 2015 05:39:42 +0000 (05:39 +0000)
committerJeroen Roovers <jer@gentoo.org>
Mon, 23 Mar 2015 05:39:42 +0000 (05:39 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

net-analyzer/wireshark/ChangeLog patch | blob | history
net-analyzer/wireshark/Manifest patch | blob | history
net-analyzer/wireshark/wireshark-1.12.4.ebuild patch | blob | history
net-analyzer/wireshark/wireshark-1.99.5.ebuild patch | blob | history
net-analyzer/wireshark/wireshark-99999999.ebuild patch | blob | history

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index eeed189500885471c2d9f16ec4277f1d8c7cba13..d1ddc2b0487dd020ea9c26e9cacefc5fcd165a20 100644 (file)
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -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 <jer@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)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index cbdfb8ebba8a1d5274c1cca8e01147ec66e2b4ba..3737164b2f184a0bcb3d5a36298def2e4dd0645a 100644 (file)
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,15 +12,15 @@ DIST wireshark-1.12.3.tar.bz2 29211228 SHA256 69950b9dcb1a630982b5f680554d73d27e
 DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
 DIST wireshark-1.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
 EBUILD wireshark-1.12.3.ebuild 6160 SHA256 15bfcb8012983ff5c18948554c4762eb0a75d9ae61e9cbb34ec489881423a7b3 SHA512 58b8805b3b4f02f9c6debfe479e159718c383d8518b5231fe9ef5c02c04b0b92703e33d776ffe7c37cbee035abfa5c41c9a3d7d4aae90a68e43c4da906e91ce1 WHIRLPOOL 40c5c8b0904dee397fc59a1cd5e3c42c3b64ed40381fe35128f2a1f8b9bba2166d2b2735df331ea71ec955655bf1b7b1a89f5d464ca95dd0a5ea9c4e9798bc60
-EBUILD wireshark-1.12.4.ebuild 6164 SHA256 37969517ec1825af58640d818cb62843d76e8a0380dd71439c00ab608d60a138 SHA512 b97af3f2e1f929019850401adebfb109b794f4d6ea870ab313211207fb25bbbe55a99f321c8fe16f6eabc0ad7334ff49f983e2fbea9d99565e2b5fc4d102de46 WHIRLPOOL 1764455f237f73731be03516a7c08ed1b455f1f9986788ca349d93e6f9392294e278bf2cc16f1dfa3385f39ce6487ffcea6203a233f4b93ba71386a9b060268a
-EBUILD wireshark-1.99.5.ebuild 6237 SHA256 82670516e9386c892708c140ee970de15c6d399abc18a4fb04c03774868a73a3 SHA512 de028c8e3a61733f3850a8eda6309a8f50ac1d5a8e617c9a167f9ab3ec58898f260d02c92ef1a2c4f35b57741e9403bffe64d6e549442b99f64cd4de0e889ae0 WHIRLPOOL eaf5b007c9e46426bfb908bf19f2ccd3c9f9949edfdb0fd6228727267c2944d4a05ad2d9ffceefdbd4c0986610cc342fbf54c945d51391d35352e366b792de24
-EBUILD wireshark-99999999.ebuild 6286 SHA256 e843ecbc9e5ecfb03f3457bf66e0db317c50453c8fcab03da252c8ec377f290e SHA512 5c1b420d80c38e7f14748ca4023a6774530ef72ee864281fb56f4c9a3474f9935772281038e63b5cd03afb0611f9f934211066e1be9b7df01799a590749ebdc1 WHIRLPOOL 1841d27f0bec41c2e0d412967c13c3b12168f95a64b9e3fbffa8fe397ac7cc5f2d2a8a449d7e9a94ba0995629acb44612c0489241b4845ac0d57ecf4127586a9
-MISC ChangeLog 101879 SHA256 cde1e6727207dc8bfa5761fd9654b1a687f220565d6bf22cdfdaed951a01fff6 SHA512 69f3255505280c320b3b1d4a61f1789e213b5473a2909229a855a62f7fd9efc3e5328804c96373f8ff5f9b370321e3365e5ad599eaf95ac59d6ecd3b634f9aef WHIRLPOOL 3a48c596d8ba8ecd9ad196b46fee7e8c50ea290a0f1ace1d1349629f05c1e59968f626c79f6c03ae364e6ea1553bd5dda57271b75510b7a024d3bbf51ad9a434
+EBUILD wireshark-1.12.4.ebuild 6248 SHA256 0f815fa68d34d6ada0dcc1b7b24ea26f4c9b7808f27937cca6e5ab0281f58431 SHA512 1616994dba0f000720bf64d2049be5c99064e73da357778000bd67091061001f7d35cfb1f4e39885da683d351207dea15327133befbaf0a4a0502ea3eed2d6e6 WHIRLPOOL d647fb60d8003a4ab9cf1c2f575738ff515805e5b114cbd9a93001a0deed7b94d6f908799110689104845f4d647c78d3b80646c462b3910992c3106d7d3b6fc2
+EBUILD wireshark-1.99.5.ebuild 6321 SHA256 b65b511d6320a13b39e719e51e8bfc1bf7497476eb3b01fc29a79f0b5dfa14cd SHA512 ce4f83c53eda5669c126b1cfcca395c58840f0bb9659feb11fea73c5be0123d54a987e6476aa02e6e5aeb9baf8ead78f1b0ba6d3c3c6b098fa5918e1c034174d WHIRLPOOL 8feac2a37bad9c9a377ae5a09c8621d821eb53c63be8186dc554c07b6ab55a54389f8751c20a6af88463b9f1b9d8bafba5140a1163c4ab7083d910c8a0dfccf7
+EBUILD wireshark-99999999.ebuild 6367 SHA256 db1ac8fab15ba6182f9dcdedbe0fe3c73464cb2d3208f2c1be9fb5c54ab2f534 SHA512 188ec8f18e5afc909a259bba194449123f2472a534c10187e93a295b42e035e7e921b8e8e86deea1d807ad6d3c93865f67cc0c34471a24c8b03162d285b0d90f WHIRLPOOL 48b8af92694a899ddb1a4f574c510c170ad296c48b5288f7fc6c91dd9230dead021d9394f156550bb653f9b2a77559dff0965e788e3a721690339ae3de5f34b1
+MISC ChangeLog 102062 SHA256 8d43bc23031ee533d37e73a331cab31db1ec4e00f1cd85253e1d7e1e435513ff SHA512 3d2bcf761abbdd7193a7ac3585700e014d7b0b7ef995015e11ba35645b2ffaa7579442b9028266d3fc5565c429942331be0b7bf78e0390506b427eb6d4e7c957 WHIRLPOOL 962b2785c6d4924dd5e139411430af33abe2ee11f26f24c43fd5c201bb4f991b5a7676c0d5a3eb0f916907fa6ca975d2c79558f5d2d31de495967295e05fb8ec
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlULwOMACgkQVWmRsqeSphONBACffFYA6Dj8BjjZ5A60elrSXc4o
-GmYAnA1+fJDS940Ka1+l59TVzd8G+j5c
-=mg9a
+iEYEAREIAAYFAlUPpx4ACgkQVWmRsqeSphPOSQCdHirpFm2AU6VnOupYEnekHTva
+hGUAn0tGQgF9FhzV7x1lNumzgyvzKc+y
+=IPlC
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.4.ebuild b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
index 54d1f50d0ff8c227e3ba0c91db5a9db025ab77fa..609320ec942acf15b655dcec4d624351688b0bdb 100644 (file)
--- a/net-analyzer/wireshark/wireshark-1.12.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
@@ -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 @@ src_configure() {
                $(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) \
diff --git a/net-analyzer/wireshark/wireshark-1.99.5.ebuild b/net-analyzer/wireshark/wireshark-1.99.5.ebuild
index ffb96430109b9d2f5869889c7ace06805ff0d4d0..ca5825730649453e438d1a5597792f763a0410f4 100644 (file)
--- a/net-analyzer/wireshark/wireshark-1.99.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.5.ebuild
@@ -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 @@ src_configure() {
                $(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) \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 408e3fd263f7122dd5220100a45c29c5e358c7d1..083d3c0e9188164ab43f8a109bb42a5d8b5bc816 100644 (file)
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -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 @@ src_configure() {
                $(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) \
Unnamed repository; edit this file 'description' to name the repository.