Another underlinking fix, bug 387609

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

4 files changed, 46 insertions, 8 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 708ed2d19b89..fed5b2950ff4 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.78 2011/10/23 16:16:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.79 2011/10/31 20:08:58 dilfridge Exp $
+
+  31 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> celestia-1.6.1.ebuild,
+  +files/celestia-1.6.1-underlinking.patch:
+  Another underlinking fix, bug 387609
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> celestia-1.6.0.ebuild,
   celestia-1.6.1.ebuild:
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index b43f8f48b2af..a9c89e8217ce 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX celestia-1.4.1-as-needed.patch 406 RMD160 3d466263828351e668858ab0d3d66219fa6d2e91 SHA1 5263f2815101e2f417e6c94402365fa1f705cd90 SHA256 369e0a679fba546d85bc8ab41abe72180568f210c55f333dc5c67b38a1e5e705
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
@@ -13,16 +13,27 @@ AUX celestia-1.6.1-as-needed.patch 525 RMD160 6c1b943b79b2e6287a9d1e029564272902
 AUX celestia-1.6.1-gcc46.patch 278 RMD160 0de86a5a96c9c392fa5b7b352a9f7e77d75b8b1d SHA1 7c08ca391603806d788cb8f3342acedafc924eef SHA256 5fb9becc79e12e57c296d3861591cd22b2b11a591cca755c2bfff202fd6dc757
 AUX celestia-1.6.1-gold.patch 545 RMD160 eb00ce384128bb2c6f9678a8a7e610a97caa9bd7 SHA1 6b7dd092bd523776ab0c5f8c3a1d266b93846014 SHA256 32c455a5f23ca6eb61130d0fac40872de97f2d465d44f636f23a23b81d04887e
 AUX celestia-1.6.1-libpng15.patch 387 RMD160 9f51b8d11789d81c43366f32a0fedc1db0bdbc41 SHA1 46ecc4e10b24191384bc848c206652498843adf0 SHA256 ba3269842103ab68a1abd0fceb388878932d042620902796986625bd2b5f35cb
+AUX celestia-1.6.1-underlinking.patch 639 RMD160 1cdaee4d38b59bbc61c92bf1c2c06a2dd320814c SHA1 bc2b8f7e50ca64bef6edbf6d03c036dbb997e341 SHA256 b771760ee4b5274ae1ab4d98df53e66899890039d3eb5343dbd510735b836837
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
 DIST celestia-1.6.1.tar.gz 52600436 RMD160 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a SHA1 1f0fdf4525a8b9d6c708e1f6383babed670d18e7 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4
 EBUILD celestia-1.6.0.ebuild 3229 RMD160 4a88522146077ed7387d80b5608624cbc59ef503 SHA1 770b93bcd5338ab249aaff75ed044890dca9feae SHA256 b78788039aa226cb73da50202578f6a3f639644faf9be28e5e0cb65be727d8fc
