Fix variables in wireshark.pc (bug #546126).

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

4 files changed, 47 insertions, 14 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 26999bb3bc31..594eda085c8b 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.708 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.709 2015/04/13 05:00:01 jer Exp $
+
+  13 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild,
+  files/wireshark-99999999-pkgconfig.patch:
+  Fix variables in wireshark.pc (bug #546126).
 
   11 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
   wireshark-1.99.5.ebuild, wireshark-99999999.ebuild,
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5a19b60710ca..b048cd2218b0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -9,18 +9,18 @@ AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb
 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 655 SHA256 23808179afea989d700f1d51d73d507fe27bf794967a7537d31d6fdcf78b9870 SHA512 f9e6dadcaa2bc3a1d3ab3a5dd000b10a02ee4512603d1cb8c185319acb2bf3800b274888ce1d80d1a8d2c9f40587f1b732386d6755e1740d7657459405f7b1f1 WHIRLPOOL a293bc1695e102b70ea507502746a04bdd0161c69e11f1498adb6ab4e26f61e68c305914e727787152e22877b793acf6102f1ffe72f829d0e1b765e33a0fab12
+AUX wireshark-99999999-pkgconfig.patch 1562 SHA256 f7b156b80e5c084bae01900a43aa514500eecd3a0691ca0e85b082311be15e8b SHA512 49f23728e28f2d5e3cf1dd4f477175cc36a05bc32766be927840e3228b4f7c7622e6a5cabef218bbd24ddf0babd3fcb41e9c4a398715d20b1165442db0607d58 WHIRLPOOL 42c06a8f2bc66b1a8199e023ae4ff13fec77a10e30e90ab302570a9dd416d9ebe1c3696e9d9c917a3f515cd149b85ecbb7333dadabd5cb75939a5bc6d1d774bb
 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.99.5.ebuild 6370 SHA256 bc7bbcf5d1b6a52ecc1aff057d4f00360fa92e407752e275cc518a389d21655f SHA512 dd737784ec3791e73b0b0a6b9e33c92f822a15127a9ed5115fbeda2e0234ab285f5076cd964551481afbc85572974686260850865d0ff5dccda06b2c837de4db WHIRLPOOL 76ac5e22410ff6d00fd6c2ac811b1d0289f0341739a69be1f294886e9802602c82f2b292fb94319e3270cbf4c7c6ae5cddbb91eb135c1c92e6e03085f2ea730b
-EBUILD wireshark-99999999.ebuild 6417 SHA256 7b4d8cb534c556ad5a737cc8d0775f23a822ebfe518cf460d765699a0a7f7f13 SHA512 939053de07c3873dbfcd3b11ea7b0a5297cad6f777b2606db664cf2fcf2d148a3342abc660e07b08c19cfe12927c7f7bd92fea4b86aedff6876c4fdf0b1df546 WHIRLPOOL 396ec0137dc732ded445dcd503b22fa8eb0a1561c5bec21754ab0a492ffc1cbdd4d6b6b207be9da2d9f5a291c8c5a0f9dbbb0d2068a66c01f5616da99cde0fff
-MISC ChangeLog 102951 SHA256 b0ef0255dd52d5d0e4473701b7d3014462d7ff792f24eb429338e220dfdfb360 SHA512 4cc6b959c51630354f89c2ff00535cc83b85cdf5ca5cccd20da927489d881156d7b28fe88e90523f30c7f23a4978017871f650b50650eccba3ef9cc3ea9941c3 WHIRLPOOL d12eeb0c97ed432f0c58571a35e89f74f40d8e7cc6e109d404f24f792fbacb449837f37e8b412a9c94014d9391f318d5f8dae7aa8fa24cf0c7af0b096863064a
+EBUILD wireshark-99999999.ebuild 6364 SHA256 0dba55a6e17dfc33246a60f99704d93fca7cb3474008699d07687f3137ff57e3 SHA512 75e672ecb2c7162fa88433b30b3f1bdaa2b75343697bdc4e8d0d2a158b278c00f18bcf7c9c8962b53a2b165234358e8ee6e4a9a35573fde66c01380aa801965b WHIRLPOOL 4473aa27de2c7d10ceb7c338766788ea549d8becdd1b5464de84be3f0bc196c72caf297cdca3575fad5df58be20007da6b5af08b651ba848b4fafdbc66c42b23
+MISC ChangeLog 103117 SHA256 a6931135f09758406c97fac1e405d6013a7a6ca1cd59197354f0d735933bd134 SHA512 047c4653e7d0f8253f49a6ca0944caf93ee1556bfe8adf0aec3a1c162a2d50dc408e4dd74a0fce15c0d2c7b2a2039f58bbe1e070202bf17d50dec055ad35d403 WHIRLPOOL ed18541effe4839ad9c4b3afaa9d949a036294a31f5d5131c9801fafd849973307bff4e7f0c18fad0dd52ea85d149c61313815f86a4dedbb1bed74d2bbdc80b4
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUobvgACgkQVWmRsqeSphO55wCfWOvXTStCKyB8wxwUdvDtaIk9
-gdwAn3bnC7eQvJ2Cnf4Wq1wPCaDLkpPd
-=xjhi
+iEYEAREIAAYFAlUrTVIACgkQVWmRsqeSphNRawCeLTMWgALgl+rldpLgvEtkxMUs
+t6AAnjvVNM5vjTHRU69X3e2gTZCnGUZa
+=inOy
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
index 23cfd4109cef..bb647e1d412b 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
@@ -1,15 +1,45 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -245,6 +245,8 @@
- # the comments in acolocal.m4
+@@ -242,9 +242,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
 +
  if test -z "$PKG_CONFIG"; then
-	AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path)
+ 	AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path)
  fi
-@@ -2808,6 +2808,7 @@
+@@ -1918,6 +1919,18 @@
+ AC_SUBST(plugins_dir)
+ 
+ #
++# Find out where to store wireshark.pc and what should be in it
++#
++PKG_INSTALLDIR
++
++AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix])
++AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`])
++PLUGIN_INSTALL_DIR="${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir"
++AC_SUBST(PLUGIN_INSTALL_DIR)
++PROJECT_VERSION="$PACKAGE_VERSION"
++AC_SUBST(PROJECT_VERSION)
++
++#
+ # If we have <dlfcn.h>, check whether we have dladdr.
+ #
+ if test "$ac_cv_header_dlfcn_h" = "yes"
+@@ -3086,10 +3099,15 @@
+ sinclude(asn1/Custom.m4) dnl
+ ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
+ 
++#
++# Configuration output
++#
++
+ AC_CONFIG_HEADERS(config.h)
  AC_OUTPUT(
    Makefile
    doxygen.cfg
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 34f190c0beb8..67ec95848d25 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.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-99999999.ebuild,v 1.10 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.11 2015/04/13 05:00:01 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
@@ -98,7 +98,6 @@ src_prepare() {
 		"${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.1975-gcc_option.patch \
 		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
 		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
 		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch