Fix building (#505788)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 39 insertions, 16 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 01de5281b88f..a92f3f17e7c2 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/uae
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.42 2014/04/02 11:55:44 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.43 2015/06/20 14:53:58 pacho Exp $
+
+  20 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/uae-0.8.26-underlinking.patch, uae-0.8.29-r2.ebuild:
+  Fix building (#505788)
 
 *uae-0.8.29-r2 (02 Apr 2014)
 
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
index 925ba5a27dd8..b0be2b683417 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -5,18 +5,15 @@ AUX sdlgfx.h 974 SHA256 dcbbcc57ffa9ee951963be49aa454ff6078b6e18d5bbe7b773b4bf8d
 AUX uae-0.8.25-allow_spaces_in_zip_filenames.diff 651 SHA256 13f4377de98fba7758bff128830f4f16a97db83fd4d2e5c1161a71d8423bd80e SHA512 f69200029c1c3e2a38ebbf09fda254e98e8ed457b447801953519969be6d78e73a8054a66f44c8c495a1205aa54033914da43159f84985f9421844c7a00740a0 WHIRLPOOL 4ebc3e528feb3b63fc3af745afaf6bd02720cf2a4c125e0c2197f7abfd30f8c776843fed93fa67151aab8097e71a90383594095b440ef7ca15e6bc4be6f32781
 AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a SHA512 553150271c42ca76f414fd19e482230dedc7ea9c466d5bffb31ef5e729a92d558c020f91aae3a91570b1ef5cef5af5f6872bdaf009db17517651b5e106323270 WHIRLPOOL 62158ba7d9af4fa7952723a601eeb0937bddd1368422a6505e88ca45e6beeab0ec75b2d7a69396134f2ba93ba878db9bc4ff7bf13f35922f14b8468e3234781a
 AUX uae-0.8.26-uae_reset_args.diff 3216 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 SHA512 04d404efa4d63fa89eb537e9c0f6b964e5dad031305abdf6ba08339d1aa5d211b51c37599202e52210b5805ebb5c1109b5b04092e2484001b7f630b268e59a21 WHIRLPOOL ffd0d154fd750a332ab1d059167119758847d3e8121eed97cf9ff59491d48e43b29de8cfbd1287a8acd91ea106bd1ba067063b9ac504c8b64bf70d37a8bd9ca2
+AUX uae-0.8.26-underlinking.patch 499 SHA256 05c8a4d29d5cbc0c1fe4a2150697f37aa716374baa3edbb255c84188f2ce0405 SHA512 8a297f34d3550a66b4145ef913cd2ef4399ebcd43adff88b9d0b93a6eabb1ace8dedef53f515b6f413faef7b6e6491fd81f3b60a0e6efa67212b082d2671b74a WHIRLPOOL c43caacc7a4baf28ffd242368c9201979c77135ff89d60fa35d83a9d1c32fe246b618f4e4f86f4294fe956e9b47dab9f961749fe1e20ccf7cefbe12d4ceb0e60
 DIST uae-0.8.29.tar.bz2 925508 SHA256 2463524b19b36ab44de158c5f24871878eda05230ea391343849959643634317 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064 WHIRLPOOL 0fcf540415b4434f59f8df97de6c49db03f088d219267eb19647afad483ffc99c48cba7cbf704e86e3d2f25ab184f19119d5a1c578df6dcbe53f7e6c25d1648c
-EBUILD uae-0.8.29-r2.ebuild 1822 SHA256 150a14de94eb4ba3cedc6392fd98393fc5b387e7b61d866a953f1915522311ff SHA512 2c7b0ea00d29d9791f9eb6fbafe4884bd33d62534ef25cfd44aa6d0f18c65db0592444f97da13218a6318893e96a9000826ca321102fba52c7b818fdb637af84 WHIRLPOOL 459c55c7218ac9cebef529d734ada6fd63d829e794c5084144d8f5f6fef53f721b73177694482bfe2fbdbadfc4aabd7ba0c752db42d0f8a2e492ce84ff78bca8
-MISC ChangeLog 7615 SHA256 7e3ad8b25c1504c4a4bd4a6dee59aa82c89ef9510758c4d77116bdbb037642d6 SHA512 3b1387540a206146992b6af94715b6f9ef7bec44c54dd93bc3e9de5c6df6339243cfa7d35a1c04674897eb61afbd7dca84324cbac6e678553db33017426b790b WHIRLPOOL 8c4570c70ced1d80351d949ca94c3ea0ff0f0207ee07c17ee0962bf31183aac2d4eff7c8fab2e8800ee1ab4fa6f8fc5c6a9e76e646b4229650cd068f4553bc6f
+EBUILD uae-0.8.29-r2.ebuild 1900 SHA256 1749690ea70e9275e40f452565832705c0ad3603cbf3381fe6f4ce1a9b4188d6 SHA512 3612ba9e8c8bbe9c3d60ef8a07b1549e77610e1f260fee6128fd0ea44403ea4ba7eb6c728f28c4d1482229d2c9dbb0fc93cefd61fd0da4fabc8f5fb845be41e2 WHIRLPOOL fab6a53d623af30e471b736e50edddbb6506fe782f561d00a61af20221670f6751a6feb8243af1400dc909f47520caa4e41a76fd9bcd524645bf877bd4eb47fc
+MISC ChangeLog 7748 SHA256 1c5748052c350286d4ab26a64cfbad8ddca31eb98904fbb6693cdce54af0072e SHA512 939f96f49751dc10ea6df9a8983a700845c95afb0c317f96c9fb46d748f54309d0cc95ca05610121ca4650e3fc6ee40a4591ed3b5869ad18cc6283962cea16b0 WHIRLPOOL 995695c4dd9b1b0db15de104e61360b1a1dc3aeaab17f355538da91b6b4cf715b2149e83b21d3c3f3a51381fa75e0912658efce2d8101b445d342177072ef214
 MISC metadata.xml 720 SHA256 c6f3b414102c0aac64c1ae570a1b7dc407a55ce4161ed3d66fe983a32c46b9b8 SHA512 554421e6cc288e5bcb8ad1a74dc7d45fe5077f3b8eb01bdfe71c02fe95c1d4e6187414faa86fe933559ee4e8c8a259579fd3c4d4cd3da1fe69f9a5676c43806d WHIRLPOOL 4734f87221b5eb07820b411f79f9dcdbd8992d2e574fb44f684779a8cd9e7aa72e244c116509442940521937a5ef652bba00326a19a58d72e25916ac7abb661f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTO/qtAAoJEJWyH81tNOV9vC0IALClGPfdMQvkmUKSidg7y8De
-++O7rCTsyqkbaDjh0RDUGxmHbZ5HClGMcz7h2NHsIvqVMsEGrDd6cMW/JPVJacSa
-p7BekJDpqDJMZ+NQecrFrzrqx5YDBkK4PawUnvhzSwxYmR0IhCjCfUxiWnZH1+x5
-sXnF34cHl7g015OBZaoUe7/FYjnXLteLgld8KXnTgwiQKYhKmiRRtk3UMsVBNwlx
-xZYTEzErJ5Gp3DItx4zPRxpQQk1HEtxTehXtjn2Zz4aEl9bp0w6KAfCHnsBHQmoq
-vkHuHjs0ejEF/EnZbiZyFCui18e9ikCsd93eAE2nvfKFadjQN0GN8n5CH8xRHC8=
-=jIT0
+iEYEAREIAAYFAlWFfocACgkQCaWpQKGI+9TuzwCfVcL2byzl49xeO9pzspKLHx1N
+ht8An0z7Vgwe7XWYk/x+0fo4kzX7xHWj
+=eQ0V
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/uae/files/uae-0.8.26-underlinking.patch b/app-emulation/uae/files/uae-0.8.26-underlinking.patch
new file mode 100644
index 000000000000..16bf5744826e
--- /dev/null
+++ b/app-emulation/uae/files/uae-0.8.26-underlinking.patch
@@ -0,0 +1,19 @@
+--- configure.in
++++ configure.in
+@@ -81,6 +81,16 @@
+ AC_CHECK_LIB(audio, alOpenPort, HAVE_SGIAUDIO_LIB=yes, HAVE_SGIAUDIO_LIB=no)
+ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA=yes, HAVE_ALSA=no)
+ 
++dnl Check for libm for cos()
++AC_SEARCH_LIBS([cos], [m], [], [
++	AC_MSG_ERROR([unable to find the cos() function])
++])
++
++dnl Check for libm for floor()
++AC_SEARCH_LIBS([floor], [m], [], [
++	AC_MSG_ERROR([unable to find the floor() function])
++])
++
+ AC_PATH_XTRA
+ AC_CONFIG_HEADER(src/sysconfig.h)
+ 
diff --git a/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
index 8f0c3b0c758c..49208921e524 100644
--- a/app-emulation/uae/uae-0.8.29-r2.ebuild
+++ b/app-emulation/uae/uae-0.8.29-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r2.ebuild,v 1.1 2014/04/02 11:55:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r2.ebuild,v 1.2 2015/06/20 14:53:58 pacho Exp $
 
 EAPI="5"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="The Umiquious Amiga Emulator"
 HOMEPAGE="http://www.amigaemulator.org/"
@@ -31,8 +31,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff
 	epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff
 	epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
+	epatch "${FILESDIR}"/${PN}-0.8.26-underlinking.patch
 
 	cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -62,7 +65,7 @@ src_install() {
 
 pkg_postinst() {
 	elog
-	elog "Upstream recomends using SDL graphics (with an environment variable)"
+	elog "Upstream recommends using SDL graphics (with an environment variable)"
 	elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support."
 	echo
 }