Backport patch from upstream to fix build with USE="-fits indi".

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 155 insertions, 17 deletions

diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 78916fe2e722..7ae4e5da2fe6 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.258 2013/03/06 13:41:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.259 2013/03/15 13:53:34 kensington Exp $
+
+  15 Mar 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kstars-4.10.1-build.patch, kstars-4.10.1.ebuild:
+  Backport patch from upstream to fix build with USE="-fits indi".
 
 *kstars-4.10.1 (06 Mar 2013)
 
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index d112aafd122e..764d42e6dd6b 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kstars-4.10.1-build.patch 3669 SHA256 cbeec42b9f4801684280e5b743b34d454d542d43b612cb1f267ace72a5339f08 SHA512 a53951a814c49082db1ce4724fc32228fd1a2fa5eb7209d4182d383355a8db45ba9e43bc4bc165b98b5b1f8bcd9cbe69ec32b41c43c12ef36291fba3d6fe160c WHIRLPOOL 3c5894842ce3e0261e6e592c581753308b54b508c003e3ded5eaa45ecbfc9ba9edcd793cb7808e8c515e5f6c01ecfe1bab78f9cb0a28f43780ee829cc8356241
 DIST kstars-4.10.0.tar.xz 12398936 SHA256 69eb313258f2913fb0692a9679ba2783d8c002afb88ec347207aca2aad4452d8 SHA512 a45de13160de649a1c3c4a831e3036942d4a75dac1d5a884eeab03890d8182b69a98ee14b08b2834d3c06872e255c4f259040f93704b4a8797789414c8ae86f5 WHIRLPOOL 8d7fbc9b9f0286b5ae508e7ad3cab2b040db2ad43ffc0cdd76d3eb8fdfa39ebdd1f643796d01dfea97a4c9ec7f55be7cd75edcac4f4fc7fa3dd15df9f60c0132
 DIST kstars-4.10.1.tar.xz 12463236 SHA256 68c8cb35280504b67327a3b5b5b4a91ba06db6231ef326afb57fbf7ffd1e43e3 SHA512 50d057487de344f4d0a94c776f18e05106b19519314aaf3794c6af6883a0791709408e8ed2a6583e8f53553bea3809ab16c99d51717ac3df97355dc2f61f8f9c WHIRLPOOL 877dc34d7a3b65a6ce7c1e8beee45ffcae0569e1331b8cdec46adf43fb9ccda27401a415eb51b97b325dd922a54c1ea7b803c688f0955b3a282dc7eb7dc38e38
 DIST kstars-4.9.5.tar.xz 12264044 SHA256 d3bb981bcbaffee81e42fbdca694d14c48dd26aab5942cef206b293a18aabf6e SHA512 73720e14b8a190af72eb01621e09d8fb1c6844dab7bd1e28b3be3e7bb17a3c18bf733872e70bd5925268fc698dcb71e0cbad57ceceb2a462cc0d813fcf268c67 WHIRLPOOL 64bc1b1c082773b4335e2142ff73d04c8bbf0298cc351ebdf965a683ee74a52fa06b11e7c07ae4aaeaf048edf2df10ce33aa21a8173ca67d6f19d6f10d53718a
 EBUILD kstars-4.10.0.ebuild 747 SHA256 3a597215dea671e5ce0914e8cac655a2c30eb516c821ed1183676be033329486 SHA512 826b1388770d0795be44e839862723674767c5fd3a23c84a83a8abe2ced2f41b67d61d3518879e83a8190ba3e1304897544f6eb75a860165f42d553e6e0d6df5 WHIRLPOOL 91d509ba62138ae7b245541cc30ca5e4d8de9e6af7423a3e0eac8043383836a2d597b2965cfa740e6fadc8a3e566f352cc67d001593bd7aa01c680a05c59ea53
