Drop pkgconfig patch for stable. Add indirection to PLUGIN_INSTALL_DIR.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 594eda085c8b2edd2b9d50b2d5b710407f298940..85832cc82e11fd05f7e106d7b8a75df2a268858f 100644 (file)
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.709 2015/04/13 05:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.710 2015/04/13 17:29:19 jer Exp $
+
+  13 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
+  -files/wireshark-1.12.4-pkgconfig.patch,
+  files/wireshark-99999999-pkgconfig.patch:
+  Drop pkgconfig patch for stable. Add indirection to PLUGIN_INSTALL_DIR.
 
   13 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild,
   files/wireshark-99999999-pkgconfig.patch:

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b048cd2218b0096272b09352760c5a2791484fca..204d9d18e19a300664d49e5195a476a15a85b4f9 100644 (file)
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
 AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
-AUX wireshark-1.12.4-pkgconfig.patch 867 SHA256 dbe0f767b67b238d53ebac7848e5ec76ec4b5b952686bd587e2d75f9e7ed0ecf SHA512 4daa28aa268dd9282f73d7fe7491175d58900818859c67f67e6483faed1555d965489ed3c3204169b37ddc0395b5e27b48f7050342c4d5bb00af9aa369242868 WHIRLPOOL 7e84e4efb36fdd6550d494923ab5cef5c5e7f927d6caefd8749b2153f4c1a75535ef1e11f8b30d6cd552055b6767a5c43cfae3e08bc16c46bc481e821b191cee
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb1afa0e4868d1ae91b7f372ced8f SHA512 e3e660db8711985e2522bd2e1fea7833781ce8b7d5e00489d50141ea9c3a1ee41105d5cdd48750fbee4437a5607ec7161c1f5a6cf40ea938ef16975183b28078 WHIRLPOOL e40f53957c9cb2f54cb2f1abb768c75e73cc7d5e26dd41613c9d0519306bdbd669d4712f5e4006a6369f80e97da6e47355936dc4d3320eb02b6902952e19d97d
 AUX wireshark-1.99.0.1975-gcc_option.patch 2939 SHA256 4d534da5b4a45f311a622108a0a4313d1581925a8cdf35d8429d5f46baab0963 SHA512 a48204408b05cd61ee9e1beb36dcb4d11b49bdb150c13fbdf490f9bb4a14fee3fc5113c501c03e294a944ae3fb36ad9d37a406eeb09ea87e02f2ce44ab6b6568 WHIRLPOOL 0c7d944840a93931fc95d5deb53e45b3e43e6129d9af51a9ac53c1a0f190b202c02b9abf89b04e863f3d803a52d91c5496cf357cb3e5bd244a49c0fa7c56e8b0
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
 AUX wireshark-1.99.1-sbc.patch 665 SHA256 c76afab0f03c59001df597948153bf76bbdc14da30a2de9e93831bed6dc6e898 SHA512 3e71c9ecfb07c96df8330b6a1fa959bde79bf7531f106b7f90acc59a82f3b1ec74ae1643b9b13cd6a642b25766996afa7083ac1daa2bada765134ae8846112a8 WHIRLPOOL 8b53a06ffa03579ed71a558cb475e05bb7152463123089cec80b3f00ae68bab02fcba2fa789471419175965be6af1604e8371b30b9dd04a5b967c995627a5517
-AUX wireshark-99999999-pkgconfig.patch 1562 SHA256 f7b156b80e5c084bae01900a43aa514500eecd3a0691ca0e85b082311be15e8b SHA512 49f23728e28f2d5e3cf1dd4f477175cc36a05bc32766be927840e3228b4f7c7622e6a5cabef218bbd24ddf0babd3fcb41e9c4a398715d20b1165442db0607d58 WHIRLPOOL 42c06a8f2bc66b1a8199e023ae4ff13fec77a10e30e90ab302570a9dd416d9ebe1c3696e9d9c917a3f515cd149b85ecbb7333dadabd5cb75939a5bc6d1d774bb
+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.99.5.tar.bz2 29806267 SHA256 d2d5dd1367eb05037651daf7355888f5938d5ca45fcd730fe117605adf9e6c7c SHA512 5c951f189a0904c02897ee81101896215332c39f3ae3daaef92c923f020a6bd46b9158329add8d70e7ffbe06175252b8b477e4ca9bc86ae96b198bda20296235 WHIRLPOOL 2b70ea5df6b9c50bef6df9e05158ad8fd8ac106df1600eb51aa5b42002f05853d76ed446ac6f8b4cfad9e5899e1022f296830f6aadc23c41924ceb8f866c5321
-EBUILD wireshark-1.12.4.ebuild 6291 SHA256 552e19621d3356e948f18b19f8ffe0b1d437f24691b66af93e0772a63cc0e44d SHA512 983fdc01d899b75f3af00cfb494317fd919e13078e2d2389d9ff21b2d327940ed16bf940e1a852301c7a5d5268535d28035431409cff63e5b6722104abdd4761 WHIRLPOOL 09ee2bbbfa64fdfa1606e7333d0049fa859a44bf13c8bd0993d3a855cd55d4d45fcf3192c168c1ee9141587d7d498970040db814bd19af348b4a7a3cc2f93da1
+EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
 EBUILD wireshark-1.99.5.ebuild 6370 SHA256 bc7bbcf5d1b6a52ecc1aff057d4f00360fa92e407752e275cc518a389d21655f SHA512 dd737784ec3791e73b0b0a6b9e33c92f822a15127a9ed5115fbeda2e0234ab285f5076cd964551481afbc85572974686260850865d0ff5dccda06b2c837de4db WHIRLPOOL 76ac5e22410ff6d00fd6c2ac811b1d0289f0341739a69be1f294886e9802602c82f2b292fb94319e3270cbf4c7c6ae5cddbb91eb135c1c92e6e03085f2ea730b
 EBUILD wireshark-99999999.ebuild 6364 SHA256 0dba55a6e17dfc33246a60f99704d93fca7cb3474008699d07687f3137ff57e3 SHA512 75e672ecb2c7162fa88433b30b3f1bdaa2b75343697bdc4e8d0d2a158b278c00f18bcf7c9c8962b53a2b165234358e8ee6e4a9a35573fde66c01380aa801965b WHIRLPOOL 4473aa27de2c7d10ceb7c338766788ea549d8becdd1b5464de84be3f0bc196c72caf297cdca3575fad5df58be20007da6b5af08b651ba848b4fafdbc66c42b23
