Combine all patches fixing linking issues into one

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

7 files changed, 81 insertions, 85 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 3f58509d5ac7..dba5254c92a6 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2011/10/31 23:20:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.81 2011/11/01 08:13:01 xarthisius Exp $
+
+  01 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> celestia-1.6.1.ebuild,
+  -files/celestia-1.6.1-as-needed.patch, -files/celestia-1.6.1-gold.patch,
+  +files/celestia-1.6.1-linking.patch,
+  -files/celestia-1.6.1-underlinking.patch:
+  Combine all patches fixing linking issues into one
 
   31 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -files/celestia-1.4.1-as-needed.patch, -files/celestia-1.5.1-gcc44.patch,
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 8c4f434f092f..ae4bc7d314a5 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,25 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
-AUX celestia-1.6.1-as-needed.patch 525 RMD160 6c1b943b79b2e6287a9d1e029564272902741b61 SHA1 1298f5215cea4b1bb6d73b1b6f59972c21f95883 SHA256 7a7f35d8633e25db53d3a3def512ae4a018466fa6b4197aedd92e27dc1564466
 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
+AUX celestia-1.6.1-linking.patch 1216 RMD160 cb274de785b10b521d30157df711f8317dc00687 SHA1 534c8eee18d13a868c91f0b870ebecc05f3e7ae1 SHA256 443841e39994de8bbf5bdd7197b45fa91a87d66022dc85041265546b04f61dd5
 DIST celestia-1.6.1.tar.gz 52600436 RMD160 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a SHA1 1f0fdf4525a8b9d6c708e1f6383babed670d18e7 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4
-EBUILD celestia-1.6.1.ebuild 3221 RMD160 556f7f38d3b824a3757e23168d47223f20026da4 SHA1 5b52b2ece32e0e517800ea72cc36afb68dffdea7 SHA256 b27b93b1a3122f06be43d6f2930f20d2a70d16fe05a27e14aa0027daeff9c651
-MISC ChangeLog 18565 RMD160 5c67216dd3407d050fe1aff05a59cc181288e4dc SHA1 bb1ccd0997434f5b863e93bb1b8e9dbe78aa659b SHA256 b0912f05fca665fd81e029c69aef6c507754de954bfd5c828b2933cc7b4b3745
+EBUILD celestia-1.6.1.ebuild 3031 RMD160 b2621eaf911e472cc88503a60eb06eed6141c09c SHA1 de577c10841ea0d9656b30db7990b2b9555d5ad2 SHA256 7aa9266f4e4d40e41fb681ffd963428a62c2d1c910a9df55d3c2ed46d3ccb774
+MISC ChangeLog 18855 RMD160 9ffd4a1dda0d4b8c6145c651d2eec5c83f64f777 SHA1 da4a4692c4860974ecc5f751615a5b876b9f124f SHA256 757db4c1f6906f09b6896f1f04e646800405a9d0a222e40b8af70575844d55a7
 MISC metadata.xml 705 RMD160 cee4824e632be1d7e4e3eac24b556e841317b018 SHA1 479d9d525d2198e03ea2a6f7da39686ff7f1a1e6 SHA256 95695c52447533d5265d496b677a78e35f0118f9e34b539dd8b8f3a90d158421
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOry1AAAoJEEdUh39IaPFNFqEIAIDGPrng5H4dWdpPEbBuQduR
-pqTK3aX21TH9xL/8H9qpb9Ae7t1x2LJYIa1OoXu2c5rNf0kPz9MwPJ51tJtu0/fy
-Z903UIMcOnG3AkpDu4CoHDxQ/IXKXSpIWYxWan7JpmhsgbmI7PB9rB+dO3nK91Oa
-xIOtBLx9Fpndkn0PJpeTvE3dIRfcQ4B3UM5hEaVyn//+iND9/vq6p3G41COogWhU
-jifqWPYoxYSMY2BGXvBqAqcuKbW8oLn/kifyMIWotLYd3ui3/pLQV8f7WJ766Oab
-N34Uk4NdJ7krv9HkLKav/NzSGbZV518Oi238H/AOouV4vDiBpvUoh3VJW8rOI1s=
-=vwzG
+iQIcBAEBCAAGBQJOr6oWAAoJEF0huFKJUZL5Or4P/1SgyIUmkHUpvKnnXzCuNGnz
+Lbpctg73AlodTnYiZEv7ar4qa6SXdxl4MbCQb4sxPHxiGItO0fzy7xMGI2RsM+Rg
+tVVNS8eo9ajkqkmBdAPSoa9GSvKACP7A7lrBVMGXrSQX3Urw2XAfATBROAfXm6kp
+OiGyzEBYqnxA/LJoZeVNyl5CTMymypjHn4Bw8lW+zHEi0sy4g0pJB8dKQl4yWnd1
+FCYfBTiTG+gvvGdy9exyzhABJbts3FYLe9dXZpHYi9Hjy+ntp6WaRF+1orY6AF2U
+GshXqp/rjL410yOU4Ty4NsVwrFhzsXZKjkanOJ+ZptQaEF5NMSby6VAK4BFbLv9l
+7zXjQPRzxglWolbdrU8COTdVj0vdoMBm/hTDz1M5mcXUMHtQQztaWJTHaSC5+JNy
+taTZihcCf9jMe8KfKEGWN+zwUGucoJkISVsQhsYtMkWsj7z/5/jO0IcRDJMqoqgU
+N8j+rtrom14TQyaEVcCzZYqYUFNYPAIMkCki2ug9XRpa127y//nme3Hac/M8m4Mw
+hmuFUQumWxp6RsoRhGytgNK+zeBS+gSk/ZJ57s9jsmPtG4tCz8wo2s1ucrKi1S1j
+HO6iBoLWjxiLgYyiKBgDpgj15E9cBzsOceUjMkM8tZlZFGBDX5O09yjDykOLS7dn
+TdmM3ZIHn1s254J4Nnus
+=eSaG
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index 281fbd49953c..e4cfab331154 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.9 2011/10/31 20:08:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.10 2011/11/01 08:13:01 xarthisius Exp $
 
 EAPI=2
 
