summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-11-06 00:07:31 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-11-06 00:07:31 +0000
commit74b04c210cec8f2084306e97f41fb6885a841771 (patch)
tree0a97e8a99db789b4b6820e9ecd0323053eb1ff50 /sci-astronomy
parentBug #245662 - Remove all unmaskings of the "real" USE flag. (diff)
downloadhistorical-74b04c210cec8f2084306e97f41fb6885a841771.tar.gz
historical-74b04c210cec8f2084306e97f41fb6885a841771.tar.bz2
historical-74b04c210cec8f2084306e97f41fb6885a841771.zip
Added patch to properly detect kde-3.5 header files (fixes bug #245219).
Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/celestia/ChangeLog6
-rw-r--r--sci-astronomy/celestia/Manifest5
-rw-r--r--sci-astronomy/celestia/celestia-1.5.1.ebuild6
-rw-r--r--sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch23
4 files changed, 36 insertions, 4 deletions
diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 2f72335f2ac9..6630c86e3166 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-astronomy/celestia
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.42 2008/10/12 11:24:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.43 2008/11/06 00:07:30 markusle Exp $
+
+ 05 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+ +files/celestia-1.5.1-kde-3.5.patch, celestia-1.5.1.ebuild:
+ Added patch to properly detect kde-3.5 header files (fixes bug #245219).
12 Oct 2008; Markus Dittrich <markusle@gentoo.org> celestia-1.5.1.ebuild:
Added slot dependency on kde-3.5 to make sure we don't pull in kde 4
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 955e479664ef..8dd9984f6606 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -11,6 +11,7 @@ AUX celestia-1.4.1-strictalias.patch 367 RMD160 b3f79ab12e78d742adb9e8e6f71d4df2
AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
AUX celestia-1.5.0-gcc43.patch 35614 RMD160 9682b9f8649e03b6d03235fc16861c6be542ab09 SHA1 01ef7da008d2f1748f6aa76b12f087e3dca442ce SHA256 273e57141e3056da5b4a322c6506ef98f6794f7b6963594d5c5840efc2f9b7d1
AUX celestia-1.5.1-arts.patch 1806 RMD160 af88ff314193c55d56223489f53d46125ea5073d SHA1 d98a9f4b9d7c376922f93243c39fab4cbb5a1ac7 SHA256 ff4bdca96577babaf90df1c965bb67f5cf32dbde527ba2644431e8c29ae87ce3
+AUX celestia-1.5.1-kde-3.5.patch 1018 RMD160 c39ded08b1fe0caf8eb4f1b2efe3366aeea61935 SHA1 564c5c91ca287382aff31c28a9e762f4e60bf28a SHA256 a4a7281747a9f493f3354f1f1b84f7159b49c1c89f6dd2bf669756c8e8e4ee8f
DIST celestia-1.4.1.tar.gz 23966886 RMD160 c66c2540e329613dace12e5b12b2dae2a4c679e0 SHA1 37863498c43d3078b41027706bfa033bccd949a9 SHA256 f9dc34dbc0d53e98534000545802b5ab4a471c3cb3fa08a9c958cbbbeb28d8b5
DIST celestia-1.5.0.tar.gz 29116952 RMD160 fe187c8964eac7832982a268a3a7b765807e8005 SHA1 cb761270f048193ab01159cab14082f25113cdaa SHA256 a07834ee5b1bb4be76c29086b0b7faec8c3baafa21bace8ccd765bae632473e0
DIST celestia-1.5.1-acinclude.patch.bz2 37015 RMD160 dd4e2d538bf633bee691b6ece0a9381e5643bb2a SHA1 b11454a7d1c8bc8c472337c8a0728cf711d98f3c SHA256 b4ccd6a5c24e0074c698bc7d000e6193d182c3908a130a7da2d727a63d1d28b9
@@ -18,6 +19,6 @@ DIST celestia-1.5.1-gcc43.patch.bz2 4673 RMD160 8aafd3ea0e93965398ff5493865e2632
DIST celestia-1.5.1.tar.gz 34144780 RMD160 26f105acfc26a5edccb73fe29c33638804b0f370 SHA1 2d6a117daf6a400ab4c47a5a51c13f2ab601e6db SHA256 5a028dec634c2fd1b2097eb6717f8e6ca5d05052b7f63f5fc205d0cbf254888c
EBUILD celestia-1.4.1-r2.ebuild 3961 RMD160 ddaebb358e6be735c88c5fd3284824f5a695403b SHA1 5ac13316c202b92a403c4382ebbf5fabd5e1ba6c SHA256 6dea08a53a09f70422a8e72310bcfa63dd1f84f77e721abfa902021c6a5c67be
EBUILD celestia-1.5.0.ebuild 3355 RMD160 ad92950230d7348aa778a727dbc36e3ae05c79c4 SHA1 11a5e3a6ef9f2024fff7a66fe5f34f0e86125cf0 SHA256 2dfa1c81c329b3a6083dca91a5b591fd6976c253f52a72b8c5a4ed5e16b2a6cd
-EBUILD celestia-1.5.1.ebuild 3610 RMD160 4b9cb4376f666723eed7861a9a7a1119a678ca49 SHA1 3a1b6c02fe0e5265665095dbd97102cc8a0c76c3 SHA256 b0302040ec8b7416e02dc57e99585d2242820de599c2dd82523a7a69c8ae448c
-MISC ChangeLog 12312 RMD160 ef68d6a517b8f401f2ffb4c069989de5f5f9901a SHA1 8566bfa9a337a367b35da321a0e98eec95d0f041 SHA256 d5e187cf26283d77b6016e8e90f85a685910088dc6941c6b58ee810630d4e52e
+EBUILD celestia-1.5.1.ebuild 3721 RMD160 2d8811ad6a73c957bdcfc3aba3a9e26a91b0b017 SHA1 08d3bbf066040e580f09817c86e649ec115f1bf3 SHA256 549d266843a085b9705e640b0fbf565eb485cd086a4a0292187661b1ed97b793
+MISC ChangeLog 12503 RMD160 703e6a01464f2e1a7213202c942b2889f75a9cca SHA1 1c11ede29c8d552a6e2671d854237c864b01cab8 SHA256 91549a25a887ea53fda6dcd52b677c34870e94b6fd487bb8ff9da1c17dd8cfa2
MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
diff --git a/sci-astronomy/celestia/celestia-1.5.1.ebuild b/sci-astronomy/celestia/celestia-1.5.1.ebuild
index d9d068c388b3..fd4a15e87fd7 100644
--- a/sci-astronomy/celestia/celestia-1.5.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.5.1.ebuild,v 1.2 2008/10/12 11:24:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.5.1.ebuild,v 1.3 2008/11/06 00:07:30 markusle Exp $
inherit eutils flag-o-matic gnome2 kde-functions autotools
@@ -84,6 +84,10 @@ src_unpack() {
# needed for kde GUI
epatch "${FILESDIR}"/${P}-arts.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.5.1-kde-3.5.patch b/sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch
new file mode 100644
index 000000000000..472e78e711d6
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.5.1-kde-3.5.patch
@@ -0,0 +1,23 @@
+diff -Naur celestia-1.5.1/acinclude.m4 celestia-1.5.1.new/acinclude.m4
+--- celestia-1.5.1/acinclude.m4 2008-04-23 17:18:48.000000000 -0400
++++ celestia-1.5.1.new/acinclude.m4 2008-11-05 08:52:30.000000000 -0500
+@@ -1629,8 +1629,8 @@
+ AC_MSG_CHECKING([for KDE])
+
+ if test "${prefix}" != NONE; then
+- kde_includes=${prefix}/include
+- ac_kde_includes=$prefix/include
++ kde_includes=${prefix}/kde/3.5/include
++ ac_kde_includes=$prefix/kde/3.5/include
+
+ if test "${exec_prefix}" != NONE; then
+ kde_libraries=${libdir}
+@@ -1662,7 +1662,7 @@
+
+ if test -z "$1"; then
+
+-kde_incdirs="/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)