Install pkgconfig files (bug #546126).

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

7 files changed, 96 insertions, 14 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 3739dd73b09d..26999bb3bc31 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.707 2015/03/30 15:43:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.708 2015/04/11 00:46:45 jer Exp $
+
+  11 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
+  wireshark-1.99.5.ebuild, wireshark-99999999.ebuild,
+  +files/wireshark-1.12.4-pkgconfig.patch,
+  +files/wireshark-99999999-pkgconfig.patch:
+  Install pkgconfig files (bug #546126).
 
   30 Mar 2015; Jeroen Roovers <jer@gentoo.org> -wireshark-1.12.3.ebuild:
   Old.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 60ce102fc4d8..5a19b60710ca 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,22 +3,24 @@ 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 655 SHA256 23808179afea989d700f1d51d73d507fe27bf794967a7537d31d6fdcf78b9870 SHA512 f9e6dadcaa2bc3a1d3ab3a5dd000b10a02ee4512603d1cb8c185319acb2bf3800b274888ce1d80d1a8d2c9f40587f1b732386d6755e1740d7657459405f7b1f1 WHIRLPOOL a293bc1695e102b70ea507502746a04bdd0161c69e11f1498adb6ab4e26f61e68c305914e727787152e22877b793acf6102f1ffe72f829d0e1b765e33a0fab12
 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 6244 SHA256 15fb17318242f7ba556f65dbe5270eec1c710548db20ba58576d9e728e0eed27 SHA512 4c7b41e9dcc5707af3dff24a8c8f32320550ed43af18a3cf6b9deac0fc3a1d64301791c3a87a2cca3442a1b65d6594c8c1b1e98afcd1fc8ad11e1532d2bc3708 WHIRLPOOL 0c2494ebc41dbafbfdfe476a572285bd5cbe8e4eb85e3a6515b1b244a3952c042955b8792658ba144e1d33968d49ea0c8c6d8228c9e4fd03c3cfb09132ceca64
-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 102695 SHA256 2b02342df4d6632bf8e83ba4bb2b840604408e01544d8508aa17fd5c012dce58 SHA512 2b1ca86ec9c0b792a2204cbe8590e057adaebd445c22f85c2edfba749dddae04fe6eda94e7762e42a5312bf66955ee834d3421f59210bbb518d8c2b66ae553a7 WHIRLPOOL f688fde8950e5260dfbef1151d02b14191d480e03bba8f534cd36938da8ddcad2ac20999e3da8b0f22e920f28c2b0751c634c194d5ee1e7877e76c010c786481
+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
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUZbygACgkQVWmRsqeSphOVbACfRh/1PLS9PitzJ7VJtmnGnh2a
-XTkAnAv4wKChBPYZgGc+3YJO0spySAw6
-=zU/Y
+iEYEAREIAAYFAlUobvgACgkQVWmRsqeSphO55wCfWOvXTStCKyB8wxwUdvDtaIk9
+gdwAn3bnC7eQvJ2Cnf4Wq1wPCaDLkpPd
+=xjhi
 -----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
new file mode 100644
index 000000000000..875d190252d3
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.4-pkgconfig.patch
@@ -0,0 +1,37 @@
+--- 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
new file mode 100644
index 000000000000..23cfd4109cef
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,6 +245,8 @@
+ # the comments in acolocal.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)
+ fi
+@@ -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/wireshark-1.12.4.ebuild b/net-analyzer/wireshark/wireshark-1.12.4.ebuild
index 17da53bfcae7..3f199e6dd157 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.10 2015/03/30 10:02:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.4.ebuild,v 1.11 2015/04/11 00:46:45 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -95,7 +95,8 @@ 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.99.1-sbc.patch \
+		"${FILESDIR}"/${PN}-1.12.4-pkgconfig.patch
 
 	epatch_user
 
diff --git a/net-analyzer/wireshark/wireshark-1.99.5.ebuild b/net-analyzer/wireshark/wireshark-1.99.5.ebuild
index ca5825730649..dbd707264da1 100644
--- a/net-analyzer/wireshark/wireshark-1.99.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.5.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.99.5.ebuild,v 1.2 2015/03/23 05:39:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.5.ebuild,v 1.3 2015/04/11 00:46:45 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -96,7 +96,8 @@ src_prepare() {
 		"${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}-1.99.0-qt5.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch
 
 	epatch_user
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 083d3c0e9188..34f190c0beb8 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.9 2015/03/23 05:39:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.10 2015/04/11 00:46:45 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
@@ -100,7 +100,8 @@ src_prepare() {
 		"${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}-1.99.0-qt5.patch \
+		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch
 
 	epatch_user