Fix configure.in error when sourcing config.site.

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

5 files changed, 41 insertions, 16 deletions

diff --git a/x11-plugins/asapm/ChangeLog b/x11-plugins/asapm/ChangeLog
index 1925e8b318ed..210ce260c446 100644
--- a/x11-plugins/asapm/ChangeLog
+++ b/x11-plugins/asapm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/asapm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/ChangeLog,v 1.21 2014/03/25 13:55:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/ChangeLog,v 1.22 2014/03/25 14:26:30 jer Exp $
+
+  25 Mar 2014; Jeroen Roovers <jer@gentoo.org> asapm-3.1-r1.ebuild,
+  +files/asapm-3.1-autoconf.patch, files/asapm-3.1-ldflags.patch:
+  Fix configure.in error when sourcing config.site.
 
   25 Mar 2014; Jeroen Roovers <jer@gentoo.org> asapm-3.1-r1.ebuild,
   +files/asapm-3.1-include.patch:
diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index ab6a0be01f98..cae827f854d6 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX asapm-3.1-autoconf.patch 550 SHA256 17676293528d33ceb368a7b61b3421d6667c7ff5e381e713fbb9c00e05774179 SHA512 3d80ab411ec0c1be1dccfb996b58d9bae3928eb482f0e30f4af3fb80ca0616220665859892e8c8c1d1dacf0dda372f9f85b0e7d7dfa86426afd2f5a253ddf39b WHIRLPOOL 20cf5cf911f2eab6d25e3518aa9e9e9e10d68da223ed55d3e6b4c614619e36b15e20f3a9c661924d11789588d233646cc0609489473efee02339161d31be0f07
 AUX asapm-3.1-include.patch 182 SHA256 4f3977ab29882b5ede12093bb6a923f73944c71c0a4602984c6765cb633f46bb SHA512 31308eb25b3ed6c409b38cb298e3bc411d47e28ead61605ce490e0698bacea4d741425259f3192958204899851e339716c99270216d094dd5554a2b54bf5feef WHIRLPOOL fb61d472964eabf4d615871f110244bcec88039a7b8319f83fe58a74bb58ccae6188ecfaf266408eb8eecf65428dfca2eb86041f9454685ddaad663fdf7c6dd6
-AUX asapm-3.1-ldflags.patch 326 SHA256 1a2d7f2d075dc64972f3291336c77b9734c95208effaaf4641010001340e2c17 SHA512 6130f23072fa79f274d7ade74c0adc357e0f63c09f6e5074cce324d3c2d699255f8739ddc1e14e2d165b7bdb40bbff9a803963e1e1a79c2fa72c3fb87f02c583 WHIRLPOOL bc13566b6ece413da7fa15a76d3d379f71e95367945c955a55bbf3e9e20328fb428aa2f360442dc3c92fb1b7b7f6e55b81b4361bee88da1a871398a005897aca
+AUX asapm-3.1-ldflags.patch 330 SHA256 2030a2de748810eab0782be63adfacf45b4e7fbfa8b6bfc073c5d23c3133f529 SHA512 6fbf3311c20ae647d52bcc37c741ba16d5f74d042811e0b97554979cae637fa74bc58fa9ad55ddb20399bee29efe46857bfacf90118207f97c1b3ca58935d89f WHIRLPOOL ade9117622119be5a45bbf0c8b7ed3a370316e8c73a542d8c4d09696e3cfcf66e41f0c365584b4143a6e431a0c4403ea3136a33b3c4d1d136cfb35e2ffcc64c4
 DIST asapm-3.1.tar.gz 63203 SHA256 641fba8ffce21725ec63e49f03700174436c265aad2babcdfde4508af23a1b7b SHA512 01859deccba952428671fd77ce87251b1fe0c21221af13db9b14c9ef28babad11e1582fed02b076f16d66bdab398eeb7a48b5e3cdebcb4e153978e04f022a579 WHIRLPOOL 1cd977520e6bab36275b095b6b79d56ef4be4636ed6752c7f993696cb24cdfb622e9fa4e122e982d0ecacafae76bf666253b80b3cb46e2aa949aca1c82e2614b
