nicer patch header

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 244 insertions, 15 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index c2a44c71dd68..4cd288588b42 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.55 2013/06/24 10:52:20 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.56 2013/06/24 19:48:37 hasufell Exp $
+
+  24 Jun 2013; Julian Ospald <hasufell@gentoo.org> hexchat-2.9.5.ebuild,
+  hexchat-2.9.5-r1.ebuild, hexchat-2.9.5_p20130525.ebuild,
+  +files/hexchat-2.9.5-autoconf-missing-macros.patch:
+  fix autoconf when gtk+:2 is not installed wrt #474582
 
   24 Jun 2013; Tobias Klausmann <klausman@gentoo.org> hexchat-2.9.5-r1.ebuild:
   Stable on alpha, bug #474434
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index a44579b837e0..f70ed94b252a 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -5,6 +5,7 @@ AUX hexchat-2.9.1-input-box.patch 1084 SHA256 eccf4a35b64fb429c171e5c77e62dae9ac
 AUX hexchat-2.9.3-cflags.patch 474 SHA256 ccf7236e3dbc9d6450901fcea49c8c5e8adc570cc08be9e4d06d411b66bd3640 SHA512 4019a2441f1295dddc03201e0e391424c878d7247ca79bcc6c72811797d540bc5ede6cc717c688093ac4cdcfc834cbfbd0119bfbe4ef242e53828f2cc300da00 WHIRLPOOL cc3375f02ed0ac4d641c02d2dad5ffe6cc85bf7ea85baa2b59d114ff6606a4738c6a4d22c0ca0f8b7fabb4ce2e9bd846f89d486549fe39eea9b627336861b2ad
 AUX hexchat-2.9.3-nogtk.patch 348 SHA256 5426f06b93185befe04244290cefbdcff120d40db9812398a9b6ec99040753ad SHA512 cce7deb9809cd76d800c2629762148015b6bb8d5bb8195b9037dcc57069c9e0affccb64ff1e05d9281863d0a67df83790ad15c6ddee357af4ad41788bf3caa16 WHIRLPOOL 02f4ca5950cb3548efde42448a7f9e1aaaf5e70cf7e33bb9df4dfb285283c192b7de781ee2395b42f3f8d3fbd2e9afbbac9e62bc0b16795a378af9b41fdc3c8e
 AUX hexchat-2.9.4-build.patch 4530 SHA256 3483c66f4a5231efb140ff651184cefef305e643d7a42f8af5b85512e087c85a SHA512 ab61421b9bcd35e7abd0cd61f6a978afcf9b6c4251e8e6f95d44e75a21c4c035d6553abe5ee437259e292888209b65143a63cf95719f8555db4b990319486296 WHIRLPOOL d8cd9e11769d0c755603e1c63559f96216e0dcbeb6993ec342e15a41789cdd513b4a8a81aba6b334ede034670ffaa96d88290e87e529eeb18013b3f674b212c2
+AUX hexchat-2.9.5-autoconf-missing-macros.patch 8067 SHA256 73bbf3cb74794f9510fd5012b0ea68703e6462ccc021acbb4a4d476562aa7f73 SHA512 35caef042c4636401a3f038430ce1ec5f7aed2abd9cb67cf9264324088f79e44c1695eeb88c73b2a8e61cf6eb4c02ca275a2e3504e1d4c468946c2d5f36cc048 WHIRLPOOL a5e06764e98113e2775c3b58c1a77fe0f5aaa6e50bc58b1d8e758846b0c3ba5651a14445d9330e791e45e287c9138cdd505cfe85979cc1c0021cacadeace4173
 AUX hexchat-2.9.5-cflags.patch 625 SHA256 c593fed46c78ecf21984d765483f26b2ff2b4bdd78574569f561dbe4c52f3a05 SHA512 4ac52cabe611d959aea9fc9041c222adf90ebbb9ecb85493d66e3f910f530215ca5eea9b59d035653c654baf89d3f9822ce0fd1cbebd67a48cbc4d34008d3afc WHIRLPOOL f10118436585741bd511d269108a46a5ede2090247af988df2948495080bc3d4c2aec33d0ef3c279208ef9de2b7982432b2b0d3797afb413945f6c2fcef1e5ac
 AUX hexchat-2.9.5-fix_leftclick_opens_menu.patch 1430 SHA256 37179c473bc3deb174001e06cf1a292b0d82bc5e0e6ae82abb4c6d5879a8817b SHA512 1b941675017921fc8adf3f90d85edb528a7e231867a5ec9d5d99eb1c390bc58a1b1c44b39b9a6c204e94d9971598a9fa84ee0eeeb015d74de4f1ac83673c3715 WHIRLPOOL 19dcd10ac1e4d63b0a98a8518c4888289c6840ce088c244ec430fc51c040ce8a489093d4bea2e8dcf8008dfd22cb7e866094acd2794ffd85414d9a0f4aae8dce
 AUX hexchat-2.9.5-gettextize.patch 604 SHA256 b2ec1dafd439c8661aacebee78b4ea52d13955affbf536ee9f149510a299e48c SHA512 ca31a000ff96a1a30758d3d26ef8df88886b53453231e6b187f6eeaf88fc8bdb43eae349169872af8d8b2efcd72472760c1a1d2c4fa8651140c2b30b95d5bd40 WHIRLPOOL 47d838826a005f6d588ac78991be3791873f07aced5aad70820dc0e36122d80e378ae127e8475b8d382e69add922fe31116bc13601bc400c20d22816c405f20c
@@ -16,15 +17,19 @@ DIST hexchat-2.9.5_p20130525.tar.xz 1223400 SHA256 26591e56153d2d254ff28740fe7ec
 EBUILD hexchat-2.9.3.ebuild 2667 SHA256 c2e98dc5ba6d68e0cb9f5f1f9e68d52c6be4c40a1f9c7c31c07aefa5ae30c0c6 SHA512 a938567651b72f07b210bd069f571fd7dc0e94aeef8e5e3f388526bae8cea6039d6a59727041a9a145591d74f848ad3fa1e3d5a3447d01ac7d9d73a051cc37ad WHIRLPOOL a6062c39d3d25a6eaf6780cb9493eeca91db7dd0abbd1833783ceff9bbf872fb617489195f9aace990a29c53a239e93d6e3d58a5233b8d659a380888034c3a82
 EBUILD hexchat-2.9.4-r2.ebuild 3729 SHA256 37c49ad4eaba2b9d432d959098b5f83eaa01e46f47f8a054f0617e694fffd03f SHA512 66d99a96a089f620238bd34d81f87c0d509a251f1c922510ffc7e9503762515851a7f08a5aa9a265a3164519b45d53d551b171a65f4c4e06f96b339bbdd8e438 WHIRLPOOL 2e3de3ab46b0cda59c3692f57a7f88b81b1ec9a5a16229bd7398609cd4960aa8559cd3743fe01f2e879f0c52ef2749dd5ef0e469b15245ea290b760fb518942c
 EBUILD hexchat-2.9.4.ebuild 2954 SHA256 914ec267c80d7cc34c1534143ace5f718123d74591e4dcd6240218713ea86f18 SHA512 d494f42192bb45052737e33ca64c28101e503e71e5531065555ae7eb697576c28eaf4e9d57ce3e1ce538c4397ff4659d9d8f280a0826a5751da82f77c45f9558 WHIRLPOOL 82d602004bc47b2b723749edd1ab80f210a5e657afd2dbdce199b096de5edb66184328ec8e92ae74ddee54c66b64a576b31a6d5f469c1c1b938d71ab41821ae6