@@ -54,16 +54,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.0-desktop.patch
 	# add a ~/.celestia for extra directories
 	epatch "${FILESDIR}"/${PN}-1.6.0-cfg.patch
-	# --as-needed fix
-	epatch "${FILESDIR}"/${P}-as-needed.patch
 	# fix missing includes for gcc-4.6
 	epatch "${FILESDIR}"/${P}-gcc46.patch
-	# underlinking fix with USE="-gnome -gtk"
-	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
+	epatch "${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-linking.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-as-needed.patch b/sci-astronomy/celestia/files/celestia-1.6.1-as-needed.patch
deleted file mode 100644
index 5b9d2ddfc03c..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.1-as-needed.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes building with as-needed
-
-Patch written by Nils Larsson <ni1s@nerdshack.com>
---- src/celestia/Makefile.am
-+++ src/celestia/Makefile.am
-@@ -10,11 +10,13@@
- celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-                   $(LIBSOCKET) kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
- endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
- celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gold.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gold.patch
deleted file mode 100644
index 392523324e09..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.1-gold.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- src/celestia/Makefile.am |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/celestia/Makefile.am b/src/celestia/Makefile.am
-index b1e4b3f..b0809a5 100644
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -62,6 +62,7 @@ endif
- 
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
- 
- if ENABLE_THEORA
-@@ -83,6 +84,7 @@ celestia_LDADD = \
- 	$(DL_LIBS) \
- 	$(LUA_LIBS) \
- 	$(THEORA_LIBS) \
-+	$(GLUTLIBS) \
- 	../celengine/libcelengine.a \
- 	../celtxf/libceltxf.a \
- 	../cel3ds/libcel3ds.a \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch
new file mode 100644
index 000000000000..d610d5243f2a
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+ 
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+-                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+ 
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+ 
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+ 
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ 	$(celestiaKDELIBS) \
+ 	$(celestiaGTKLIBS) \
+-	$(DL_LIBS) \
+-	$(LUA_LIBS) \
+-	$(THEORA_LIBS) \
+ 	../celengine/libcelengine.a \
+ 	../celtxf/libceltxf.a \
+ 	../cel3ds/libcel3ds.a \
+ 	../celmath/libcelmath.a \
+ 	../celutil/libcelutil.a \
+-	$(SPICE_LIBS)
++	$(LUA_LIBS) \
++	$(THEORA_LIBS) \
++	$(GLUTLIBS) \
++	$(SPICE_LIBS) \
++	$(DL_LIBS)
+ 
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
deleted file mode 100644
index 3cb62f3b8583..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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