fix underlinking wrt #485896

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

5 files changed, 127 insertions, 18 deletions

diff --git a/media-libs/lib3ds/ChangeLog b/media-libs/lib3ds/ChangeLog
index 73a6553c1818..a5e4f2c16a9d 100644
--- a/media-libs/lib3ds/ChangeLog
+++ b/media-libs/lib3ds/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lib3ds
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/ChangeLog,v 1.25 2013/09/22 12:45:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/ChangeLog,v 1.26 2013/09/26 18:56:46 hasufell Exp $
+
+  26 Sep 2013; Julian Ospald <hasufell@gentoo.org> lib3ds-2.0.0_rc1.ebuild,
+  +files/lib3ds-2.0.0_rc1-underlinking.patch,
+  +files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch:
+  fix underlinking wrt #485896
 
   22 Sep 2013; Agostino Sarubbo <ago@gentoo.org> lib3ds-2.0.0_rc1.ebuild:
   Stable for ppc, wrt bug #308033
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index d4006e632433..1b5ea8c79281 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 SHA256 3e25948200a8548b404394f3658225fb86c00e6803840300498472ce9089354b SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570 WHIRLPOOL 06dbb832c50dc114da2274a43ef60c6f502e99dde4db4b1bab18aac6d3cf4c3e9313d22c4048bd589724f7337bf84a1619aabf6aa0aceee89bf6fb8cf9b5ddaa
+AUX lib3ds-2.0.0_rc1-underlinking.patch 1584 SHA256 c633b458054ff28d02644f3e9709925a7d2358bece2590a7ad2855f248f9332e SHA512 be3a3470cba90beeac5f1bc161c6885c09483e197b5501208e338ef7256e66e1a27066f0f91403ae6abdeb311e2eb374a36e01c4e3c99a2e7b77422bf24b9799 WHIRLPOOL 1cf58cd821bacec707c44f94396b2d2aac41fd328d8d69f2257a857f41c8b3fceaa3e1f50f3fee2d2806a0b71142c69835ac1989c66c4e531647fc6e4071c555
 DIST lib3ds-1.3.0.zip 443675 SHA256 f5b00c302955a67fa5fb1f2d3f2583767cdc61fdbc6fd843c0c7c9d95c5629e3 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac WHIRLPOOL 33adf50f5afff3563dabd48844cb0ea0631a4c2ce047fc7998139b15293f7de68646465ce0956918e1e3d04ece5efdd575d172c5d4183a73bb816d3d262c3682
 DIST lib3ds-20080909.zip 427233 SHA256 5d4df5f86a17a1aba58e9f54fe6a43c825bab15d8439ac9416c3f0c30fd1cca2 SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 WHIRLPOOL fd9c19a3fe6341cbf970d2c75352cb317c8073b23e94b792c4e905aa0a79e7c31d7ca1dd35dbef11f891052438c9216faee8245470423d5d8e206ea4981a9aa5
 EBUILD lib3ds-1.3.0.ebuild 644 SHA256 6e9e7b3f5121774f8973ca3894b1eebf6249636e9c7913e0be644d38535d688a SHA512 b5faa8522f3ea1e9098f59946ef0330d6e9a1adba5d9df9d94849b44fdfdc0a581a3e82360103430e7433b8869fe24b0eba9c3b554ce4617e77fab2847eff7bd WHIRLPOOL 0a00d90dd3346a498b345bdfe4a277c062cc7f20d0fc476eae164ea33ed24ff500a21df30f688544d039ac1b3fd5d7ca866badb3518c4dae0ac8447a8759a486