-EBUILD hexchat-2.9.5-r1.ebuild 3896 SHA256 f479b5bb6cd491cca47ad07e91203bc14090ff61edfe519f9b169f7cae76c8b1 SHA512 d7a0f383853a5b6758b0a559f8a4565e34c011d2847630e33cb38b8c31cec082b65729c8fdeaedbdeb057bc82c833c2332dc705b7766f2d62ce11c595d17f391 WHIRLPOOL bcdfb317fbd846bdbc62243dfac2755dc63ed9fbcee130aa2e945cc4345a6684474a541bdb6761d9cda3e2c249bfd2a84c4ef0bed339d52efb6455bc738cd371
-EBUILD hexchat-2.9.5.ebuild 3827 SHA256 79fd4d7119f1a0e6b2736df2f84eb8eb8d216f221e58dcd2919a5865f31ed7d9 SHA512 e2b1b885b350f1a2bde79ec3f196a2acf93d59658ba68cff0d3df3d18b86f063515b756a99e8bfc09efece4d82a7e3952b89d0c9149f36bb85b3fb96670e4445 WHIRLPOOL a4eb4167b9e01ea8b880d5d4e06582c01e443d3322202905746edbdd621252758d13d84ed970d3527bf586c185d0f0fd196e67ed2d3b87c8138577e01a5bae46
-EBUILD hexchat-2.9.5_p20130525.ebuild 4003 SHA256 6e6b4921baf25d3bb8ee84b196ea66c35ce9b09a9998a69c3b0843d1da76b84e SHA512 7b181d968f5df64c9659bb13f113d8b2435c0af808660aacd27109bb23ef1ca36e56545fce71ee917d67d6e4b019523f8f6b16f4c4be04006af5712d340704e5 WHIRLPOOL bf182d3f1aca1fd31a0fab351d732008010e0a7029c5472f2f87a835c709d3a013a30b75c092a9dcaca05231ff10a615ce0e7b46a3215d5004a38292d18dc053
-MISC ChangeLog 7568 SHA256 3374117f287e737569e1a17e017a5f80c69e06d902e896c2caaa00db455902f6 SHA512 0f8dd9c06f260640033d5e904b7d5035f962dff9ab13cbdd27a67560e8ff048efbf77ddd35692359b2a5a756ba709ae831d366afb969f86415e77853f948f8d2 WHIRLPOOL 8f9a73f031a5374d9ea86a700408ea33ecf6d232d3acd615a2ac1f965c7606d12e41661f4ae6a7cdf300238d9026196de4a0dbedfbc04b11a139ad3577930c44
+EBUILD hexchat-2.9.5-r1.ebuild 4000 SHA256 0ba5ad202cbf7e6cf4260aa4ad2fe7315b815f0928fe1b4962553488fe2d2067 SHA512 d5f9368d9cff8c3cc3868391991be5144530d49cd3aa8d89c6bc9f96bb4ed2347cadcfe531f5ad0d5f003ca4752a8640d3f89a4e2b5212a46d9663f7cbf42bd1 WHIRLPOOL cfbb71b677c8e274d8b74a858f8631f96b20bcc47697b3bd7e45cc675cc96b6cb7772f499e82e29e6aa6628373fcebc65d396cf09ac300594481a03c4dfac5f6
+EBUILD hexchat-2.9.5.ebuild 3931 SHA256 9c756e98253042aa70645b39fc37ab53873985db15418e64a04128b053fe55f2 SHA512 932180ed6cff621eb54d383bfb0a7990368ce00ce52147ac759088cf32babbc4dead53c1e0bfcbb48850c9ead0bbf4d261647c6a237b2d282a771073c25041f6 WHIRLPOOL 4ad37b64516092300e115f5b9b05009413d9c8c802d4c1b68939e0d37bbf9862f7a797c573c240b7b3de4c5a7d068edcf7435e10182955e944a8702d9e67c083
+EBUILD hexchat-2.9.5_p20130525.ebuild 4107 SHA256 d452a185f8a960a48e9ce00dab165206fdbb6c4299328b45330b2da26681a6c6 SHA512 cb6da9afc84a1d03cec7987d8f9781b778b1a0a3d209e90f8d83c5553c1f1a9428be7db4030b951650fff4ec77c11244a309419f534173d822227ad891c0f014 WHIRLPOOL 3bbaee3985e03fc957d0c6feec26a3bbd2b7b0f5dcc31b663550ce6279e7af7b319a6bbc06ab739a3cb9c594a6d1872e85a1588f751f0cdb136b5159ea85e508
+MISC ChangeLog 7811 SHA256 a0e7282639e23249be17f723d011ced65fbecab8faa56a0815b965944afca77a SHA512 0291d6e82f49d5cfe13f6ad86eb73cbeb3e148e1b44e458bcd9db0d08d07162fc50dfba96dc84d655245db09d11c9e252d826a19bca08b3d17884516fe2dbda6 WHIRLPOOL 51ee4ef790a4f8fa9c7288d7f419f1232fb3808a9e5d43a759cbba38dd38183bb9c429f746cdeaf4283eabecf0b990526e578849191ece49dc7e1a21a8b95ff6
 MISC metadata.xml 1248 SHA256 30ac174923f304e852299cbff09f50fcebccd065e4dfe903bfa5ee68f150a4ef SHA512 ba5b8027897a87d58e3820fe77577b216f43f95bdc2ece050d634acda7649753b15747aab5024a9aff3a417311f3b982a7c6eb2779abf88fde285c0f000ede25 WHIRLPOOL 043b9d773bb97c2d6f135fbf0fe3f676033faf04068412b345ec72dd017268ae8632f66b5c3b1f36e882b60833cfd7112df4e8036a8fd64a755478f0edd1fd42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHIaB8ACgkQcaHudmEf86oPSgCdHDIlvsmiA7Kio6kBLDlEzsWQ