-EBUILD kstars-4.10.1.ebuild 753 SHA256 c7ed490f77362cc5fc9eb0c55eed122cce48e9cced03ce4c2e5660bf15b9749c SHA512 62dddc75978d3e7b91c784f8db60ce7b68677e4cfc4b1336980144aa0b94f13f7e8b02b88fc46c9592f2c555bc941adee80354262a9d88f40350d9e242c4b8a9 WHIRLPOOL fec4bb0128cf7248f2aa7d5f38fc83b16f3bdcb48299e3cf7db15e071d2bf0b1fe269acac4dfdff85150eecc47468c34f5122d9c43f0077998573f574bbb4d2b
+EBUILD kstars-4.10.1.ebuild 798 SHA256 6bebb9bbfba8fdbf742692202d19cf8adfb5149ce55d9c63c701ea8b3a61d637 SHA512 76474f7beab5c625b250a17606f1bf76468044b3269eac02a3560efc7821aa0beef94567c37f374507504316f7f6f71c841adf9986f9b1897c02ec2bc0eeed9a WHIRLPOOL b46bb85f9b209a6fcf8a240c8411a879a3912018a0c88626724d70bb8857cbd7b9853c359cc062df8e1f328d7151309f93f84872eacca431099606dc15423c33
 EBUILD kstars-4.9.5.ebuild 743 SHA256 a880a95ccb9cbb536a3e3faafc12b59a4561e286bba5b57687defc951620ea42 SHA512 3af58fbbc5657f99d05d9531a96bbdb365bd908e7734c1682037fa6a8101afedbe066de1409d22835b9c69218af8e72099195607bbd9d1dd06394092b6ffa86b WHIRLPOOL 52b087c5cc09d8ce4b9c463fcf0bebcebce110edde8e86d98b3e2b8fc0dc23acb504177c27a9e7a5532f16047562745e8b88b77ff7db1464849bf56faecf6bc8
-MISC ChangeLog 30373 SHA256 297360035573fe93f84cbbd63a3d462d0ad7adaf2bcbfe7e0e6498dcfb2efb22 SHA512 54075b116af9bb730e71d35178fb09617f7caac1dd85c93e7bbd124768f2dacead336558778ff0bf879d57c2f33f56a9173e6c51c42974796eaf831ba114fc22 WHIRLPOOL 8712ce31c59b8721a73549aa3a476780906c41d571730c354357c0779afe55f131bd50ef575c051614cb1618df8c85920a0f1b99e5a5ee4b556f3625f70241f8
+MISC ChangeLog 30556 SHA256 a0db3929d86e083fe354c8ed7304ce3cfb337e4ff1f7842945a0c03a5fba0cf5 SHA512 4e69530cc99238aa3bf3ddcb2b4bad3122860d97ce7ad917b9c698fa00f60b49280f06375a5cfb27a8f451f0b84308ff1805b0b2b9d83d73f05547d50e2ed933 WHIRLPOOL 97e40680905a0a22af1916514482ea457d4bb51639070720f1b636ed91562813840f99d96dc92b281c8cb88edf067522ecd84ffb8102b07ad1cd55493f092abb
 MISC metadata.xml 340 SHA256 689195a7a93cf44147d58061940bc74b4b0a4c1b44529e70d7010cc6d1ed6e7a SHA512 a2371776990f7c60629fd24e4a72f4f3d00dd0c6a4e7bb283e506ca4aa4dcef81861fb740ae61e6964e0bece9a2c694c8edf69bbf85ed14ec98498c80fb48204 WHIRLPOOL 02eac595120392ae604b0e5a63cdf31ab7612ef1be06f8bb867bb4678f6acd1c7908c20c09694e06fee4f2553abb53ceb47b363529ee8388f9b65633a88835c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRN0iXAAoJEEb+UGWnxTyHyoIP/RimM1a/AULfG7PqfrJiZrlL
-OfzWdDJ558eL2X25rhsxzPIilZXb1F8UTYlZwqPt4pCxb5D7RDyQgJmTSzdd7gtV
-rGkxTHoesju/MSRBhTfUcQGd+ciUCrWIEDCD82N2NXIoqtsfjlaeWuegA3TGvDuB
-euvW+1YFTiwYz2l56l0+56vvQHz3xtV4ysoU7CQ7tljBxpq925eylfVlCa1R3UzI
-MJS6Gp11huyCzAbeNaoFFkOBmpzB4l72vV/SbWGsf7D8tuvVnhjrpydvIIR/Cm5r
-CNiTJVXPUi8tDKnI1wie4RfizGzphyXaxrCYfd5dYkVwQbOdsjTAClR8JelV2Flk
-DRQBocyMLF2OA/jR4xHU54fGAWoXxoHcBxeLYsS0p8Qwf6Ve9V8TC+ff4fIEWjMN
-BaxwSHbxrcuUaPQ3MVvGNhuMI3hzAj1wVMmZM4mxlK+hoDJMzx4uUHh1TXnr9JN9
-Y+HfKgzRNRjMprMq55jzkObii4fg4vFGK6ZitnNT2bHwGOMVXlKjdPAc0NvnKCIK
-3w6u2YKLP4xLFENkSQaQ/UzrklVTac0qvdfqMgSEWulRPDtzqajKXiF9TtD/Zh5u
-y1QqT1iRnrZhMChJGYUBB2amwJn3xBV9W7Jo7tlh8JR3prNjqQ98IWx49c1S+XZc
-iBMWWjN0ldPYhwVWIXAX
-=O9oI
+iQEcBAEBCAAGBQJRQyfKAAoJEMbwO6tnXQ0sZD4IANN5V+Nc5hfsSnAg5XF+XMTy
+e7RhB9BesBRhmECNrDpfUzKdsyDb+6QdBHJm6oofymevAeXRx8eNdLVDnrjYEBct
+AaBjXjkfsfEfVijMp1bOhakabla4zTWetlaf6C0owCUKdsyH4S3xmYygsu2PSTDw
+HHY2KEnF0cxcmzWFmNignNgq1ThiYuIAWc2LWJRJHehYN/kpEMbPQAIdE3Q/uGY2
+UTSypzCDm7X6zokwurIHWNfcg4E3vLJ+KWbH/wHmCU9wDd62k66gVCCJ5kPA9VQd
+AbdN2ADRCptde2QyyD4TeNRRVy5Dks5f4xVywbhpmsFlaohmTPFdpO1z32Atf0o=
+=LHlk
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kstars/files/kstars-4.10.1-build.patch b/kde-base/kstars/files/kstars-4.10.1-build.patch
new file mode 100644
index 000000000000..b44db2528eaf
--- /dev/null
+++ b/kde-base/kstars/files/kstars-4.10.1-build.patch
@@ -0,0 +1,137 @@
+From d9dfd9a2b3e337cf92a89e944ca14f2cf8a328d7 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 16 Mar 2013 00:37:27 +1100
+Subject: [PATCH] Fix building issues with cfitsio disabled.
+
+BUG: 316464
+REVIEW: 109477
+---
+ kstars/CMakeLists.txt    | 6 ++++--
+ kstars/indi/indiccd.cpp  | 9 +++++++++
+ kstars/kstarsactions.cpp | 8 +++++---
+ 3 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
+index 52d35f2..2d00264 100644
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -53,6 +53,7 @@ if (INDI_FOUND)
+     indi/telescopewizard.ui
+     )
+ 
++if (CFITSIO_FOUND)
+    set(ekosui_SRCS
+       ekos/opsekos.ui
+       ekos/ekosmanager.ui
+@@ -78,7 +79,8 @@ if (INDI_FOUND)
+       ekos/guide/scroll_graph.cpp
+       ekos/guide/vect.cpp
+    )
+-  
++endif(CFITSIO_FOUND)
++
+   include_directories(${INDI_INCLUDE_DIR})
+ endif(INDI_FOUND)
+ 
+@@ -443,7 +445,7 @@ kde4_add_kcfg_files(kstars_SRCS ${kstars_KCFG_SRCS})
+ #kde4_add_dcop_skels(kstars_SRCS kstarsinterface.h simclockinterface.h )
+ 
+ kde4_add_ui_files(kstars_SRCS
+-       ${indiui_SRCS} ${ekosui_SRCS} ${fitsui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS}
++       ${indiui_SRCS} ${ui_SRCS} ${fitsui_SRCS} ${ekosui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS}
+        ${printingui_SRCS}
+          thumbnailpicker.ui thumbnaileditor.ui oal/observeradd.ui oal/equipmentwriter.ui oal/execute.ui  skycomponents/notifyupdatesui.ui
+ )
+diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp
+index 67311af..a578a1a 100644
+--- a/kstars/indi/indiccd.cpp
++++ b/kstars/indi/indiccd.cpp
+@@ -7,6 +7,8 @@
+     version 2 of the License, or (at your option) any later version.
+  */
+ 
++#include <config-kstars.h>
++
+ #include <string.h>
+ 
+ #include <KMessageBox>
+@@ -15,8 +17,11 @@
+ 
+ #include <basedevice.h>
+ 
++#ifdef HAVE_CFITSIO_H
+ #include "fitsviewer/fitsviewer.h"
+ #include "fitsviewer/fitscommon.h"
++#endif
++
+ #include "clientmanager.h"
+ #include "streamwg.h"
+ #include "indiccd.h"
+@@ -477,7 +482,9 @@ CCD::CCD(GDInterface *iPtr) : DeviceDecorator(iPtr)
+ 
+ CCD::~CCD()
+ {
++#ifdef HAVE_CFITSIO_H
+     delete (fv);
++#endif
+     delete (streamWindow);
+     delete (primaryChip);
+     delete (guideChip);
+@@ -755,6 +762,7 @@ void CCD::processBLOB(IBLOB* bp)
+ 
+ void CCD::addFITSKeywords(QString filename)
+ {
++#ifdef HAVE_CFITSIO_H
+     int status=0;
+ 
+     if (filter.isEmpty() == false)
+@@ -780,6 +788,7 @@ void CCD::addFITSKeywords(QString filename)
+ 
+         filter = "";
+     }
++#endif
+ }
+ 
+ void CCD::FITSViewerDestroyed()
+diff --git a/kstars/kstarsactions.cpp b/kstars/kstarsactions.cpp
+index 0d7eb37..1e76bc4 100644
+--- a/kstars/kstarsactions.cpp
++++ b/kstars/kstarsactions.cpp
+@@ -86,10 +86,8 @@
+ #include <config-kstars.h>
+ 
+ #ifdef HAVE_INDI_H
+-#include "ekos/ekosmanager.h"
+ #include "indi/telescopewizardprocess.h"
+ #include "indi/opsindi.h"
+-#include "ekos/opsekos.h"
+ #include "indi/drivermanager.h"
+ #include "indi/guimanager.h"
+ #endif
+@@ -104,7 +102,8 @@
+ #ifdef HAVE_CFITSIO_H
+ #include "fitsviewer/fitsviewer.h"
+ #ifdef HAVE_INDI_H
+-//#include "ekos/ekos.h"
++#include "ekos/ekosmanager.h"
++#include "ekos/opsekos.h"
+ #endif
+ #endif
+ 
+@@ -444,10 +443,13 @@ void KStars::slotViewOps() {
+     opsindi = new OpsINDI (this);
+     dialog->addPage(opsindi, i18n("INDI"), "kstars");
+ 
++    #ifdef HAVE_CFITSIO_H
+     opsekos = new OpsEkos(this);
+     dialog->addPage(opsekos, i18n("Ekos"), "kstars");
+     #endif
+ 
++    #endif
++
+ #ifdef HAVE_XPLANET
+     opsxplanet = new OpsXplanet( this );
+     dialog->addPage(opsxplanet, i18n("Xplanet"), "kstars_xplanet");
+-- 
+1.8.1.5
+
diff --git a/kde-base/kstars/kstars-4.10.1.ebuild b/kde-base/kstars/kstars-4.10.1.ebuild
index b8a5e216a553..88b0e465962f 100644
--- a/kde-base/kstars/kstars-4.10.1.ebuild
+++ b/kde-base/kstars/kstars-4.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.10.1.ebuild,v 1.1 2013/03/06 13:41:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.10.1.ebuild,v 1.2 2013/03/15 13:53:34 kensington Exp $
 
 EAPI=5
 
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
 src_configure() {
 	# Bug 308903
 	use ppc64 && append-flags -mminimal-toc