5 files changed, 31 insertions, 18 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index a24fffbf70ff..efe368af7e98 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
index 92ef7308bf0a..c882df02e05f 100644
--- a/x11-plugins/asmem/Manifest
+++ b/x11-plugins/asmem/Manifest
@@ -1,5 +1,5 @@
-AUX configure-implicit-func-decls.patch 414 BLAKE2B 77b3d986be6de5783d22902daca5c9a0e9af8881a4d1a8cd05c338d1d3dd06fbfdd067ea318ed5aedac9253d159703183b7f19c537a19cad0a86a16100fb3a4a SHA512 379add78fe0c0f41e5eae06c845f0662c302611efa881316d7ef1dd31a4218f724d653fd1ca88b74451a8e00d1866d50b7efae52e4be5b16e022bdb2ae8c2d4d
+AUX configure-implicits.patch 615 BLAKE2B 59ebcf0413db4d265b401c75c6b42f253fa7805b379feecd82d4211329297658e946bb56ff0e309824d3731ae878df51c748c3bcc877b08f132181b18f868902 SHA512 7ea5ba5eb7c9c674d8bac056a7613bee2e9b436ac1368c2e18c2dd58ace6077c8bfdd02ab5c9e9bf7770407855cef6d9b3428cbd19256fd530cc02cc6832342e
 AUX respect-ldflags.patch 800 BLAKE2B cce3ba814ae0b78835543ae95a0b9ed6e52b267068cba4dbf3451e169b84e343d8192608e2ea392b99b7b28f337b671cb0a1a013eb7181829f633742b6f45d22 SHA512 10f1b7cadebdc39ba63ae5adbe9fcb4a5da24f134dfa3ad225c9f09d4aff72d98f3986437ba183a329a3c7cbad07358ddb019f78812e376dc353788e1c253d5b
 DIST asmem-1.12.tar.gz 48058 BLAKE2B 8211791d8a7ef2b664552ff89802d84b3fb2cc8b6e1780319e6ea4a3530ad172da439a7ec9ef691fef42b0ec98e5b57af256762c98d03857ad6333fb8234862f SHA512 3f086c55b6ef2804b8c32cf2eb8c9937a6f69886d89bdf09cab29a6f567a9620adb86a7c9ec19d88feece1e03eee3507601d520fe1eca1588a28494516b2e1f0
-EBUILD asmem-1.12-r2.ebuild 853 BLAKE2B 5d373d04fdb635b3606d4a8225e422dc28ac6b71f49f8e956af8b729c3b8e2584a3cbd7171fb52a3d8c7b3cad2fef948241f4f603ddf334e9bacd5851fec78b4 SHA512 81eea634146698275b4736b6d6332b08e7ceeb4e82e9b076a8b2793eec04a1cba7765b525f2bafb726f47b69cb9a45a0ae60886865375909b746b2e0a076775d
+EBUILD asmem-1.12-r2.ebuild 856 BLAKE2B 129ddb2858c2a2dae1dc83d82e32fdab954ced2d7c60bbb108ff90db1256ded5c42e669287f0d2ccb370f1f0f6bf66af634b7fb0fe93330ccba7452d3acbd360 SHA512 876414c5c51df5ba21b11be3562dcc34c08f9e00f594ec793286f991861757c913433a87bf31ec14977ea2c2613835b8d0fc3572b7a555e059316e56c440c8f2
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/asmem/asmem-1.12-r2.ebuild b/x11-plugins/asmem/asmem-1.12-r2.ebuild
index 47c255eede9c..02804f6c2ddb 100644
--- a/x11-plugins/asmem/asmem-1.12-r2.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-r2.ebuild
@@ -29,15 +29,17 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/respect-ldflags.patch
-	"${FILESDIR}"/configure-implicit-func-decls.patch
+	"${FILESDIR}"/configure-implicits.patch
 )
 
 src_configure() {
+	tc-export CC # old autoconf
+
 	econf $(use_enable jpeg)
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+	emake LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/asmem/files/configure-implicit-func-decls.patch b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
deleted file mode 100644
index 0361c3e6e9b4..000000000000
--- a/x11-plugins/asmem/files/configure-implicit-func-decls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/870679
-
-Generated file and configure.in is written for autoconf 2.13.
---- a/configure
-+++ b/configure
-@@ -751,7 +751,7 @@ cat > conftest.$ac_ext << EOF
- #line 752 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
diff --git a/x11-plugins/asmem/files/configure-implicits.patch b/x11-plugins/asmem/files/configure-implicits.patch
new file mode 100644
index 000000000000..14eff8f58e3a
--- /dev/null
+++ b/x11-plugins/asmem/files/configure-implicits.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/870679
+https://bugs.gentoo.org/871279
+
+Generated file and configure.in is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -752,5 +752,5 @@
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(void){return(0);}
+ EOF
+ if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -1356,4 +1356,5 @@
+ #include "confdefs.h"
+ 
++void ${x_direct_test_function}(void);
+ int main() {
+ ${x_direct_test_function}()
+@@ -2440,4 +2441,5 @@
+ #include "confdefs.h"
+ 
++void XpmReadFileToPixmap(void);
+ int main() {
+ XpmReadFileToPixmap()