Add upstream patch to use libexecinfo. #438658; Fix non-POSIX configure test.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 131 insertions, 13 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index d551881a7bdd..3ab07114ce87 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/afterstep
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.102 2012/07/26 18:04:06 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.103 2013/04/06 01:04:10 naota Exp $
+
+  06 Apr 2013; Naohiro Aota <naota@gentoo.org>
+  +files/afterstep-2.2.11-configure.patch,
+  +files/afterstep-2.2.11-execinfo.patch, afterstep-2.2.11.ebuild:
+  Add upstream patch to use libexecinfo. #438658; Fix non-POSIX configure test.
 
   26 Jul 2012; Anthony G. Basile <blueness@gentoo.org> afterstep-2.2.11.ebuild:
   Keyword ~arm
@@ -430,4 +435,3 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
-
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 18624ea299b2..dfa072a648d0 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -2,21 +2,33 @@
 Hash: SHA256
 
 AUX afterstep 29 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852 WHIRLPOOL 15e5739cf470a100616019fcc53326b8a9ba2aef560b2ecf732a388175765ccdf0f9c0b0d6c4cf92aa4ee2a5445e635e5c1b4db36fdd75244fedf78310e71e55
+AUX afterstep-2.2.11-configure.patch 1153 SHA256 f99d89dcd20747af6969c7ca0c4cf62fc3a13372cfe114c0e082d4d964c1af2e SHA512 31f1e5982413518b66842d42bcf0249dcdc6ea1099dc6379c1d4fe305e0092c1a0792b037fed1070bc93e7f587bb5a9eccca194879be25d43b088765cc8767df WHIRLPOOL 9fa933ef0dee694da5f556c01cb196bb45b589478303e0f417e76795d24fe2bb82b8d1ab9838838a9430076da5e8928774f0f43ff038931a4cc43adf440ad4f8
+AUX afterstep-2.2.11-execinfo.patch 2976 SHA256 976d94b11b756c50980f32d6912c82a407780d0d38e52e51d210aad58de3a835 SHA512 fae72c001a94fb60aa0affdbb5203da7d8c8549903ee7a259292e8cff03d46bc70e63f0410f9a109b7b97a701d8130b29e1f1554401f63c1f0c875908b79ddb1 WHIRLPOOL a12c8f6f55c31b2487cf4985a6016901751e0b8871eb792c18d72783c4c558ec163feb27a4f8c317601337f268a05f26335a526bbbbece820d6ad86009456a4f
 AUX afterstep-2.2.9-alpha.patch 475 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6 SHA512 7c963518b307346608948b956ef747c5cd5e437ee47682eb0352149dc4fc1a1995902097091882e1600bad1b0edd26e2ca2af797217372122b24b8cfbcd3ead1 WHIRLPOOL ba84f91426f2541a4b08ee006b64dd82edd0327091118ab44610bce48e0424d915996556bd73b26467bd00dade7cee43121267daef9583e45e797a97cd09d5f1
 AUX afterstep-2.2.9-ldflags.patch 1374 SHA256 80d9ff3b0106ff9315eb2f4406d29c6f95a10818f7821866e39a405c1cc3b562 SHA512 92640bfebcbb7f813112268ac18cf750530014b0bc1f187a57333b665f4234da4d0eb996b81517fc59ed3b507fced4a6ae8b0a9c255f2ae809cf1ecbaee43cdf WHIRLPOOL 74dbb3565401b6c15ebf004f2174f66a22de284403ca6730fbc8c6628b8c90fc4ddfd4fcd6abeefbf2cc7691b4209c5e49bac6fbcc274b55105cea41ffe02fc3
 AUX afterstep-2.2.9-libpng15.patch 1132 SHA256 4b08424b98d0b18f744f0a5fe0000f9149963b84bc28487a3e3f8eae1804560d SHA512 9f025d870b7b16bbb63e7097847b528b70e54e3174e1b71b4f8925f9a79f472c4ee8dda957394708d6c65c94068f0ed81273dff4c57bf11d6cf08fff895a6c22 WHIRLPOOL 1f4d861584b991b7002760f52e8198335cf7410d6fdb6101612830f2dc3a25089f0275173938627d5c6b07ebae73d6f3fc5d49fac2a170b6f5abac92ceaea7e0
 AUX afterstep-2.2.9-make_session_data_file.patch 422 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3 SHA512 966955ed4bc74e727a2c3b2f521b322a32e29a14f1974aee1bedde5cbd06ac104509ed397ba5f2dda1cb6ee3a8aa63d0c90be1c243dd81704a4297403c6092f6 WHIRLPOOL ce33fca0e46a874e4d6bd5dcaab3d06766b211eaec83225a1c5fb585d1823d9bdb0544c3be53d87f03ce8a41efeddf7b99cde908b9a3c61bd06a477de79fcf59
 AUX no-alternatives-2.2.9.patch 1214 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f SHA512 d8d98d2f9cdab4818fbbc4050c0e5a6b244365e401996ffc2cd24e97fdb4f795ff396dd12766cd7c180bf0b717ac7f55c7072afc0761a526e529c300970b07fa WHIRLPOOL a94163a1dd362706f983f025a8621ae3a6427bc89e6fe94060ffd6b846f3d4dea269fecf8c7d0e7d13e844790bd6caf8255e9d579d41fc1b41a6e36fa7b98217
