Merge branch 'fpipe'

3 files changed, 77 insertions, 10 deletions

diff --git a/sci-astronomy/fpipe/Manifest b/sci-astronomy/fpipe/Manifest
index b95fe7c..526ac9e 100644
--- a/sci-astronomy/fpipe/Manifest
+++ b/sci-astronomy/fpipe/Manifest
@@ -1 +1,2 @@
-EBUILD fpipe-9999.ebuild 1849 RMD160 73de85030982ea4f14794533ffc7c7d27509f692 SHA1 5d7061eb1aadd1a5eecab7830fc69b4bb9a21a6c SHA256 0c3a00d8a785558448374630e3e84d455296da0201169b53fbdd3186e3f79eba
+AUX pipeline_driver-Remove-references-to-IPC-XPA.patch 1998 RMD160 95d82752537d8d82d11611d39d8df6aa0da5f738 SHA1 52324d209e131918e35296a2fc958a8f2f188284 SHA256 cebb143841aa3cb524fcd342d81f570bf936f4381e63b8943b434409a12ef43b
+EBUILD fpipe-9999.ebuild 2058 RMD160 8836bf08387a4daf9aaf7cd02cdea929457a29e9 SHA1 1fbcad320dde0dce6910dea5589330fdb23208d6 SHA256 bf841e36df6d85aa9e3542a6db84c4fab878d5af63a7a4c46fcee0940a6d181d
diff --git a/sci-astronomy/fpipe/files/pipeline_driver-Remove-references-to-IPC-XPA.patch b/sci-astronomy/fpipe/files/pipeline_driver-Remove-references-to-IPC-XPA.patch
new file mode 100644
index 0000000..421dce1
--- /dev/null
+++ b/sci-astronomy/fpipe/files/pipeline_driver-Remove-references-to-IPC-XPA.patch
@@ -0,0 +1,62 @@
+From 2d679c373df2834f411024a2a64f34d0dc05ffa2 Mon Sep 17 00:00:00 2001
+From: Henry Gebhardt <hsggebhardt@googlemail.com>
+Date: Thu, 11 Nov 2010 15:41:52 +0100
+Subject: [PATCH] pipeline_driver: Remove references to IPC::XPA
+
+The perl module is no longer used since the 'fpipeservercmd' branch was
+merged in commit e6c591eb1013415aaaa14c7505769a765cbd8b5c.
+---
+ software/README                             |    4 ----
+ software/pipeline_driver/perl/README        |    1 -
+ software/pipeline_driver/perl/lib/fpTask.pm |    1 -
+ 3 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/software/README b/software/README
+index 628ce17..390a28d 100644
+--- a/software/README
++++ b/software/README
+@@ -22,7 +22,6 @@ have used at some point in the development process.
+         with modules:
+ 	    IPC::Semaphore
+ 	    IPC::SysV
+-	    IPC::XPA
+ 	    List::Util
+ 	    POSIX ":sys_wait_h"
+ 	    Time::HiRes
+@@ -40,9 +39,6 @@ To install all needed perl modules, do the following:
+ 	    dev-perl/gtk2-perl
+ 	    dev-perl/XML-Simple
+ 	    virtual/perl-Time-HiRes
+-	    app-portage/g-cpan
+-	and run the following command:
+-	    $ g-cpan -i IPC::XPA
+ 
+       - You might need to install some modules with the cpan command. If
+ 	you are on an IAAT-Cluster computer, be sure to NOT use
+diff --git a/software/pipeline_driver/perl/README b/software/pipeline_driver/perl/README
+index a2214cb..992cc21 100644
+--- a/software/pipeline_driver/perl/README
++++ b/software/pipeline_driver/perl/README
+@@ -3,7 +3,6 @@ is:
+ 
+ IPC::Semaphore
+ IPC::SysV
+-IPC::XPA
+ List::Util
+ POSIX ":sys_wait_h"
+ Time::HiRes
+diff --git a/software/pipeline_driver/perl/lib/fpTask.pm b/software/pipeline_driver/perl/lib/fpTask.pm
+index 6d9b27c..2683829 100755
+--- a/software/pipeline_driver/perl/lib/fpTask.pm
++++ b/software/pipeline_driver/perl/lib/fpTask.pm
+@@ -10,7 +10,6 @@ use POSIX ":sys_wait_h";
+ use Time::HiRes qw(usleep);
+ use List::Util qw(max);
+ use XML::Simple;
+-use IPC::XPA;
+ 
+ use Cwd 'realpath';
+ use Switch;
+-- 
+1.7.8.rc1
+
diff --git a/sci-astronomy/fpipe/fpipe-9999.ebuild b/sci-astronomy/fpipe/fpipe-9999.ebuild
index d5fbf0d..2c28fcd 100644
--- a/sci-astronomy/fpipe/fpipe-9999.ebuild
+++ b/sci-astronomy/fpipe/fpipe-9999.ebuild
@@ -12,8 +12,10 @@ EGIT_REPO_URI="git://git.tokkee.org/fpipe.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="debug"
+IUSE="debug +doc"
 
+# sci-astronomy/ftools is only needed because of the ape library, cfitsio and
+# xpa can be installed separately, an ebuild even exists for those.
 DEPEND=">=x11-libs/gtk+-2.14
 		media-gfx/gtkimageview
 		dev-lang/perl
@@ -21,9 +23,8 @@ DEPEND=">=x11-libs/gtk+-2.14
 		dev-perl/XML-Simple
 		dev-perl/XML-SAX-Expat
 		virtual/perl-Time-HiRes
-		perl-gcpan/IPC-XPA
 		virtual/libusb:1
-		virtual/latex-base
+		doc? ( virtual/latex-base )
 		>=sci-astronomy/ftools-6.10"
 
 pkg_setup() {
@@ -32,6 +33,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/pipeline_driver-Remove-references-to-IPC-XPA.patch
 	cd software
 	./bootstrap.sh || die "bootstrap failed"
 }
@@ -45,8 +47,6 @@ src_configure() {
 
 	cd software
 	econf $(use_enable debug debug 1) \
-			--disable-fpcmsimulator \
-			--enable-fpimage \
 			--enable-fpixoacm2fits \
 			--enable-fpixosvm2fits \
 			--enable-fptemplate \
@@ -57,8 +57,10 @@ src_compile() {
 	cd software
 	emake || die "emake failed"
 
-	cd "${S}"/documents
-	emake || die "emake failed for documents"
+	if use doc; then
+		cd "${S}"/documents
+		emake || die "emake failed for documents"
+	fi
 }
 
 src_install() {
@@ -69,8 +71,10 @@ src_install() {
 	insinto /usr/share/"${PN}"/pipelinedef
 	doins *
 
-	cd "${S}"/documents
-	dodoc *.pdf *.odf
+	if use doc; then
+		cd "${S}"/documents
+		dodoc *.pdf *.odf
+	fi
 }
 
 pkg_postinst() {