-MISC ChangeLog 103117 SHA256 a6931135f09758406c97fac1e405d6013a7a6ca1cd59197354f0d735933bd134 SHA512 047c4653e7d0f8253f49a6ca0944caf93ee1556bfe8adf0aec3a1c162a2d50dc408e4dd74a0fce15c0d2c7b2a2039f58bbe1e070202bf17d50dec055ad35d403 WHIRLPOOL ed18541effe4839ad9c4b3afaa9d949a036294a31f5d5131c9801fafd849973307bff4e7f0c18fad0dd52ea85d149c61313815f86a4dedbb1bed74d2bbdc80b4
+MISC ChangeLog 103351 SHA256 d6d96eea90ffa9541df18f0d3dbb4817bbbc99407236d464e8e746f102265a08 SHA512 49da037e9941346eb3e1d99ab9b1de924dc0507cc7ded8d5922878bd2207bc04a0055641b1cfc55fbdaf605ab1927670ef6e2137946cef6bad9f4cd3e56a2966 WHIRLPOOL e49b22340170a3c263c97bf7dad126b276be9d3e7d909d9a131c32e4b5c0682cf1d10d9d33bc96ef2b1f2417f66dee262576ac5b57b68f9b937c7b0edb763653
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUrTVIACgkQVWmRsqeSphNRawCeLTMWgALgl+rldpLgvEtkxMUs
-t6AAnjvVNM5vjTHRU69X3e2gTZCnGUZa
-=inOy
+iEYEAREIAAYFAlUr/PEACgkQVWmRsqeSphMpRACfezfGMd6Y67jkFX+INMeqFG5R
+It0An0OShsgmFwGPpEx78D9neVDe9VUb
+=yCR5
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/wireshark/files/wireshark-1.12.4-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-1.12.4-pkgconfig.patch
deleted file mode 100644 (file)
index 875d190..0000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.4-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,9 +257,10 @@
- # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros
- # like PKG_CHECK_MODULES. If the first call to such a macro is under an
- # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see
--# the comments in acolocal.m4
-+# the comments in aclocal.m4
- #
- PKG_PROG_PKG_CONFIG
-+PKG_INSTALLDIR
- 
- AC_ARG_ENABLE(osx-deploy-target,
-   AC_HELP_STRING( [--enable-osx-deploy-target],
-@@ -2808,6 +2808,7 @@
- AC_OUTPUT(
-   Makefile
-   doxygen.cfg
-+  wireshark.pc
-   asn1/Makefile
-   _CUSTOM_ASN1_AC_OUTPUT_
-   asn1/acp133/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,6 +56,12 @@
-       smi_modules ipmap.html pdml2html.xsl
- 
- #
-+# Install a pkgconfig file
-+#
-+
-+pkgconfig_DATA = wireshark.pc
-+
-+#
- # Install global profiles in the "profiles" subdirectory
- #
- profilesdir = $(pkgdatadir)

diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
index bb647e1d412bd0911353471d59734c7638fd575e..1a9af2353daad4e743f061e4a19c838ebbb3fd79 100644 (file)
--- a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
@@ -22,7 +22,7 @@
 +
 +AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix])
 +AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`])
-+PLUGIN_INSTALL_DIR="${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir"
++PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir"
 +AC_SUBST(PLUGIN_INSTALL_DIR)
 +PROJECT_VERSION="$PACKAGE_VERSION"
 +AC_SUBST(PROJECT_VERSION)

diff --git a/net-analyzer/wireshark/wireshark-1.12.4.ebuild b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
index 3f199e6dd1577a90a3bdfd4ebc01eb5038a9ea25..222a3acc605f2c561754fae260155f268b192d65 100644 (file)
--- 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.11 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v 1.12 2015/04/13 17:29:19 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -95,8 +95,7 @@ src_prepare() {
                "${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.4-pkgconfig.patch
+               "${FILESDIR}"/${PN}-1.99.1-sbc.patch
 
        epatch_user