summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-07-18 10:37:03 +0000
committerJeroen Roovers <jer@gentoo.org>2015-07-18 10:37:03 +0000
commit70059c3c77c163cad15b238199bab90b108a5bbe (patch)
tree4da0499b3799b878c2414056287f82852fa540f7 /net-analyzer
parentversion bumps by Andreas Sturmlechner in bug #542588, drop KEYWORDS from 0.17... (diff)
downloadhistorical-70059c3c77c163cad15b238199bab90b108a5bbe.tar.gz
historical-70059c3c77c163cad15b238199bab90b108a5bbe.tar.bz2
historical-70059c3c77c163cad15b238199bab90b108a5bbe.zip
Old.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/cacti-spine/ChangeLog5
-rw-r--r--net-analyzer/cacti-spine/Manifest10
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild47
-rw-r--r--net-analyzer/wireshark/ChangeLog6
-rw-r--r--net-analyzer/wireshark/Manifest12
-rw-r--r--net-analyzer/wireshark/wireshark-1.12.4.ebuild4
-rw-r--r--net-analyzer/wireshark/wireshark-1.12.5.ebuild252
7 files changed, 20 insertions, 316 deletions
diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index a8a229785e59..97d9327e87a4 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/cacti-spine
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.48 2015/07/15 04:39:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.49 2015/07/18 10:34:26 jer Exp $
+
+ 18 Jul 2015; Jeroen Roovers <jer@gentoo.org> -cacti-spine-0.8.8d-r1.ebuild:
+ Old.
15 Jul 2015; Jeroen Roovers <jer@gentoo.org> cacti-spine-0.8.8e.ebuild:
Stable for HPPA (bug #554816).
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index e923ba22a952..34b597cf6a5d 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -9,16 +9,14 @@ AUX cacti-spine-0.8.8d-polling_time.patch 8890 SHA256 b8f9630f2a495f378372f624be
AUX cacti-spine-0.8.8d-snmp_spine_close.patch 511 SHA256 47edea95aaa7d6018ae0f64aeb894b42607cccdfe062495afad1b358afcc76d1 SHA512 13e885421658e28ffe94530f0feccfa24020d1a2cef4115ab2d4390fcf557cd5224f89395ddeb24797d9556c4cd8a55a90c8ddf65341eeb642569498478c0ea9 WHIRLPOOL 5fc6cd5503b0b27f2a1d6d957740e5a93ae9cba33bddbaae85e236f3d3749bc3159313149064cab928878797455bd118653e395cd62fd1b54dd7cba0c1bc155c
AUX cacti-spine-0.8.8e-fix-ac-macro.patch 217 SHA256 1465202e4fb7cb68863da4bd93c9df39b1199d97a39481f3b7a7ef31cf2e010a SHA512 caed6d2fa5f02cc769462cc2b7c0d5918e1912cc4962c4958dcee03c58270afb9ad8aa74204a498b305bbbea9870c0c5e337265a9230d47aa3b9a9424935d0a6 WHIRLPOOL b45d4e0864aebccdc4c4457f4b86f6f4dcb76d66742455262c645b07a36881ede204dcdc2dd271221f6f0764180ae8dac274e0fc49bbd58e8fed3650bff0aea2
AUX cacti-spine-0.8.8e-net-snmp.patch 572 SHA256 7ed0d70a33e5932c2e0e4ca91cd813e7fc345cdd88d01c82a53fe4490881b6d3 SHA512 c2cd85aae8ec925837f6aeb4b1e29b3b0a9c62aee53554c69a2caf6d964b27897c9dff0aaebfcdd68e64fed3a93315318943636a289e016f34c50b5248843f98 WHIRLPOOL ee593c1c73ac191242902a3e893085f1b8ffc24e4acf23c1c0f3316c24eb03e799ba8249a1b6e1f866ecf3ada0c8e04daf445e211aadaab18cfa6bbffe670ad2
-DIST cacti-spine-0.8.8d.tar.gz 757454 SHA256 f3910d0022f6b70178bde99af683aab29688fe227b15e8200e42fb17eac89154 SHA512 453e9aa74aa6941ec04aca92e36ae50997722a3ac29e86dae9ef5861c65e065185de9254f5b9b8bce393430e1bb18a77018b4879dfad6127a55e3854a35bceb8 WHIRLPOOL 9b3ac77617330085e31e835dd49ddb1e685d36d22b5042da90ff2c73a9aa6e99f754e7bd8d903b0132889c928f16f855a7d7054a39d51fa2787be8a956b982a1
DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
-EBUILD cacti-spine-0.8.8d-r1.ebuild 1178 SHA256 1d07cc010a5ae411036a3957e85928064fa53043f3485f96c1699cf0ecaed0b2 SHA512 42ce7df628985e6f2aa665e91e1f6be100eb83ee02f66ae384d5dbcab9c1f0342f980d624dd56db7e1ab82457ef7b0caa32aa333a619fe7a92a31c0b3b4d03bc WHIRLPOOL 3c1bd45a692eedac2f8c75e17163319bfa90dff915ac9b9426244bbc6e935ea8a133173250489bea1efea666220cfc868db06419750cfe11cf88bdeb198dacb9
EBUILD cacti-spine-0.8.8e.ebuild 1125 SHA256 48abe38538119ca0daff08eb9f1bd0332e79e30221054554e3d4d930dd0af892 SHA512 48f35f7ad9fdd30f7021a27fdbcb3799cd384842cc2d83b093c6365e088c1fec922adef50909571eb05a887ef0b2e21d88b386424cba1a67c95280a9c8568d46 WHIRLPOOL 405d667d57bc5f396f16bd9819abfe84d855f12f21ca616936ccfbd653b895aa5569d588fb37f12406126dc3a4f5bc702f166df3a040d2810bd91566a0a3f6eb
-MISC ChangeLog 7145 SHA256 0af05a61fce37952926a023a3c4d2f14985d71faea9f3d2dd3763b2322c0690d SHA512 1bef7bf9d7d05e3b32f6e372e68fae36deff8408e05b3387c3086c27be10bc19907897e7dba10df63895fe13d3acad7f2489922e76cb5a61feb916733ec9df01 WHIRLPOOL dc67dd362ffee6fd0c6d0108260d1fd775598f149e261aef62d6bc1a842c1ffc94451be667fa4aded09291b086661da35c915a06d8ccfd2e219a94521505a06e
+MISC ChangeLog 7231 SHA256 e68136fae3286bcc259fddb37d6f014244b8c3611cce3144cad02977298325d4 SHA512 c3a542b6810b06e6169c516e698f4e0918adc4723b61a1a6ad7d6ed5d1a02db91c52432bc17929ed30de1aeaa11a28e7dac32d2769e48b41465d84373c9d23a3 WHIRLPOOL 4fd0adb5146bac14f494f82d9a5e8c134ecbf3783e6b7bf3d380c5829340600c31f483188b049767e309f9d1540eb49c86f6b8025773f73e091c31c43fb393ea
MISC metadata.xml 609 SHA256 6ce745a690546641ddd769949d48fb9b30124f542b7efcd2ab6b4faea0064410 SHA512 9e949dde99ebbc17b1ba2e877e5cbffa4fae0f192d84cdce62992ee9065d4c91e20b4c173bc3a51e4c42695728bca0805c7835f10956f544a8b1a2695ee9e329 WHIRLPOOL 4eb83a74fc24080746118a5f319eeeea6bf5e2f9cfdb4ffacf2f3f485cec953c46f166f216cbd6e234559bcd9e5f9c8b0f0a28d5a80aeb9726b4eb678439cc38
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlWl5BwACgkQVWmRsqeSphMNcACfctb+ljdt9aKgZj+Z2EEi6h8G
-CnoAn25tWYzFTLDTRq4ZaqsnVaHa/CIs
-=TnC8
+iEYEAREIAAYFAlWqK7MACgkQVWmRsqeSphMBeQCaAz5lBrWwImCs5Oso1tDiQRN+
+ongAn3WS1Y/y559cHc+5zmQfMSy/EfHc
+=deKM
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild
deleted file mode 100644
index 590ba9c838cc..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild,v 1.3 2015/06/16 04:31:50 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
-
-DEPEND="
- dev-libs/openssl:*
- net-analyzer/net-snmp
- virtual/mysql
-"
-RDEPEND="
- ${DEPEND}
- >net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.8.8d-fix-ac-macro.patch \
- "${FILESDIR}"/${PN}-0.8.8d-net-snmp.patch \
- "${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
- "${FILESDIR}"/${PN}-0.8.8d-ping.patch \
- "${FILESDIR}"/${PN}-0.8.8d-polling_time.patch \
- "${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
-
- sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
- AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
- dosbin spine
- insinto /etc/
- insopts -m0640 -o root
- newins spine.conf{.dist,}
- dodoc ChangeLog README
-}
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 287ab67e3b92..b748c7c2903e 100644
--- 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.735 2015/07/06 03:02:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.736 2015/07/18 10:37:01 jer Exp $
+
+ 18 Jul 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
+ -wireshark-1.12.5.ebuild:
+ Old.
06 Jul 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.6.ebuild,
wireshark-1.99.7.ebuild, wireshark-99999999.ebuild,
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f8a8280ad625..822094704b61 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,20 +12,18 @@ AUX wireshark-1.99.6-gcc_option.patch 1458 SHA256 7f6e670a2e45ec040f5d2caf900b1a
AUX wireshark-1.99.7-qt-pie.patch 259 SHA256 679140d3a9d71ec3eed78d491f8066c3c3642b4fdc2440b236d9606107ceec70 SHA512 da65df74c9ac25bcf7aac278f67566eea12cafdb54d62cf48e0111d2ed4e8cb81bc53270b158cde4d8fd882ea1b96d5b61fec752cddb71bd67693bca6413a681 WHIRLPOOL 034dac13f8a5c475c91cd0085fc21c738ecaef248c808cebaa256ed769eaef453e95ef0ccd5c9bc7512e72ad732b75f69c8a6ec11cdb9fc8c43b0f8a598bfa58
AUX wireshark-99999999-pkgconfig.patch 1563 SHA256 30aff5b0264210c823bf892f9c87de4d8ce28cca09ed2f6b22ebae4f58e7bb17 SHA512 4f22ac8c6e0cd4f37428d028810a56e722cdd78bdd24bab7f4686b0fc6179a2105e6436c12785f8430e4c10e76eeb6db17cf5d4dfe2b1cc40ed2041c777a0bda WHIRLPOOL 3f958c87f8957cc364343f2dc9cb4663d6218bb2752a74d4599441c2fdaed73947beda3185824e80128c49ba2a03de63422987a3df9aa6f69b1c5b07574e9cc4
DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312 SHA512 ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24 WHIRLPOOL 31e3bce9d9003140f808b49e263727bb9386530a81a4ccd6e24cb6bc78f95cc5104da360be7edcd3a214de713b65931b4e77054cb1c3480d8e8c892fce57ed9a
-DIST wireshark-1.12.5.tar.bz2 29208507 SHA256 d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 SHA512 857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136 WHIRLPOOL 00592ebba59532acfe8c4b77efe87370573d1084395a27de0bdc92ce7aa1d8567d9b3a10697fb9469c890d724dfed7f1c720408230b6f39ff0a0c09670df00b1
DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
DIST wireshark-1.99.7.tar.bz2 30137558 SHA256 3d34d51edabc07ceb13734f222421f2fb012a870c837ffb313dc1af51c16b28a SHA512 2887b6b1fcd0a7ecdc0e82b8e5d2660e5ed077d27c0ebbb965770ae3cb9df484ac8964b29f68911524381a4b134743688f2cc785fb085c2687fc629dd9d7f2a0 WHIRLPOOL 350627f09dc2e13b4893b4406d5daffba605e424c80b7deecd20405b02e8839f6a193fd1baf7585f56e4bfba01b8008e93bdf264c7b5a42d7a3b009022c3ee6b
-EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
-EBUILD wireshark-1.12.5.ebuild 6388 SHA256 ae770a5138da9604c75387c92557906cdc92056268c2ce2a7e7df3fe7f0ff25e SHA512 515f9d32d440f98d9e06a51ea5abf0b9c626bbf38461b5e760de3fb60c25cdfe69e818152a7777a3aeb140b31cafc9efb7e8fdab7671b9705911eac5b479e7a0 WHIRLPOOL a8229329a3d681c0ff5249bfd83c167777c8cd84bf08fa4bd04954a85d60929896fa7e7e60ec18a50e822ff54f62e53fff4829087b21512c4c86b738f91056ff
+EBUILD wireshark-1.12.4.ebuild 6192 SHA256 19102a73e9644622f182db012be8ac96b3e2d700da274c37677660107220ae9e SHA512 359c3588037cf0628c3c2fcffea3c2476cc4650824d9eb5a8e53696e78aef18cf94bb156b2720084fdc83aaabf1b5fc208b1498f0f590dbee10f28bc2fc771e1 WHIRLPOOL 296e93ca2b4b1386ddd401dcffba94564abd3dc21e667b6fb500cc32df0593a28103735a87542d41c29d611ee21ec56299f13733a952ba794dbb640905165dc6
EBUILD wireshark-1.12.6.ebuild 6488 SHA256 e9268df0f2cf05a9d510e00af37b5902c1b526fcf5c294fc8a9a981ef4a68660 SHA512 e92d9e4ee0ad32cb7152e6e84ed0696faa3b381ffb27ef6f4cd20140b8fb977e4c822fce3fae03bcc2dc25cc7dddb68adcc0de65b96fc1990a05f29919592808 WHIRLPOOL a082a27abdd29e8fbdf1787e91227d345dac2727baf5b47f855ebae02e57f7bbae94af0bc77c7244a44dccca78aaa60e777b4a0a7f65c221242ce32390de296c
EBUILD wireshark-1.99.7.ebuild 6544 SHA256 a0ba6fbd54d8732ef0e21da1e4207e3070f2d5ee0bca487762f1457e607df691 SHA512 b4a842f74a1184e6d364bcc8a5baeffc96c0bc82ed6178aeef2f2adcdc1665932e220b34d4f3f84fd55103d9a5f9eb9d5d377761c3514282e0c8666504ad248b WHIRLPOOL 93d38743a50b7c1e59cd80881a9ef8127d1d8da487f3a0f894ad296ee92bffa9d88e7eceefe7f9fde0d8e00d222880ad76a219b79e5d841a32931bc7e89b7ee0
EBUILD wireshark-99999999.ebuild 6539 SHA256 c274320584a5308f2b45a2ba64d222e7c1658c51691c381732c67feba362ebc5 SHA512 41e79dbe5b0bc9c210c9c8e015f0d3215d7d7e9fd8da2057fc6b16ec5d387490c1a04c189a444c6b81c8a88862f44ab0844e36582928a0f25dadcd76fbc3b70c WHIRLPOOL 3fc5b104f440ac785f7c4d555aefbb749ed32109945f5eb4dba681ec20673184c3850eb64416a92ef8fafbb4a9584ee4ccd50882a58f3eddfba3c87e28efd9c8
-MISC ChangeLog 106498 SHA256 fa9dcd10eb59efeb484aff3df39987e80291ff99a34a82ef23ea8c6c5e29fbfa SHA512 cf204971cefa97352bcbfadee561b0db5ae857002dedb91eb7e399aee91f931b03398bb128b5d0b3108391068dfb90e97b9b9cf19958f041cfdf44e6d779d412 WHIRLPOOL d40d61e9b2699f91890db03cd4416eaee50d0d370acf91a4bf141490e55d002b8610fd2a9cb361d810a6273b522cb89330f98e31f88fe5291706df2c7ee23c8c
+MISC ChangeLog 106606 SHA256 61f344375677e6f844cd14108fd7fb8f23fc70ec78d65f5f2d69b8e183092cda SHA512 0c23483dab4e4faf7788bd5c32803ea19451536a6a0c2af8f65329ea87c3162ecfe3a65a064c561df1fbb26ba06a285b036be6b5d0f45a8096aacecb452bfb2f WHIRLPOOL 5e7b90a53a987f6eca8006950cd18b456706d3698d01aa9e92d4008ddd770ecf8e1250fa138bf5ebb85f1ae0c7ff0904692ce791f93acd400d0bcc1da426439f
MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlWZ78sACgkQVWmRsqeSphMVZgCbB2Z77xD1Tt60IoJTBmVGYgop
-Mt4An1cZ9Y48dddUBCyKtZnEYFH0p0Qd
-=abcE
+iEYEAREIAAYFAlWqLE8ACgkQVWmRsqeSphORswCfav0oppMfjmK0MxdvFiCc5Kcp
+VW4AniHjCf00OYCMttLyhucKmOrpkUVf
+=Escg
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.4.ebuild b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
index 222a3acc605f..c3108ce8ff87 100644
--- a/net-analyzer/wireshark/wireshark-1.12.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
@@ -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/wireshark/wireshark-1.12.4.ebuild,v 1.12 2015/04/13 17:29:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v 1.13 2015/07/18 10:37:01 jer Exp $
EAPI=5
inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="ia64"
IUSE="
adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
portaudio +qt4 qt5 sbc selinux smi ssl zlib
diff --git a/net-analyzer/wireshark/wireshark-1.12.5.ebuild b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
deleted file mode 100644
index c020878c936c..000000000000
--- a/net-analyzer/wireshark/wireshark-1.12.5.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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.5.ebuild,v 1.10 2015/07/03 08:27:51 ago Exp $
-
-EAPI=5
-inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="
- adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
- portaudio +qt4 qt5 sbc selinux smi ssl zlib
-"
-REQUIRED_USE="
- ssl? ( crypt )
- ?? ( qt4 qt5 )
-"
-
-GTK_COMMON_DEPEND="
- x11-libs/gdk-pixbuf
- x11-libs/pango
- x11-misc/xdg-utils
-"
-CDEPEND="
- >=dev-libs/glib-2.14:2
- netlink? ( dev-libs/libnl:3 )
- adns? ( >=net-dns/c-ares-1.5 )
- crypt? ( dev-libs/libgcrypt:0 )
- caps? ( sys-libs/libcap )
- geoip? ( dev-libs/geoip )
- gtk3? (
- ${GTK_COMMON_DEPEND}
- x11-libs/gtk+:3
- )
- kerberos? ( virtual/krb5 )
- lua? ( >=dev-lang/lua-5.1:* )
- pcap? ( net-libs/libpcap )
- portaudio? ( media-libs/portaudio )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4[accessibility]
- x11-misc/xdg-utils
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5[accessibility]
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- smi? ( net-libs/libsmi )
- ssl? ( net-libs/gnutls )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- app-text/asciidoc
- dev-libs/libxml2
- dev-libs/libxslt
- doc-pdf? ( dev-java/fop )
- www-client/lynx
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk3? ( virtual/freedesktop-icon-theme )
- qt4? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
- "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
- "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
- "${FILESDIR}"/${PN}-1.99.0-qt5.patch \
- "${FILESDIR}"/${PN}-1.99.1-sbc.patch \
- "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
- # --with-ssl to ./configure. (Mimics code from acinclude.m4).
- if use kerberos; then
- case $(krb5-config --libs) in
- *-lcrypto*)
- ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
- ewarn "Note there are annoying license incompatibilities between the OpenSSL"
- ewarn "license and the GPL, so do your check before distributing such package."
- myconf+=( "--with-ssl" )
- ;;
- esac
- fi
-
- # Enable wireshark binary with any supported GUI toolkit (bug #473188)
- if use gtk3 || use qt4 || use qt5; then
- myconf+=( "--enable-wireshark" )
- else
- myconf+=( "--disable-wireshark" )
- fi
-
- use qt4 && export QT_MIN_VERSION=4.6.0
- use qt5 && export QT_MIN_VERSION=5.3.0
-
- # Hack around inability to disable doxygen/fop doc generation
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
- use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
- # dumpcap requires libcap
- # --disable-profile-build bugs #215806, #292991, #479602
- econf \
- $(use_enable ipv6) \
- $(use_with adns c-ares) \
- $(use_with caps libcap) \
- $(use_with crypt gcrypt) \
- $(use_with geoip) \
- $(use_with gtk3) \
- $(use_with kerberos krb5) \
- $(use_with lua) \
- $(use_with pcap dumpcap-group wireshark) \
- $(use_with pcap) \
- $(use_with portaudio) \
- $(use_with qt4) \
- $(use_with qt5) \
- $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
- $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
- $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
- $(use_with sbc) \
- $(use_with smi libsmi) \
- $(use_with ssl gnutls) \
- $(use_with zlib) \
- $(usex netlink --with-libnl=3 --without-libnl) \
- --disable-profile-build \
- --disable-usr-local \
- --disable-warnings-as-errors \
- --sysconfdir="${EPREFIX}"/etc/wireshark \
- --without-adns \
- ${myconf[@]}
-}
-
-src_compile() {
- default
- if use doc; then
- use doc-pdf && addpredict "/root/.java"
- emake -j1 -C docbook
- fi
-}
-
-src_install() {
- default
- if use doc; then
- dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
- if use doc-pdf; then
- insinto /usr/share/doc/${PF}/pdf/
- doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
- fi
- fi
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
- doc/{randpkt.txt,README*}
-
- # install headers
- local wsheader
- for wsheader in \
- color.h \
- config.h \
- epan/*.h \
- epan/crypt/*.h \
- epan/dfilter/*.h \
- epan/dissectors/*.h \
- epan/ftypes/*.h \
- epan/wmem/*.h \
- register.h \
- wiretap/*.h \
- ws_symbol_export.h \
- wsutil/*.h
- do
- insinto /usr/include/wireshark/$( dirname ${wsheader} )
- doins ${wsheader}
- done
-
- #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk3 || use qt4; then
- local c d
- for c in hi lo; do
- for d in 16 32 48; do
- insinto /usr/share/icons/${c}color/${d}x${d}/apps
- newins image/${c}${d}-app-wireshark.png wireshark.png
- done
- done
- fi
-
- if use gtk3; then
- domenu wireshark.desktop
- fi
-
- if use qt4; then
- sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
- domenu wireshark-qt.desktop
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- # Add group for users allowed to sniff.
- enewgroup wireshark
-
- if use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}