-EBUILD asapm-3.1-r1.ebuild 754 SHA256 bcc3e89a9e9551d4ff5b113f30c8155f967d6c32f2b9eec37bf40841ec0b06ab SHA512 f12401ff336e6f2163d790703483dbed59440107738592aeebfff10a5cfb6fb8dfcc91adf2e37c9c85df7010e31e56d92276227209177899c346b9bbf6213093 WHIRLPOOL a1b9e9548bc19def208d5089ddd222ddde0a9fbc5b61024fc5d8c0dba93e981c2667b3dc87640a9fa4d030c66378a3882332abe999f7f8cbd28d72f17f1dbc2c
+EBUILD asapm-3.1-r1.ebuild 820 SHA256 94bdf666d6d7387691111bbeebf84a47764ccf0f5c4651d92c49f5f161773699 SHA512 b6521a3967aeb155653b987f780c5b43380229a214b7ca16a93f85eaa5b7e871e0cfda6ef0b3d7e3deb759b79152babe745def8c12ba340464094f232ba3b0d5 WHIRLPOOL 7222f8df482add773f2b495954f4f339f4fdbaa843d46eaba8dac420ec41c3c9ff9fafdf4774f941b1cb1801d5559dd7bf7c5ae22b7c4ffac86cc266edd09b1e
 EBUILD asapm-3.1.ebuild 776 SHA256 8dc97b87a9f9a4628c9cbcad892ee3ec1ad2e979e49a505a741edfd6de9f56f4 SHA512 bb36f2a7f3efd7d49d9de0d9711197485b06a0f9dbb69620f1a96582af09aec20b147e0b5ce06d01d85072b1ef5f2ba3556807b7a852c25b462cf9eb93741cf7 WHIRLPOOL c783b19e486ccd4f354a5d093681023e0b0f2ec860b4cdef49d8a6a532cc95518479228f3595a93fcd2617043ce6dd5abbef6f7f38b123a547fa9db15d82921c
-MISC ChangeLog 2824 SHA256 8af4b1fb4a4b6bce95795d8cf19441102d5ef7a4c648feacbcdb56982d14e4f1 SHA512 707a077d401cda9da9e171912188164c8ca60df33408d0b03e65390d217a0172e1d1593a121fb159c3e403711c6c4054a78cf3365b9b7f725f71e5e07d135f5e WHIRLPOOL 6513954698a7899da787f288a6e5538b8b768738fc475f2d6e53f7ce2419fab6092f2785891fd8970f776fd2bbd207427ed219edcdc786e047c0c57a4014a608
+MISC ChangeLog 3011 SHA256 96c751ae2573b7fa7db66ab753da736dd9ef38d6189b50a89b49d2875396763f SHA512 753cba6d866a88eeeb0b57cbd3ddee7d791302b7981a7a6de352b677f5bbad9378726be20ad96d25ca31d5e452b8ebfe0e074053563d8e0492df0775a6ce1c2c WHIRLPOOL 0b88d0daf8249a9b0390f543a14b7e16ef46fd0a66f057f57ca51412f3c151084285c951781a9746768a115dfef507685e505c90111d781d92eba795f80b871f
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMxit8ACgkQVWmRsqeSphMCBwCdGJqRRy3FA20CcSrZiv/5c9/A
-e+4Anjh+0Hnc/UEGmouUbIlulE9+RI/q
-=fJt1
+iEYEAREIAAYFAlMxkhgACgkQVWmRsqeSphOgCACfXiD1OV+cDaNHY/k7NROEqDGp
+cYMAnA15ENrRRqdV0HrxuUI7S+oBkhzV
+=0i/U
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index c6bc1115bdb3..1ce5c869d664 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.1-r1.ebuild,v 1.2 2014/03/25 13:55:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.1-r1.ebuild,v 1.3 2014/03/25 14:26:30 jer Exp $
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="APM monitor for AfterStep"
 HOMEPAGE="http://tigr.net/afterstep/applets/"
@@ -21,12 +21,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{ldflags,include}.patch
+	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
+	cp autoconf/configure.in . || die
+	AT_M4DIR=autoconf eautoconf
+	tc-export CC
 }
 
 src_install() {
diff --git a/x11-plugins/asapm/files/asapm-3.1-autoconf.patch b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
new file mode 100644
index 000000000000..0051d49ac8a8
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
@@ -0,0 +1,21 @@
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -59,7 +59,6 @@
+ AC_CHECK_HEADERS(sys/wait.h sys/time.h)
+ AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/mount.h ustat.h)
+ AC_CHECK_HEADERS(machine/soundcard.h linux/soundcard.h linux/radio.h)
+-AC_CONFIG_HEADER(config.h)
+ 
+ dnl# Check for X
+ 
+@@ -117,10 +116,6 @@
+ AC_SUBST(with_gnustep_lib)
+ AC_SUBST(with_afterdir)
+ 
+-dnl# Write results
+-
+-AC_CONFIG_HEADER(config.h)
+-
+ dnl# Common parts of the Makefile
+ MAKEFILEDEFINES=./autoconf/Makefile.defines
+ MAKEFILECOMMON=./autoconf/Makefile.common
diff --git a/x11-plugins/asapm/files/asapm-3.1-ldflags.patch b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
index 11466cdbb1bd..a90d7baf2e4e 100644
--- a/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
+++ b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
@@ -1,5 +1,5 @@
---- autoconf/Makefile.common.in
-+++ autoconf/Makefile.common.in
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
 @@ -34,7 +34,7 @@
  		done