Add USE=cairo (bug #546102 by Adrian).

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

diff --git a/net-analyzer/tcpflow/ChangeLog b/net-analyzer/tcpflow/ChangeLog
index fc3e4005240959a4b2994829b7809e5eb853cc3f..407e0a136391ffff6edcedb06d265bf2af15edfb 100644 (file)
--- a/net-analyzer/tcpflow/ChangeLog
+++ b/net-analyzer/tcpflow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tcpflow
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/ChangeLog,v 1.53 2014/12/27 19:28:37 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/ChangeLog,v 1.54 2015/04/12 17:58:03 jer Exp $
+
+  12 Apr 2015; Jeroen Roovers <jer@gentoo.org> tcpflow-1.4.4_p3.ebuild,
+  -files/tcpflow-1.4.4_p2-deps.patch:
+  Add USE=cairo (bug #546102 by Adrian).
 
   27 Dec 2014; Agostino Sarubbo <ago@gentoo.org> tcpflow-1.4.4_p3.ebuild:
   Stable for amd64, wrt bug #517336

diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index f6458bd60f80ff7bb3d88f950f1f9d95bac270b7..1657992516e081b250b886c110982acb6fba2f5c 100644 (file)
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,28 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tcpflow-1.4.4_p2-deps.patch 868 SHA256 d52da6b9c433f4ac3fa6d48c722e6dbe529fc2dca166fdac6150f0d7a0e4bc6a SHA512 59cc9f89144b4398d29bdcbd3abcdfe22935dde7f2a82f5a18375f9e5a5a08264c7729763958c0c9a2346bb8b7832e23b25f488ae86e1638973309e8f1d0461d WHIRLPOOL d7d229b77e3c889e9549492321fc893dcef357ff737bcc2bf1b62e381f951902158b0eb65766ae0e1fca8daac7b9e61bdb914031438b42890273455fb28cf256
 DIST tcpflow-1.3.0.tar.gz 220055 SHA256 bd150e432292419b16af45fa951254b19d830709a1c931032ed475049af0b040 SHA512 4812bb4060535f6258496fec1fa5d9489e2832aa342ebb6f00e0717468d74463761637d5198951401d115f6d9c985475f56a435229070fa30f4fbc581f0c5587 WHIRLPOOL 98f50ad1f4882ce3d22d22975b646f48dac12833654d6acbc272626a1cb0e3b262a4e68236bf39073ef7602fcc7cb43efb9e4bd2b3668dcc7cb564af90122ab8
 DIST tcpflow_1.4.4+repack1-3.debian.tar.xz 12244 SHA256 e006b5c6288bbc46e01a8488f7bf448ddd97ac454fe906764ddc3c03696b1a4b SHA512 720f080e2ebb481d64c05b7f4629fb25d6a5c069ce7901959de1f5ad38af0b68ae51469d1df070021a21154e8cec960e8b077f6235e1eb6a476bae252627fd3a WHIRLPOOL 632047fad5f439c78c1d8fe6e39f97058073ac5ff707ff5719372a803e1ff01145202bb894f49e6ad9861b255a0ef04be7fefd76f2c4d34afc2d2c99e41d66e0
 DIST tcpflow_1.4.4+repack1.orig.tar.gz 525060 SHA256 3269742db7acc51ce0ae8bfbe3dfe536654694e276032555f1e825c6f463711f SHA512 d44d060dc7a373137bacca7d38a782d5059ae8b0aa3d92df221955e4af88413f1bba464132c0a3e04d12005a2f54c6252b59e6608154f7ede0a1d3b8d608c1f1 WHIRLPOOL d5646c6fffec95a68624a20f0ce2f086f03cb28a7df529e68636c28c16bc5ebdd81b5edce769d495209f3eb0fb1167fe3b241912c2497cffd99d4e668406acbd
 EBUILD tcpflow-1.3.0.ebuild 719 SHA256 ccb7fdae5b2a4ecba098441c75f70963ae6702b69ce5ef799a869f5a96dd9479 SHA512 5ccd4b1bf245bdaf552defed010cf3c4f4616294632d8fe72bbe8fd6ef88ae5127d771a388f51bba36912e1bf48bab4d9e4ed9a74f179331643610cd26e7748e WHIRLPOOL 1bd394c679b0df6b6381cb56a05b9dc4c2b84f91b5de254bfce28e9699d162ca0b321668a6274ab934f985b8f1b7f5414c0aab5394860e42ba25027f19a5244b
-EBUILD tcpflow-1.4.4_p3.ebuild 1225 SHA256 842e610d4e92793b01f49b99b08e26e065561778a2193b485d35abfec1f856b2 SHA512 a73c947d93067a9bc3ebeaa29e572b3f8e887aa7190c1216f0f3f607083a9b6fac7e7c869ed7326dc8e436806a913d4af6ce7d351c7d8d640a429321e107600e WHIRLPOOL 8380d59cca9ebf202f597d6184595d41907ff6e6807481fa30f28d2574ae113448cbd1aa634c1bf76a8a5caeb08e943c8bf4e61097f9b39e0870807756e15859
-MISC ChangeLog 6191 SHA256 e8ccf4283b3749968abb447652fe6911fef7ce14605c17eea124265a568077a7 SHA512 8cb66fd88e49ce7dd939299f55f50f79f8ea973a0d2b36e7adcb6af22e2b5ea54a8a15a92a7c8618c6cbf18ef02a0d6a75ecc3547e694807ff795aec8194e9f0 WHIRLPOOL 163fcd5e36c71849b5b36dac050c42e2d7624535ff226fcc1ee8a80dab0e780d7ac94d166bb0ad99fae8527513806fd1f6568bd907e5745ff0e3db9b7de33f58
+EBUILD tcpflow-1.4.4_p3.ebuild 1304 SHA256 c63ed37e896e9e0d6fc4f962e60b9e78bf638a62d50a19c61d1aa949316d0461 SHA512 d5b61ff776f65bcb82fd7aecd48070a0ee0d6db726370a55fa114eba8e41e5c7db86696f5d97b32a85f86fa2581845d826adf23faf655bf1867b0a89800b4ce0 WHIRLPOOL d491ebd0c3117c1c7dc4712e8ad671d4c2a1caf635ef1ad2bb853fcfa7f85cbdcc28cd761f7e3fb2f69287b05dc2a9ff163a86123cd425c78ffc5ccd234b8461
+MISC ChangeLog 6343 SHA256 55557d7a560a1b5ff5849c8bd3d4f4ccddea62db360576147a2a1a98527703f4 SHA512 721fa17404634890765900485da6770a3280dd4994eda78d084e76e3625f976fad4729084b4860a9930aa4ffe4672b7159882df703bcbae090b9ec4430ba632b WHIRLPOOL 6089633f610af588ea2528f0184416430dbbd4f5a7775cef69f5556e8a0a93a27c54322ced313fed1e857bdba6b95f7795979218107c192e1656bde4388f812e
 MISC metadata.xml 250 SHA256 1b3923e11bb9858b14972dd3761838f28b0a126968db08021217ddc790ab4b88 SHA512 3dcdf05237063e351dfb1d5c712f3151f09b8ae6b539db8902e6ca146b7cdb4b459eef148a5580996cd774fb232d82b36f7556ba71a22139eae514c4c0cf9b1a WHIRLPOOL 3b0a8f1776fbf10f93fcea70981389446e488af2e6c7de198db717c93113077f3786889d4c8451c0cb6963133abaab3c028dd8d26da4ba9099cee6f878f9618b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnwhmAAoJELp701BxlEWfzIgP/2yCgBNQDKcPeP0OqstHIp0r
-KzQC8xG6q3Q65+LXMWQRH1jrtyJt5sZlhPoIdSI3jOw/9O+2F+lItBjoKMk/ENND
-DDPkEpfTaNxSx5vo2QB3pavi6dTH2w93WCAnhqZ7SprBUOskO99zN+/FIm+40M4T
-+WXIjWGxK7Vjj7quSVX2V+TabHO4f5iRItbypjrZimTsJsP4Ww0eJwyZGxrkl+wG
-X+d5rh3UEMp7PHZ5jyAgW+/W4EAOAmcji2flWYKUPCAPgGzdKJc4u8aOC9PdwcRQ
-+dGnvaQ9Ep6RsuahNvaQXwNVs+8e/ViVxZo88A1emMemW+7AFy8atXOiQjaYpnRf
-XbUIgBkMjkfwUaYebSgYf6SsyxG0EZEMNtsKF14rAH979rm0jegqnaCrrIVtiEvO
-8XyWL1yzHxBjNyNXNSCsWfLg20+gqIr5RkeEH4P/ZxDyR68gAvhwY34lbBl0xNGs
-cS7j8czaQSQKV20fSrZv2is6d+ot6t0/cpI2aJiLptp9cWIN8h4jkBepfdqSZGqJ
-ZaKCtPrpJcEte0PJcvTsfiPxc52zI0bLRz8ZWcyLx+Gnl8htMdJ8rvNZQ2BiZnhe
-zXwVoJApyeb7Kb3okVAOYq9inj7dxl4VuCW97Y8n8feoZgaGCZiS+yNU1NRo/lMT
-AiZqkKiPEH9xFMr3sfj4
-=BVQ9
+iEYEAREIAAYFAlUqsiwACgkQVWmRsqeSphPFKQCeLZ4NK8NeFszUlb7XIlGZmcAO
+TOYAnA/zF5BkqSmfQ29wvUDCPtymIBHC
+=Y+6L
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/tcpflow/files/tcpflow-1.4.4_p2-deps.patch b/net-analyzer/tcpflow/files/tcpflow-1.4.4_p2-deps.patch
deleted file mode 100644 (file)
index ff4d694..0000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.4.4_p2-deps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -191,11 +191,6 @@
- ################################################################
- ##
- 
--
--# sqlite3 is fun
--AC_CHECK_HEADERS([sqlite3.h])
--AC_CHECK_LIB([sqlite3],[sqlite3_open])
--
- #
- # ZLIB is required for decompressing
- #  Note you cannot put comments in the AC_MSG_ERROR for some reason
-@@ -286,13 +281,6 @@
- # drawing support via cairo
- #
- 
--# Cairo requires these to be explicitly included on mingw (and perhaps others):
--AC_CHECK_LIB([expat],[XML_ParserCreate])
--AC_CHECK_LIB([pixman-1],[pixman_region_init])
--AC_CHECK_LIB([bz2],[BZ2_bzDecompress])
--AC_CHECK_LIB([freetype],[FT_Init_FreeType]) # requires bz2
--AC_CHECK_LIB([fontconfig],[FcBlanksCreate]) # requires freetype expat
--
- AC_CHECK_HEADERS([cairo/cairo.h cairo/cairo-pdf.h])
- AC_CHECK_HEADERS([cairo.h cairo-pdf.h])
- AC_CHECK_LIB([cairo],[cairo_create], , [

diff --git a/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild
index fb28685b9778c97d8f960f838db31467af529d88..3a8b7b88e4c5ce408897212e4e688407570f8b46 100644 (file)
--- a/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild,v 1.3 2014/12/27 19:28:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-1.4.4_p3.ebuild,v 1.4 2015/04/12 17:58:03 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
-IUSE="+pcap test"
+IUSE="cairo +pcap test"
 
 RDEPEND="
        app-forensics/afflib
@@ -24,7 +24,9 @@ RDEPEND="
        net-libs/http-parser
        pcap? ( net-libs/libpcap )
        sys-libs/zlib
-       x11-libs/cairo
+       cairo? (
+               x11-libs/cairo
+       )
 "
 DEPEND="
        ${RDEPEND}
@@ -46,5 +48,6 @@ src_prepare() {
 src_configure() {
        econf \
                $(usex pcap --enable-pcap=true --enable-pcap=false) \
+               $(usex cairo --enable-cairo=true --enable-cairo=false) \
                --without-o3
 }