-DIST AfterStep-2.2.11.tar.bz2 6126237 RMD160 a82a4b3fddcbcd97862212669c11d14629e51a4d SHA1 ecfd815b659046281530441af0bc4fc42900d0da SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa
-DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
-EBUILD afterstep-2.2.11.ebuild 3393 SHA256 ac8e193154609c06b70ec4c05677edaf15bf3789777912f7cefb52add796ec20 SHA512 6160f4ef384fad95eecf97459c22e0a2248f59780dee82aa4e4a2ebaca08a612d29c1337195c40027bdff95eb80c897fd77aa7a4c64f1d71a01b8ba046045c0c WHIRLPOOL 032101f5edaa08e831eba09db7a6057098b8e1ecf8dc32f597a66879097ca16ad1514768b1ebedec16e70992b74f4b08f35059d7dcf2b05fdfd429128d26c4e9
+DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f
+DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
+EBUILD afterstep-2.2.11.ebuild 3524 SHA256 d632e84b137c6e4ce816f64910f6bbae55e63c5b912f6772c07f646b19d902a6 SHA512 791febb9f1e71e585332687caba13cf6fa024993e3b41e07db5f7b6d580f1039214257f3d51378c16e4dc469613e628fbecdb4f0623890f74bdc7cabd2f2fa39 WHIRLPOOL 00509892db64f0021ab7fd1999fbc77b7c084ebb98bb49460d481e5d5d6367335729b8aaf1021788a16326bf14bf9f8ab6a8d98fcd1842d3c9a5fa63a6d3cb10
 EBUILD afterstep-2.2.9.ebuild 3647 SHA256 cf9b9866ed2a4ca614ffd2a8d67f0e33a29ccb74274792d408a1d3d586d6756a SHA512 1c6202d2910797b19f352c4db39e730284015c9651abe9e20fd33ddbf2ca61b60115e6d693e2230a6533544c87eecc22c27372a04de991c0f796ca043c67d16d WHIRLPOOL a0eb2bf9f9d1ac9cc4a7e42b1dfea07bb6e8f050d715abf96700918e82b1b95321b931369e07d473b955919fdb0d63a781b3c87b0396280462a77824b2bee173
-MISC ChangeLog 14580 SHA256 33f15f675d9df81dbb43d15541d6f30fa27547ea509e4b8a9978e055b5df2154 SHA512 d97af9d2d93c8fac3ef8f860e2efdda7d897bdf1e8b4742c210a93f08f7e824cadbae43df960a8101099b7400b9465b226f93a040a02256b38086817de44fc7d WHIRLPOOL 3d1a8971c68a973aad9f5f9bf1e8bb5968c80477401d7ef63f60b590ac45b591bf33d57e41cc0cc3490f3809fc94a677e7206580f6269225220cae2e869689e5
+MISC ChangeLog 14814 SHA256 223e9be330bcbd2788fe8b38043284b57b512f4c150ef84608097cd52293b848 SHA512 00db9a8b9d524957dad318fc55d2c5351e021139039389aa9ac20bc6f25dfc4b23c17fbc0eb3f8f97fbe32b20e4843bc181c0cf914f1c1f89c7386c77286e037 WHIRLPOOL e01d41d12a62046dc792e4b414841c6acd4df20349362a3170ced8883d73a9f475cb4f57bf8c2c599722ec3e30ca684450d1477973fb243dc196c5cb58069fc5
 MISC metadata.xml 350 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26 SHA512 339ffbac1afc8388025a787a7b037b8a0096f1a5625e9a5b7bdc8241d4209b69633caeb90bf712c862934786351b01bae16a8c44da76902d12ac199326c21c9d WHIRLPOOL 1c052ca0020f3ee2a2e7182d5c065574de21bacbec89b7618295e80b317b16bca8139304a4a83f96f61624704578a27b0586127981697b0586a42a0b9230021f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlARhqEACgkQl5yvQNBFVTXOJACdHnTGWA1zrT2zJB8EDwgmFH2o
-hNkAn3NlcFlPPJtHtYyhabi8l9L6pBEo
-=k1QV
+iQIcBAEBCAAGBQJRX3SLAAoJEDYO1FT4VRUU4ocP/0ZlOqKm8mGuYIt6uQwqLqA2
+WwBwNCVtwXtWum7+0JAGOqaB11gsUBFsTWVfUk2udI7wefbtv8kXAohelyZFbAw3
+KCwVwAeffSz9sIxCrdNfIUgkh8UEKqF01TYhMmEVGZdLGfnfajRe0/5Qsuj+0Edh
+7+RCPC+mCDb65IAXs/OG/CPgKAfSLuu6JCF4WzcnGSi96vvd2bmwNa/er+fqaMSc
+YYQrxc5qW3TS1k393mq7l6TJOJCWyq8/nIb/IZinmbP++bePkOf0q8QvjV9UGT1a
+wKBQ4xLsOVYGk4dsBGLiiqT4C5QU0CmKbX7H229krAsqdQOgv3HaQs4VG1q37M0c
+zUsY9nmJNgDk1nBBUu8jtZu3C+JiaRm9oApfSLrGEzZ8rJHc3iY12/Bv7QvOfzp6
+QdIr3J0ZEoJQdIZmdZjLDYnpjSkd0dofhyDDm/hoh7hxWuq/cqU0+ccjio1DtyAE
+0HsF/wGaRRLb7fChGaXTSN806aw3LPY6vvUo4IR+iNoiylFgYlezDBxDyRwOwxk1
+Q2fIugtP5QryvVXP+S96v0Jqyc73o8UHrQE8bYGXu4qQw+YRWwCwqorSpTcGOeot
+t8Qp1GtfBt0Inx4j23z53LuVXCb+CPNCtNbAjkKXmRXcuZKFp4xb/YHUzmtUqSBo
+VrudwoNIrMGH/Km4GT+j
+=5vxl
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/afterstep/afterstep-2.2.11.ebuild b/x11-wm/afterstep/afterstep-2.2.11.ebuild
index ebd910220e0b..785ddc8eb625 100644
--- a/x11-wm/afterstep/afterstep-2.2.11.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.11.ebuild,v 1.3 2012/07/26 18:04:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.11.ebuild,v 1.4 2013/04/06 01:04:10 naota Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa debug dbus gif gtk jpeg mmx nls png svg tiff xinerama"
 
 RDEPEND="media-libs/freetype
@@ -43,6 +43,7 @@ S=${WORKDIR}/AfterStep-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch
+	epatch "${FILESDIR}"/${PN}-2.2.11-{execinfo,configure}.patch
 
 	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
 	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
@@ -54,6 +55,10 @@ src_prepare() {
 	cp autoconf/config.h.in ./ || die
 	cp configure ../ || die
 	popd >/dev/null
+
+	pushd libAfterBase >/dev/null
+	eautoreconf
+	popd >/dev/null
 }
 
 src_configure() {
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch b/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
new file mode 100644
index 000000000000..1ed6bd9394d1
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/autoconf/configure.in b/autoconf/configure.in
+index 4170f98..a16388e 100644
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -105,7 +105,7 @@ AC_ARG_ENABLE(send-postcard-to-developer, [  --enable-send-postcard-to-developer
+ AC_ARG_ENABLE(data-reinstall,   [  --enable-data-reinstall will prevent AfterStep from reinstalling image and font files.[[yes]] ],data_reinstall=$enableval,data_reinstall="yes")
+ 
+ AC_ARG_ENABLE(script,		[  --enable-script         compile Script module [[yes]] ], enable_script=$enableval,enable_script="yes")
+-AC_ARG_ENABLE(reuse-font,	[  --enable-reuse-font     enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
++AC_ARG_ENABLE(reuse-font,	[  --enable-reuse-font     enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval = "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi])
+ 
+ dnl# For FreeBSD, add -I/usr/local/include
+ 
diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch b/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
new file mode 100644
index 000000000000..61f4f08c082d
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch
@@ -0,0 +1,84 @@
+diff --git a/libAfterBase/configure.in b/libAfterBase/configure.in
+index de055ea..eb5619e 100644
+--- a/libAfterBase/configure.in
++++ b/libAfterBase/configure.in
+@@ -189,6 +189,8 @@ AC_CHECK_HEADERS(elf.h,[AC_CHECK_DECLS([ElfW],,,[#include <link.h>])
+ 			AC_CHECK_MEMBERS([Elf32_Dyn.d_tag, Elf64_Dyn.d_tag],,,[#include <elf.h>])
+ 			AC_CHECK_TYPES([Elf64_Addr, Elf32_Addr],,,[#include <elf.h>])])
+ 
++AC_CHECK_LIB([execinfo], [backtrace], [LIBS="$LIBS -lexecinfo"; lib_execinfo="-lexecinfo"])
++
+ dnl# this is needed for self diagnostic code :
+ AC_CHECK_FUNCS(backtrace_symbols_fd backtrace_symbols backtrace)
+ 
+@@ -257,6 +257,7 @@ AC_SUBST(lib_file_name)
+ AC_SUBST(with_locale)
+ AC_SUBST(user_ldflags)
+ AC_SUBST(x_libs)
++AC_SUBST(lib_execinfo)
+ AC_SUBST(X_CFLAGS)
+ AC_SUBST(LIBPROG)
+ AC_SUBST(LIBINSTALL)
+diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
+index f04be29..c3bacbb 100644
+--- a/libAfterBase/Makefile.in
++++ b/libAfterBase/Makefile.in
+@@ -80,6 +80,7 @@ INCLUDES	= $(INCS_X) $(INCS_PRIVATE)
+ 
+ USER_LD_FLAGS	= @user_ldflags@
+ LIBS_X		= @x_libs@
++LIB_EXECINFO	= @lib_execinfo@
+ 
+ 
+ LIBDIR		= $(DESTDIR)@libdir@
+@@ -326,7 +327,7 @@ $(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+ 	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+-	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
++	 $(USER_LD_FLAGS) $(LIB_OBJS) $(LIBS_X) $(LIB_EXECINFO)
+ 
+ install:	install.lib
+ 
+diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in
+index e6c283f..f8cae5e 100644
+--- a/autoconf/Makefile.defines.in
++++ b/autoconf/Makefile.defines.in
+@@ -40,6 +40,7 @@ LIBS_READLINE	= @readline_libs@
+ LIBS_X		= @x_libs@
+ LIBS_ALSA	= @ALSA_LIBS@
+ LIBS_XEXTS	=
++LIB_EXECINFO	= @lib_execinfo@
+ LIB_AFTERBASE	= @AFTERBASE_LIB@
+ LIB_AFTERIMAGE	= @AFTERIMAGE_LIB@
+ LIB_AFTERSTEP	= @AFTERSTEP_LIB@
+@@ -53,7 +54,7 @@ LIB_AFTERCONF_STATIC   = @AFTERCONF_STATIC_LIB@
+ LIB_ASGTK_STATIC   = @ASGTK_STATIC_LIB@
+ LIB_WIDGETS_STATIC     = @WIDGETS_STATIC_LIB@
+ LIBS_AFTERIMAGE = @AFTERIMAGE_LIBS@
+-LIBRARIES	= $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X)
++LIBRARIES	= $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X) $(LIB_EXECINFO)
+ 
+ LIBS_ALL	= $(LIBRARIES) $(EXTRA_LIBRARIES)
+ 
+diff --git a/autoconf/configure.in b/autoconf/configure.in
+index 45add70..4170f98 100644
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -651,6 +651,8 @@ if test "x$send_postcard_to_developer" = "xyes"; then
+ 	AC_DEFINE(DO_SEND_POSTCARD,1,E-mail installation notification to AfterStep developers)
+ fi
+ 
++AC_CHECK_LIB([execinfo],[backtrace],[lib_execinfo="-lexecinfo"])
++
+ AC_CANONICAL_TARGET
+ AC_SUBST(build)
+ AC_SUBST(build_os)
+@@ -718,6 +720,7 @@ AC_SUBST(with_desktops)
+ AC_SUBST(with_desktops_1)
+ AC_SUBST(with_deskgeometry)
+ AC_SUBST(no_data_reinstall)
++AC_SUBST(lib_execinfo)
+ dnl# old stuff :
+ AC_SUBST(enable_different_looknfeels)
+ AC_SUBST(enable_pagerbackground)