-urYAnRuNhxsJt+aS2sXmrvEYJNxMy5TI
-=Cc2o
+iQEcBAEBCAAGBQJRyKKgAAoJEFpvPKfnPDWzNy8H/3T5IeAZo732CqsvuAuMfW7H
+zHl0gq18R9oJQqf/XOxIrmbzCJCg5Gi7YswrRiTWRYMiq9Kg1tzHEFlmD7r1o5bm
+RB+UNFcSQM630JV3lkwMQUtxnkvSHfO1n23VDw68VSkyGv8znlYSfBSZata/lyGx
+AKaxiMt5LtoWBwDBfieR7ca9pr0Srn3wilGjgelz7eNWbYQE9oPMZ+fLA7/eEVgM
+8HrJviZbEs1k+auer3nwN7M4lRK8AA5uZNRxGUrc7eXyZHy8XXxfjqJ4yfOi22H5
+3qzXSo91iw9HvJF62KammBUwwjbvUqQgRk7Bf9DUxKzcHfLcuRJMuHjH89FBqNQ=
+=G8Xa
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch b/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch
new file mode 100644
index 000000000000..3c169f820f1e
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch
@@ -0,0 +1,207 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Jun 24 19:18:40 UTC 2013
+Subject: copy the gtk-2.0.m4 statically so we can run autoreconf
+	even if gtk+ is not installed
+
+https://bugs.gentoo.org/show_bug.cgi?id=474582
+https://github.com/hexchat/hexchat/issues/658
+
+--- /dev/null
++++ hexchat-2.9.5/m4/gtk-2.0.m4
+@@ -0,0 +1,196 @@
++# Configure paths for GTK+
++# Owen Taylor     1997-2001
++
++dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
++dnl pass to pkg-config
++dnl
++AC_DEFUN([AM_PATH_GTK_2_0],
++[dnl 
++dnl Get the cflags and libraries from pkg-config
++dnl
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
++		    , enable_gtktest=yes)
++
++  pkg_config_args=gtk+-2.0
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             pkg_config_args="$pkg_config_args gthread-2.0"
++         ;;
++      esac
++  done
++
++  no_gtk=""
++
++  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo "*** pkg-config too old; version 0.7 or better required."
++      no_gtk=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gtk=yes
++  fi
++
++  min_gtk_version=ifelse([$1], ,2.0.0,$1)
++  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
++
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
++	  enable_gtktest=no
++    fi
++
++    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++	  :
++    else
++	  no_gtk=yes
++    fi
++  fi
++
++  if test x"$no_gtk" = x ; then
++    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent)
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  fclose (fopen ("conf.gtktest", "w"));
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If pkg-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct configuration files\n");
++    } 
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
++        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://pkgconfig.sourceforge.net"
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK+ test program, checking why..."
++	  ac_save_CFLAGS="$CFLAGS"
++	  ac_save_LIBS="$LIBS"
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
diff --git a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
index 7f17e84c90bf..2f599945df77 100644
--- a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.3 2013/06/24 10:52:20 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.4 2013/06/24 19:48:37 hasufell Exp $
 
 EAPI=5
 
@@ -50,18 +50,22 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mkdir m4 || die
+
 	epatch \
 		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
 		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
 		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch \
 		"${FILESDIR}"/${PN}-2.9.5-gobject.patch \
 		"${FILESDIR}"/${PN}-2.9.5-fix_leftclick_opens_menu.patch
+	epatch -p1 \
+		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
 
 	cp $(type -p gettextize) "${T}"/ || die
 	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
 	einfo "Running gettextize -f --no-changelog..."
 	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
diff --git a/net-irc/hexchat/hexchat-2.9.5.ebuild b/net-irc/hexchat/hexchat-2.9.5.ebuild
index a98427ff2545..bdc929f8df92 100644
--- a/net-irc/hexchat/hexchat-2.9.5.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5.ebuild,v 1.13 2013/05/29 13:33:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5.ebuild,v 1.14 2013/06/24 19:48:37 hasufell Exp $
 
 EAPI=5
 
@@ -50,17 +50,21 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mkdir m4 || die
+
 	epatch \
 		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
 		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
 		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch \
 		"${FILESDIR}"/${PN}-2.9.5-gobject.patch
+	epatch -p1 \
+		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
 
 	cp $(type -p gettextize) "${T}"/ || die
 	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
 	einfo "Running gettextize -f --no-changelog..."
 	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
diff --git a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild b/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
index 42818e9e99cb..2b52f4eafd67 100644
--- a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild,v 1.1 2013/06/13 11:46:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild,v 1.2 2013/06/24 19:48:37 hasufell Exp $
 
 EAPI=5
 
@@ -52,16 +52,20 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mkdir m4 || die
+
 	epatch \
 		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
 		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
 		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch
+	epatch -p1 \
+		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
 
 	cp $(type -p gettextize) "${T}"/ || die
 	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
 	einfo "Running gettextize -f --no-changelog..."
 	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
-	eautoreconf
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {