diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
| commit | 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /net-analyzer/wireshark | |
| parent | aa3411e241a201d53a2689766fe419f2756819f3 (diff) | |
Revert "gentoo resync : 24.03.2019"
This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
Diffstat (limited to 'net-analyzer/wireshark')
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-3.0.0.ebuild (renamed from net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild) | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-99999999.ebuild | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index f12dbf762693..0d382c88e4a4 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -11,6 +11,6 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5 -EBUILD wireshark-3.0.0-r1.ebuild 6677 BLAKE2B 644e25d08956e608e40313d7e974926c617c3cfa9ff05e45cf14be2a1d453bdb186dcfad2a2ceedd53cd30f8d854292a6d9e1171826a59d26f5b5b1bee772038 SHA512 56b471c1a6ec596ea678e0f03bd3a304cddbbade2f02fb9d1c11a3aaef8665a9ab60fabf585875c02cee5b2eb1b49c33a828060033daf3a18fbbb15d3fd4c702 -EBUILD wireshark-99999999.ebuild 6633 BLAKE2B ce3dd8cf7402ee9f7c97a656780d7af20ee6fb44962846d4b759c98c7d91eb080681c9e2667a3c7fcc69b4ecc6034e1933be13e7d64af37bd2f6fa76ff2688f0 SHA512 a0d4a4437ae1baa9bf30a64ad9cd2847f210c0a099690580d63ca14ff7ec63e339853063703c494046da7e7a4b8da6666db5347a263c49cea1b9b371e8b56e7f +EBUILD wireshark-3.0.0.ebuild 6739 BLAKE2B 474a9394efb6642c941d032c940663fa7ccd9a7d1260dd79b07e5a569d7960c5e3e640a8228a0013413782ab26dade9fc921721ac6c44bc0016efcfe9587bc0c SHA512 b074cb36f157572a350f7e70583c8cc0f8ad2d562cf03d1d64dbc274f86b42ba686bcb4e4660e76414a003ec15a161814e63d39ae67a452cc42cbf212e4be54f +EBUILD wireshark-99999999.ebuild 6585 BLAKE2B 41e0ed51a2976483a87b0de2b60bf4ea8e6a341366323f77bc39cd475839766038445e2099427c4f34257dd123f7d44c58eee2dd70ddb20b8830114e66e0c85d SHA512 ec5ad63c8fe0bacaf7861b8aab8ff85c84d49a9b7785c02ab0bd611c223e4160bd1586d10d8def3a656eaa056aac11913cc394a0f9ae8230aaed777a69d62800 MISC metadata.xml 4882 BLAKE2B 82d8cc65f2229522e9ff07e650d6fbca97143b7cf65c1e5a576362af265e945f24507a2b1deb6d2d32ea72197b2fdab9d946ff96210ec8d5bb4d32fabea4eadf SHA512 9a391d56aaa05817484ec1a9c82acfe074657ecf9356d94b8837d908a014fd5732281ea6d28d4759f711e0772dfaba19f64043921aa65657b389c909cc68c707 diff --git a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.0.0.ebuild index f755315a7d8c..49bf12ab1189 100644 --- a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.0.0.ebuild @@ -144,7 +144,6 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_CAP=$(usex filecaps caps) @@ -217,6 +216,9 @@ src_install() { fi prune_libtool_files + + mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die + rmdir "${D}"/usr/share/doc/${PN} || die } pkg_postinst() { diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index f3cf011e5609..e9927cc3b151 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -144,7 +144,6 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_CAP=$(usex filecaps caps) |