-EBUILD lib3ds-2.0.0_rc1.ebuild 695 SHA256 f3839c5c652fc9a73faeef96bcb20f66af43bf33afd9798584f1e05924fd5cb2 SHA512 234593c88748b30df7b897199a1cd6bc9d4deed763ba00cbcd334871d3dd17a669656a79b735941a59d4d74e6e9738ca838e7c1df42e6f2a296f98f32884f591 WHIRLPOOL 666ae508914c5739715dcdb5d2184c9b0cc4b2b1c01b562c80d3c0316e6483899d8444b267a7aa30f4580a14ccbf2f59c861b10f49329cd4f22833d4899f90f4
-MISC ChangeLog 2921 SHA256 e48ea678d49915782749067735661b5c9cddacdc8950cac46310df15a3d52864 SHA512 fcd4163d10bfa1b0b6ab3a3f8e19ead6c99e01863298d95f204bdeb6d2d53813ac703f0bd627390617f4a254cb36de1e20d489e8ebe10ab707f7ce4b36bec155 WHIRLPOOL 7acd1d505aa2a1124b887a3d7073553599091c34d9891a776db2703e9a73c1fbbb797383fb19b954343c13192c254d589511a4a1ba9d71965187ee9ce027e6be
+EBUILD lib3ds-2.0.0_rc1.ebuild 842 SHA256 1620c3e0e510868a2568f3bc18fb9ad0bd4ac33d3a9e54d62a70b090d8e1e8e5 SHA512 81a2ba40f826c7b7f08b21b7c236fdf18874a2570821993b984e0ef34536738241a36b7548e171a296d8522e9809d1a41447bfec727620a528bef82bcc6dc0da WHIRLPOOL 3d9140980ff9db78803cd323f3d5814f96f14f318d53f80c960ec8c7689b5037693d13b33133eab5bdce266b921ff5dc8124f63d76d08e18fa7486bc874bc1bf
+MISC ChangeLog 3140 SHA256 d54572d8ba4ec176b10d6cea591d02b4abc658a8794d801080d410fd2c765102 SHA512 e499b0d051c0f2096e601a36c379383803cb7fca96ee0a50d1498bf955e14003d17f8a235d14b25da848233f56c947facccf1508621930996a18d245fa0a1e65 WHIRLPOOL 55555793c71fd3c23d80bb0183f435c14b5f665fea4e7f07e5a6ada10f025f06ac89dae7f0560bcb065b0dfa8de2f40df2b1ed7b9164f2fe29fa318569528553
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSPuWWAAoJELp701BxlEWfW64P/jt/kS1ryOrgALORrBsQCT3Q
-vu/ZnlZIqRRfE8zxpZvqArndIOyPn8H07s4qMjCmgFq7QCV+R9iHWjRAgon7Tb0L
-/2T6qj4OCkJ8ryGq0wjP01/RhypTT2O9kvZhKOUUjpaNZLvlwSBc+S4ngDNdqpaZ
-PpajbLZcEZEpGj06rL6y0R8bugtzBqpWT4dcu9U02xBisaR6TvKds9O458UTLzGk
-kYjgAm6ZhrTOT/X2CEZ8YbyDf41UUutXRjkSJJkkY6KOpLMzqeFc5WYWrcg70YNh
-aOFgHDkHJJ/pOfjErEe9d3ByH4C0Ik12UtxykGKn2yUeRTLs6+E9ThMXBPkt4W/U
-w6lTFtsTD6sseeroHSaHcEUlOyNgQnLIBDw2AgZRLM39nT4t8Y+CmMwb65tLOpNg
-Nz8Z8Z++4Sid4aZt3PtQzQgf0L6deT4M6riTlHBrRuk5LjP5Xw7fKfXzqAwor/0S
-41i4f2cC03PxPnOdNv3Iu+x3UbZfmetQKPJH+CeyThhGbsSmzy4BXFeg6tTq5dOO
-g5+x6pvk2Wen2DRR+Ouc6IHnCkjxXoFIL/XE6wSRQ/8L0eU2yUIRVuqk9iv0lvzl
-4y6Hl7V9PJfC2fOCjyS0FqUJoqhsh8b7Lee0mDgIWene1TFhMArJTzmvqK79QvQs
-RpSGIxK1oBztcXrdYhLz
-=8dPP
+iQEcBAEBCAAGBQJSRIN0AAoJEFpvPKfnPDWzdPsH/19j1NJwk/XGJ058g2t5SXvb
+ddGQCW9vVNsPnKL2LBjyHnPSrUUW6jdiMjwzvGN+LtW0Yj3NKS2IKov0dHtOza1P
+eM9aHUlOm+l3Ui+Tn1X0J6uGKldWvBAzBUyI4vtUA+DLimDc7Mm/wtRUPv5qKYzc
+ygdQ2NgJAndohtCFDV5Luu19CDHZizJYVidMvIcx74hvPhSN/9HfJg7jmqthK3R2
+Hc68H5gEF3+Ya+g7PPh6Ij8BS+uEdlxUminHRJV/kOIjm/XAwI0xyG7SYE7JAWCi
+ryWC3/2MSIxqEApsA7a2Cdq7GEXnodMPkjWhqgbDEKFrIUESue/qBxtzhyM/dJo=
+=Jikt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
new file mode 100644
index 000000000000..af9040883c10
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
@@ -0,0 +1,45 @@
+commit 562d1412a705b6667bc9fa594133366fb7e787ab
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 26 20:49:44 2013 +0200
+
+    avoid autoreconf
+
+diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
+index 1b5b1fe..d2fda8a 100644
+--- a/examples/3ds2obj/Makefile.in
++++ b/examples/3ds2obj/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src
+ 3ds2obj_SOURCES = 3ds2obj.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = 3ds2obj.vcproj
+ all: all-am
+ 
+diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
+index 4c915cc..f9f7bba 100644
+--- a/examples/3dsdump/Makefile.in
++++ b/examples/3dsdump/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src
+ 3dsdump_SOURCES = 3dsdump.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = 3dsdump.vcproj
+ all: all-am
+ 
+diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
+index 76b7946..1c4b5b6 100644
+--- a/examples/cube/Makefile.in
++++ b/examples/cube/Makefile.in
+@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/src 
+ cube_SOURCES = cube.c
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la -lm
+ EXTRA_DIST = cube.vcproj cube.tga 
+ all: all-am
+ 
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
new file mode 100644
index 000000000000..b9001af2993a
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
@@ -0,0 +1,56 @@
+commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 26 20:49:01 2013 +0200
+
+    fix underlinking
+
+diff --git a/configure.in b/configure.in
+index 7bf17c2..fa5bd3f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
++AC_CHECK_LIBM
++
+ AC_OUTPUT([ \
+   lib3ds-config \
+   Makefile \
+diff --git a/examples/3ds2obj/Makefile.am b/examples/3ds2obj/Makefile.am
+index 8213225..4214675 100644
+--- a/examples/3ds2obj/Makefile.am
++++ b/examples/3ds2obj/Makefile.am
+@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = 3ds2obj
+ 3ds2obj_SOURCES = 3ds2obj.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = 3ds2obj.vcproj
+diff --git a/examples/3dsdump/Makefile.am b/examples/3dsdump/Makefile.am
+index 98ec5d1..ef19b04 100644
+--- a/examples/3dsdump/Makefile.am
++++ b/examples/3dsdump/Makefile.am
+@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = 3dsdump
+ 3dsdump_SOURCES = 3dsdump.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = 3dsdump.vcproj
+diff --git a/examples/cube/Makefile.am b/examples/cube/Makefile.am
+index c79c0ee..539813d 100644
+--- a/examples/cube/Makefile.am
++++ b/examples/cube/Makefile.am
+@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src
+ bin_PROGRAMS = cube
+ cube_SOURCES = cube.c
+  
+-LDADD = $(top_builddir)/src/lib3ds.la 
++LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
+ 
+ EXTRA_DIST = cube.vcproj cube.tga 
+ 
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
index fe76696b8390..da323bd2f7c2 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild,v 1.6 2013/09/22 12:45:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild,v 1.7 2013/09/26 18:56:46 hasufell Exp $
 
 EAPI=5
+inherit eutils
+
 MY_PV="20080909"
 MY_P="${PN}-${MY_PV}"
 
@@ -22,6 +24,11 @@ RDEPEND="media-libs/freeglut
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+src_prepare() {
+#	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README