-EBUILD celestia-1.6.1.ebuild 3133 RMD160 aaf0201da3945ce5223a6cbe686a693621e53928 SHA1 297301b06588d51431a741be63b20115cad2266d SHA256 5625cf1ad76462856af37243855864da468f64857eeea1a04d609148551215e1
-MISC ChangeLog 18076 RMD160 28de4985d33c943e6387b17787229860ed4094d3 SHA1 999228f3d91bc342aa76336e3b4b19b4298c6180 SHA256 ed10ce470a91ffa41ccb7bc6ec7ea21354961005be69f6f4b1a859defb46046a
+EBUILD celestia-1.6.1.ebuild 3221 RMD160 556f7f38d3b824a3757e23168d47223f20026da4 SHA1 5b52b2ece32e0e517800ea72cc36afb68dffdea7 SHA256 b27b93b1a3122f06be43d6f2930f20d2a70d16fe05a27e14aa0027daeff9c651
+MISC ChangeLog 18242 RMD160 d8316071ce0351cc635a456327acad2502bfd21f SHA1 61a5a2bf8c5a3bfc5072be5059f65893a0f7bd8d SHA256 cf39ec7d10eda70cd4d3a88c85571b33b2ed21250bd84ab58a890f444dc70aa3
 MISC metadata.xml 705 RMD160 cee4824e632be1d7e4e3eac24b556e841317b018 SHA1 479d9d525d2198e03ea2a6f7da39686ff7f1a1e6 SHA256 95695c52447533d5265d496b677a78e35f0118f9e34b539dd8b8f3a90d158421
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6kPc4ACgkQuQc30/atMkBFWACeMCrwUPzM7vi1Mz8Sp87GZpjA
-jvYAoLox7LSBwmMdjegrRIt7lpFRuPx9
-=8mON
+iQIcBAEBCgAGBQJOrwBtAAoJENwGBM22xffe+u8P/RYZ5TQ6Cw/0D25AB9EggSei
+RpxUd3nHgdAvmcBM3jnaVMaKQ5x3tpR1ll4XQP4n5WEipEBRcqJv29n1WuS+rFkH
+KYkTzEc1sb0/Glne2mz/4AdbQYo0BGyB+x2AutG4ngD3cT5Thagx3ECj+C3wv3qd
+wuBmkVyaE/UJFdriHH0z1Tx6ujRfj4C+R1njZG/g2EMN/Ywj6uUYwjfyyKBzj2Yc
+k5cpNk6C3DvO60+4LJS+EXrcO+/jqn6PShUtVzZETZr2EifQlJwdVmZu/AXPkvKE
+AAtV6K7DDcHBeud9yEz0YJMniYIDYf/Np4IjZM37gZ2JyXlVee7u0MRD8RbmlUWf
+D1wzrDgooE02G6pZOerGQNKoB1aqpOBwjaCn4q/JsOXoqMGrRISeKpf+hPVsbQO/
+T1dUhysCyAC4amesInxMXmg9gff0jsjs0O33PW6JH0sBC368GsGiy1acSBysru8f
+f9cePd3vg8/Bw9cpWwOz0Qfqh8Go+70LcvQ3NagFDMaTfI5dmpvOJXgTj/jvC5P3
+tGohiNB/nUvaDJIB3UDXSAW7TTVXPkTlqoD6jw1tkWJ2Yg28cCeCdxWw8Ls9Dp2w
+yQNS/tCjm4OuE9cX34jVeqMjx0r3n7vP+OGM1t11MKN98qEnBQkBgmGjqEDhbZTr
+fAYXb+bowZJhgezuiWgs
+=Eb+F
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index b64613c21dbf..281fbd49953c 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.8 2011/10/23 16:16:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.9 2011/10/31 20:08:58 dilfridge Exp $
 
 EAPI=2
 
@@ -62,6 +62,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gold.patch
 	# missing zlib.h include with libpng15
 	epatch "${FILESDIR}"/${P}-libpng15.patch
+	# another underlinking fix, bug 387609
+	epatch "${FILESDIR}"/${P}-underlinking.patch
 
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
new file mode 100644
index 000000000000..3cb62f3b8583
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
@@ -0,0 +1,21 @@
+diff -ruN celestia-1.6.1.orig/src/celestia/Makefile.am celestia-1.6.1/src/celestia/Makefile.am
+--- celestia-1.6.1.orig/src/celestia/Makefile.am	2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/Makefile.am	2011-10-31 21:02:23.000000000 +0100
+@@ -80,7 +80,6 @@
+ celestia_LDADD = \
+ 	$(celestiaKDELIBS) \
+ 	$(celestiaGTKLIBS) \
+-	$(DL_LIBS) \
+ 	$(LUA_LIBS) \
+ 	$(THEORA_LIBS) \
+ 	../celengine/libcelengine.a \
+@@ -88,7 +87,8 @@
+ 	../cel3ds/libcel3ds.a \
+ 	../celmath/libcelmath.a \
+ 	../celutil/libcelutil.a \
+-	$(SPICE_LIBS)
++	$(SPICE_LIBS) \
++	$(DL_LIBS)
+ 
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia