From 33b9972890ac306832f7822086556e080e636f67 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 22 Nov 2014 12:34:42 +0000 Subject: [PATCH] Fix building against sys-libs/ncurses[tinfo] (bug #528364). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- net-analyzer/goaccess/ChangeLog | 8 +++-- net-analyzer/goaccess/Manifest | 26 +++++---------- .../files/goaccess-0.6.1-CFLAGS.patch | 10 ++++++ .../goaccess/files/goaccess-0.6.1-tinfo.patch | 32 +++++++++++++++++++ net-analyzer/goaccess/goaccess-0.6.1.ebuild | 13 ++++---- 5 files changed, 62 insertions(+), 27 deletions(-) create mode 100644 net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch create mode 100644 net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch diff --git a/net-analyzer/goaccess/ChangeLog b/net-analyzer/goaccess/ChangeLog index 1f5344206ec5..cec63e004379 100644 --- a/net-analyzer/goaccess/ChangeLog +++ b/net-analyzer/goaccess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/goaccess -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/goaccess/ChangeLog,v 1.6 2013/11/24 15:01:19 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/goaccess/ChangeLog,v 1.7 2014/11/22 12:34:41 jer Exp $ + + 22 Nov 2014; Jeroen Roovers goaccess-0.6.1.ebuild, + +files/goaccess-0.6.1-CFLAGS.patch, +files/goaccess-0.6.1-tinfo.patch: + Fix building against sys-libs/ncurses[tinfo] (bug #528364). *goaccess-0.6.1 (24 Nov 2013) diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest index 1a6d9eee26bf..ccc54ee61927 100644 --- a/net-analyzer/goaccess/Manifest +++ b/net-analyzer/goaccess/Manifest @@ -1,28 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX goaccess-0.6.1-CFLAGS.patch 436 SHA256 915dd990cd363b87d4f4450f58c90641ddf164ff0b45e1ac045ec8fee0c82ba1 SHA512 f2cb3f242e4f4bea568d0fdf3baf9a7895144d9135c0a85e96ab123f7202ae27797f777f5786c6339bf9d38e737b1398ef72024ed8e3140c7ec43eab3abe833e WHIRLPOOL 2a8da9cbb2198ba4e149737919329167477b2f848e12e97d28c7af5b9eeb6cfa34047c6111b2498e86fc3d7011fe3576c988c7bd6ddbddcd3897a3fc0d0ca1da +AUX goaccess-0.6.1-tinfo.patch 1412 SHA256 b5d457a065ea5daaf29da7f7665b18e20527e927a9b881f4afd79c69c9771695 SHA512 da2c113eccd0e011dbed740c77c80101375b6ab8b0545d733e4bb2c78a3abb71f1546333ca74140c2fdf65cd05b7c15be1298f0b9530bf0523f0d4478c2179ce WHIRLPOOL 1edbe2d17127510e7be3ab62cc25ccf67efd8260345c810d2a791b2564d6e0cb73952f1c8c3207139e26cecf4968a1f4d71ec0fefc1f214c749fc0cac975e288 DIST goaccess-0.5.tar.gz 127068 SHA256 beabad8267099d693cf2f0a6f533ecf5b5bdcc829b4536ec56b4a68b2c7d5e0e SHA512 24c59efca896e24f89aae5f12391398b8649822a5e07ee035a1c265a8987d1ba493155db12b7189c9d637891c81da6414919c9f9f6795831234810f021bb3999 WHIRLPOOL 0f49750053c64ec3395a5e56dadd27a271a45709a45dbe6051182d5153a820edf0548d6b21d05636dd96a0df5769b45dc0e55f007a5bdbe7485ce49940b3a941 DIST goaccess-0.6.1.tar.gz 150264 SHA256 f414664769c884cdda33c92e6df1069fb8a1750d19955122b3f030614d414afa SHA512 67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b WHIRLPOOL efa017b3951a7cbb80a041a63eef8cf13035be62d92be7da3df55a5ee7bc4d4b10e570023d488fad993a96c0da9c7bdb122009cf1e52e9c9e6a112e6e10c3420 EBUILD goaccess-0.5-r1.ebuild 1111 SHA256 e5120d18ebaacd909d755155f76c919418bed7a570e40a261aba909bf8b44696 SHA512 dfcef9127eca73b2eea672b6122623d272c49462d356fb0c3b11527b3e0a45e1abb691f25529586b606b739b71ad373f0d867fe53cc9e5671a88ce4eb6744898 WHIRLPOOL 502f542d9d7f7e7b333ca99d695ceabfabe3d3bf688f810b21980ddc58e05b72334b0615f8264b675f78e385264f259c0bdf4bef24e42a5f473eae6fa1559f8e -EBUILD goaccess-0.6.1.ebuild 1110 SHA256 a8908d26151c266e888258f911d63d3673725dc773b092ed4c00419bd5a8caba SHA512 a053b1d670f8c159fe681bdd36b6cac9a74d6ac84b6ff7b8eb4bd6a6cb7851b13362916460f5b343585766a77a59301b6979c37a47ffa99af1deff2d2cae4e92 WHIRLPOOL e0ffc0261c416f1e50a868e1c7105cff1814a5d816d2bd7c1bb852ee5ea5ba29624b51270f91b06362732dac1dd10505d212c0d4ad47f08eb58193ec51d30a4b -MISC ChangeLog 1230 SHA256 05829a18ed3d14bdadbe48e25f95cd5a3b5f46a0732d4020864af0802d230343 SHA512 86055aba2ff9418afebe5d5e7707b6aa6b0bc7dc8aa49fda72d7a7edc36cd7eb8a7e042c1bac12358b4e8adb945a8775ddce754d9c86285a0cc5fabdbec5c18e WHIRLPOOL 779e7dfed14ae3dc981f360f4c7dd74c28051761eb8a424d31f154ad316ce872b0b99d201029859d6092097317737a2a0052a25bbabbbb204409566aa1b77e35 +EBUILD goaccess-0.6.1.ebuild 1041 SHA256 0b98b4464be028c14f056be74fbf55b7f13f3a3036ca8e07d3155cb84f2fc39f SHA512 a3cb3eec264c3df131531767b289c157b786983e26ca1c7313b448ca85fcc5fcb65570951b93b79d67e90edf60d480ace31da424a3a1f64d488c495b79c5210e WHIRLPOOL fcb71bee5cde7ed70f0288816ada455b29e85da11117424b2146f906bd24ca433c7d40c5654f544b2ff6ecb7586cfb1e7a3725a867e7a00b1058f8f8dbc91c6b +MISC ChangeLog 1431 SHA256 c088d102163eb363545badcf0428d74743e51b8aaf53ba63db73b357a1c7a9e7 SHA512 d4810eaab79d922e7b10051c23d9887ae6d9a294501b696554896d881df1bb39f8bc2b96822e9d6b843c28e89df3834027efba6ccf1cf9ce6c262ca103ca4346 WHIRLPOOL 19b93cc6c418c69aac51710f1b6a2cefd7e25a5b6954176fff93dcab59df3eea52ec07abd05516564a6e9e521ccd7bf1aa20565dc4c5cf8ce4bcb6c52cb16b31 MISC metadata.xml 261 SHA256 046bc8794ef8300b1453d5ec09405f910a82b5881a2887c07158105e0e755593 SHA512 95b398718c663751ff1a5e6c88b214ddecfd4ae8567f7977164b27a7e6a32005bae471e478bfe385b442cb63e321ae1dbc3a3a69787e8e6bd618de8ee24c46fe WHIRLPOOL a2e4da2770161ef5f5674a99865c6093c7400434af271f2fdab3f4c424c201dcf96ec3144d50c6cfa141a63f7f0af54e48da1ebecd1cd2505c3d9abe46e57bb6 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQJ8BAEBCABmBQJSkhS7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88IHAP/2uycnI86B2CNy9/o60KiUCO -Mu0ThY4TKfaBRxGVcWArOLDTLqFMb2tWLoh4/VcgOIG2wH7qeLDGArAPDZEEimEy -ZRmVMXS4efcUBbseqEWsnTBdpaIH4WpQfyaK7e0Q7qFHNfWnmEHCc7n3og7PPPBR -vD3Taft4BymPxxNgfCCt4CKfqUl8nZgXuRzXCN652FeWBCOGvL+MFbLei5O28yYa -4y0AxavWyi4qGL1oiujCTaOjb+J2t7Za+jWiHj6fIVfiLbYhq/FGZgVhXUhrOI37 -Xv/EL+uELXor0LR4n9dPAuSP/aI8Jvhme8Il27VrDn7bqMG2EtB9lLIlACqIe68t -yOigdP7jyve0KE3Wykk9XxNg5ulF1NxRvozcNG7pQ+xfsGtlZhzUdS8DxbprsVg2 -rQHkEKK/D24k41OXdmYTG7Oe+g2lY6zlkY4lrpOIVKI4zxHxL2U+J57owND7Alxm -hU3EaMHNrptHmarxKvA2ZgWcOlYinRsLQntFT7txmX3/TmEV+7WzWHJ4ovgPgukB -VX1kRQau5oDGdtqMfPvUE0THZDG6tGJ+yzxkJrMCxuOHAAlihj7jeetEIJaB106A -FliH3UfMVcNI6YouXjEWXcPZ6fPscNR1jBbOmepFrG/evPdQdqMOGKmty1ZIS2xS -DE1Ny5lJU9Nd3GpgHewX -=vUsA +iEYEAREIAAYFAlRwguIACgkQVWmRsqeSphO+JQCeIN+6Tv88OXm9ymXQVmVF+ygo +py8An21DyoFjdUsPnUKn5vNVT3akBSmd +=Zn0G -----END PGP SIGNATURE----- diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch new file mode 100644 index 000000000000..909b38f5730b --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,6 @@ + bin_PROGRAMS = goaccess + goaccess_SOURCES = output.c output.h settings.c settings.h error.c error.h xmalloc.c xmalloc.h commons.c commons.h goaccess.c parser.c parser.h ui.c ui.h util.c util.h gdashboard.c gdashboard.h gdns.c gdns.h gmenu.c gmenu.h goaccess.h + +-AM_CFLAGS = -g -Wall @GLIB2_CFLAGS@ ++AM_CFLAGS = -Wall @GLIB2_CFLAGS@ + goaccess_LDADD = -lm + dist_man_MANS = goaccess.1 diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch new file mode 100644 index 000000000000..76d6cbcbcf71 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch @@ -0,0 +1,32 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -19,22 +19,20 @@ + AC_ARG_ENABLE(geoip,--enable-geoip Enable GeoIP country lookup, USE_GEOIP="yes") + AC_ARG_ENABLE(utf8,--enable-utf8 Enable UTF-8 support for wide characters, USE_UTF8="yes") + +-if test "$USE_GEOIP" = "yes"; then +- AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is missing])]) +- CFLAGS="-lGeoIP" ++if test x"$USE_GEOIP" = "xyes"; then ++ AC_CHECK_LIB([GeoIP], [GeoIP_new], , [AC_MSG_ERROR([libgeoip-dev is missing])]) + fi + +-if test "$USE_UTF8" = "yes"; then +- AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev is missing])]) +- CFLAGS="-lncursesw" ++if test x"$USE_UTF8" = "xyes"; then ++ AC_CHECK_LIB([ncursesw], [mvaddwstr], , [AC_MSG_ERROR([libncursesw5-dev is missing])]) ++ AC_SEARCH_LIBS([stdscr], [tinfow], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])]) + else +- AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is missing])]) +- CFLAGS="-lncurses" ++ AC_CHECK_LIB([ncurses], [refresh], , [AC_MSG_ERROR([libncurses5-dev is missing])]) ++ AC_SEARCH_LIBS([stdscr], [tinfo], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])]) + fi + + # pthread + AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is missing])]) +-CFLAGS="-pthread" + + # Checks for libraries. + AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])]) diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild b/net-analyzer/goaccess/goaccess-0.6.1.ebuild index 3a36b14b7104..3655d2fe6c6a 100644 --- a/net-analyzer/goaccess/goaccess-0.6.1.ebuild +++ b/net-analyzer/goaccess/goaccess-0.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/goaccess/goaccess-0.6.1.ebuild,v 1.1 2013/11/24 15:01:18 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/goaccess/goaccess-0.6.1.ebuild,v 1.2 2014/11/22 12:34:41 jer Exp $ EAPI=5 @@ -25,11 +25,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -src_prepare() { - # respect CFLAGS, bug #451806 - sed -i -e '/AM_CFLAGS/s/-g//' Makefile.am || die 'sed failed' - autotools-utils_src_prepare -} +PATCHES=( + "${FILESDIR}"/${P}-CFLAGS.patch + "${FILESDIR}"/${P}-tinfo.patch +) src_configure() { # configure does not properly recognise '--disable-something' -- 2.26.2