Fixed when kde 3 when kde4 is installed, thanks to johannis, closing bug #282829

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 40 insertions, 7 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index a11695482f23..221f6a2f0f26 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.52 2009/08/13 00:38:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.53 2009/09/06 18:24:05 bicatali Exp $
+
+  06 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  celestia-1.6.0.ebuild, +files/celestia-1.6.0-kde-3.5.patch:
+  Fixed when kde 3 when kde4 is installed, thanks to johannis, closing bug
+  #282829
 
   13 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
   celestia-1.6.0.ebuild, -files/celestia-1.6.0-as-needed.patch:
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index c9f67a71cfff..a4ba6f516181 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,18 +8,19 @@ AUX celestia-1.5.1-arts.patch 1806 RMD160 af88ff314193c55d56223489f53d46125ea507
 AUX celestia-1.5.1-gcc44.patch 1003 RMD160 3a7444ee0750ee32113fb54f0dc74042cdd8d836 SHA1 0444f9bd8a49c4ec905417aff2a2fb4c4aae73bc SHA256 1dab8e91cc720d826f06b4fe53de4b42e9d635818050a791f0cdefc7110daf5c
 AUX celestia-1.5.1-kde-3.5.patch 1018 RMD160 c39ded08b1fe0caf8eb4f1b2efe3366aeea61935 SHA1 564c5c91ca287382aff31c28a9e762f4e60bf28a SHA256 a4a7281747a9f493f3354f1f1b84f7159b49c1c89f6dd2bf669756c8e8e4ee8f
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
+AUX celestia-1.6.0-kde-3.5.patch 962 RMD160 5bfc9f56f00f0a74fc5e8bac0ea92da0515db39a SHA1 b25b2bfebaa1c2cd23c8d350b5849327acc978e3 SHA256 ecbae1130ee36871fe815e298326d628a436e4c2204cac8228b1a1b1cf77c166
 DIST celestia-1.5.1-acinclude.patch.bz2 37015 RMD160 dd4e2d538bf633bee691b6ece0a9381e5643bb2a SHA1 b11454a7d1c8bc8c472337c8a0728cf711d98f3c SHA256 b4ccd6a5c24e0074c698bc7d000e6193d182c3908a130a7da2d727a63d1d28b9
 DIST celestia-1.5.1-gcc43.patch.bz2 4673 RMD160 8aafd3ea0e93965398ff5493865e2632b65d1fcd SHA1 5237b4799c133d44af0d44c14ad6a9a4b5066003 SHA256 070c812969562948314a784e549c423634fc4eece990e820313682417fdb1fc8
 DIST celestia-1.5.1.tar.gz 34144780 RMD160 26f105acfc26a5edccb73fe29c33638804b0f370 SHA1 2d6a117daf6a400ab4c47a5a51c13f2ab601e6db SHA256 5a028dec634c2fd1b2097eb6717f8e6ca5d05052b7f63f5fc205d0cbf254888c
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
 EBUILD celestia-1.5.1.ebuild 4469 RMD160 adcb1621f0460891c61ffb2dd6aa81fc5a29ec0f SHA1 609a76bdd45a0f4b0f84c63b12263588bad618a4 SHA256 ef9e3384819509f837d8800e9ec64fde761393fbdcc50ca6b7311dca34b1708d
-EBUILD celestia-1.6.0.ebuild 3500 RMD160 eef0713313d37b52d3958f3cf7953db7d226d989 SHA1 eb76f952fee59d2617b2c5992c82fd648aae4808 SHA256 a53c5d0196bba6f897c9aad2fa72be375302fda8c12c2364068b539920aa84d7
-MISC ChangeLog 14393 RMD160 ed9f2cef020ba6c511b73adaa5fe4623db934e3a SHA1 44784bee1df145ad9adfdc08016a37c8f53f20ce SHA256 6a0e234739ca67c97963fd3c1a24ffa54509f8e673364c176366ba36d3d4ec38
+EBUILD celestia-1.6.0.ebuild 3610 RMD160 6a293b6f6acb912db4e68ba2d401cb46ba40e6c4 SHA1 f9a85b2d9ad6dd69be413b6c0aa0cb40905b4cd6 SHA256 f984253d3364ff7dde360bd754a3c4cb2641b10f782adfc790d3b9ef52d038d4
+MISC ChangeLog 14596 RMD160 f20982623d3ac685b49b0d309bda9dc156ab5e52 SHA1 9c0a51bb0f44a97aab3505fb37d737546455df3b SHA256 944812a5bc1c783eb9b0abda1363b383fb0dddc7fa5b436efdee546686dec8f8
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqDYKQACgkQ1ycZbhPLE2AIgwCfYQmKmIcwW+jdxGgTZ69yKd7b
-ThUAoLKNbdLnKwZHGZNAksUxtgSFTrlj
-=5hvG
+iEYEARECAAYFAkqj/k8ACgkQ1ycZbhPLE2DT9QCfW2CxVngzNgiH4uYlSBHBOVxb
+K2sAmwQulhGZGahdW060zhuDiavnH21Y
+=1Sp6
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.0.ebuild b/sci-astronomy/celestia/celestia-1.6.0.ebuild
index 8e084df8e616..eecf750e9e87 100644
--- a/sci-astronomy/celestia/celestia-1.6.0.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.2 2009/08/13 00:38:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.3 2009/09/06 18:24:05 bicatali Exp $
 
 EAPI=2
 inherit eutils flag-o-matic gnome2 kde-functions autotools
@@ -67,6 +67,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.1-as-needed.patch
 	# missing includes with gcc 4.4
 	epatch "${FILESDIR}"/${PN}-1.5.1-gcc44.patch
+	# needed for proper detection of kde-3.5 in the presence
+	# of kde4
+	epatch "${FILESDIR}"/${P}-kde-3.5.patch
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch b/sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch
new file mode 100644
index 000000000000..3069abe591ab
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch
@@ -0,0 +1,24 @@
+--- acinclude.m4	2009-09-05 10:30:34.000000000 +0200
++++ newacinclude.m4	2009-09-05 20:47:53.000000000 +0200
+@@ -1792,9 +1792,9 @@
+ AC_MSG_CHECKING([for KDE])
+ 
+ if test "${prefix}" != NONE; then
+-  kde_includes=${includedir}
+-  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
+-
++  kde_includes=${prefix}/kde/3.5/include
++  ac_kde_includes=$prefix/kde/3.5/include
++  
+   kde_libraries=${libdir}
+   KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
+ 
+@@ -1818,7 +1818,7 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="/usr/kde/3.5/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)