Version bump. Much cleaning and install a bit more doc

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 246 insertions, 11 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index 97e5f530f86b..da4edf999b44 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/xephem
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.31 2008/08/09 02:28:40 markusle Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.32 2009/07/26 15:33:25 bicatali Exp $
+
+*xephem-3.7.4 (26 Jul 2009)
+
+  26 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/xephem-3.7.3-use-system-lib.patch, +xephem-3.7.4.ebuild,
+  +files/xephem-3.7.4-libs-flags.patch, metadata.xml:
+  Version bump. Much cleaning and install a bit more doc
 
   09 Aug 2008; Markus Dittrich <markusle@gentoo.org> xephem-3.7.3.ebuild:
   Removed installation of example INDI code. This resolves the file
diff --git a/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch b/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
index 662170a8f4fc..9eec93ecb291 100644
--- a/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
+++ b/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
@@ -1,6 +1,5 @@
-diff -Naur xephem-3.7.3/GUI/xephem/Makefile xephem-3.7.3.new/GUI/xephem/Makefile
---- xephem-3.7.3/GUI/xephem/Makefile	2006-05-13 19:06:06.000000000 -0400
-+++ xephem-3.7.3.new/GUI/xephem/Makefile	2008-06-30 06:38:50.000000000 -0400
+--- GUI/xephem/Makefile.orig	2006-05-13 19:06:06.000000000 -0400
++++ GUI/xephem/Makefile	2008-06-30 06:38:50.000000000 -0400
 @@ -10,9 +10,9 @@
  # back here and compile and link all the *.c files into one executable, xephem.
  
diff --git a/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch b/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch
new file mode 100644
index 000000000000..500ea12f223a
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.4-libs-flags.patch
@@ -0,0 +1,160 @@
+diff -Nur xephem-3.7.4.orig/GUI/xephem/Makefile xephem-3.7.4/GUI/xephem/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/Makefile	2009-01-05 20:55:59.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/Makefile	2009-07-26 15:26:42.000000000 +0100
+@@ -10,8 +10,8 @@
+ # one executable, xephem.
+ 
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+@@ -32,12 +32,9 @@
+ 
+ # for linux and Apple OS X
+ # some systems now use just /usr/X11 (not /usr/X11R6)
+-CC = gcc
+-CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
++CFLAGS := $(LIBINC) $(CFLAGS)
+ 
+ # for ppc Apple OS X to make universal (i386 and ppc binary), requires
+ # Xcode 2.2, /Developers/SDK/MacOSX10.4u.sdk and all libs, including libXm,
+@@ -187,12 +184,9 @@
+ 	nroff -man $? > $@
+ 
+ libs:
+-	cd ../../libastro; make
+-	cd ../../libip; make
+-	cd ../../libjpegd; make
+-	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
++	cd ../../libastro; $(MAKE)
++	cd ../../libip; $(MAKE)
++	cd ../../liblilxml; $(MAKE)
+ 
+ clean:
+ 	rm -fr *.o ../../lib*/*.[ao]
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/lx200xed/Makefile xephem-3.7.4/GUI/xephem/tools/lx200xed/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/lx200xed/Makefile	2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/lx200xed/Makefile	2009-07-26 15:15:06.000000000 +0100
+@@ -1,10 +1,6 @@
+ LIBASTRO = ../../../../libastro
+-CLDFLAGS =
+-CFLAGS = -Wall -O2 $(CLDFLAGS) -I$(LIBASTRO)
+-LDFLAGS = $(CLDFLAGS) -L$(LIBASTRO)
+-CC = gcc
+-
+-LIBS = -lastro -lm
++CFLAGS := -I$(LIBASTRO) $(CFLAGS)
++LIBS = -L$(LIBASTRO) -lastro -lm
+ 
+ OBJS = 			\
+ 	liblx200.o	\
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/xedb/Makefile xephem-3.7.4/GUI/xephem/tools/xedb/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/xedb/Makefile	2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/xedb/Makefile	2009-07-26 15:13:30.000000000 +0100
+@@ -2,11 +2,8 @@
+ # assumes gcc, adjust to suit.
+ 
+ ASLIBDIR = ../../../../libastro
+-CLDFLAGS =
+-GCCFLAGS = -O2 -ffast-math -Wall
+-CFLAGS = $(CLDFLAGS) $(GCCFLAGS) -I$(ASLIBDIR)
+-LDFLAGS = $(CLDFLAGS) -L$(ASLIBDIR)
+-LIBS = -lastro -lm
++CFLAGS := -I$(ASLIBDIR) $(CFLAGS) 
++LIBS =  -L$(ASLIBDIR) -lastro -lm
+ 
+ OBJS =	xedb.o	\
+ 	print.o
+diff -Nur xephem-3.7.4.orig/GUI/xephem/tools/xephemdbd/Makefile xephem-3.7.4/GUI/xephem/tools/xephemdbd/Makefile
+--- xephem-3.7.4.orig/GUI/xephem/tools/xephemdbd/Makefile	2005-03-20 11:04:51.000000000 +0000
++++ xephem-3.7.4/GUI/xephem/tools/xephemdbd/Makefile	2009-07-26 15:16:13.000000000 +0100
+@@ -2,16 +2,12 @@
+ # run this after successfully making XEphem and its libs.
+ # Only tested on Linux.
+ 
+-CC = gcc
+-
+ XED = ../..
+ LAS = $(XED)/../../libastro
+ IPH = $(XED)/../../libip
+ 
+-CLDFLAGS =-g
+-CFLAGS = $(CLDFLAGS) -Wall -ffast-math -I$(XED) -I$(LAS) -I$(IPH)
+-LDFLAGS = $(CLDFLAGS) -L$(LAS)
+-LIBS = -lastro -lm
++CFLAGS := -I$(XED) -I$(LAS) -I$(IPH) $(CFLAGS)
++LIBS =  -L$(LAS) -lastro -lm
+ 
+ OBJS =	xephemdbd.o 		\
+ 	db.o			\
+diff -Nur xephem-3.7.4.orig/libastro/Makefile xephem-3.7.4/libastro/Makefile
+--- xephem-3.7.4.orig/libastro/Makefile	2006-02-24 03:37:31.000000000 +0000
++++ xephem-3.7.4/libastro/Makefile	2009-07-26 15:22:43.000000000 +0100
+@@ -3,10 +3,6 @@
+ 
+ # compiler and flags
+ 
+-# gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+-
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+ 
+@@ -87,7 +83,7 @@
+ 	ranlib $@
+ 
+ libastro.so: $(HS) $(OBJS)
+-	$(CC) -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libastro.a
+diff -Nur xephem-3.7.4.orig/libip/Makefile xephem-3.7.4/libip/Makefile
+--- xephem-3.7.4.orig/libip/Makefile	2009-01-05 20:53:46.000000000 +0000
++++ xephem-3.7.4/libip/Makefile	2009-07-26 15:20:43.000000000 +0100
+@@ -2,8 +2,7 @@
+ # (C) 2001 Elwood Charles Downey
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
++CFLAGS := -I../libastro $(CFLAGS)
+ 
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -40,7 +39,7 @@
+ 	ranlib $@
+ 
+ libip.so:    $(OBJS)
+-	gcc -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libip.a
+diff -Nur xephem-3.7.4.orig/liblilxml/Makefile xephem-3.7.4/liblilxml/Makefile
+--- xephem-3.7.4.orig/liblilxml/Makefile	2006-02-24 03:37:32.000000000 +0000
++++ xephem-3.7.4/liblilxml/Makefile	2009-07-26 15:22:04.000000000 +0100
+@@ -3,9 +3,6 @@
+ 
+ # compiler and flags
+ 
+-# gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
index 3e5ddba5b8b1..0b03d335920d 100644
--- a/sci-astronomy/xephem/metadata.xml
+++ b/sci-astronomy/xephem/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-Xephem is an interactive astronomical ephemeris program for X Windows
-systems. It computes heliocentric, geocentric and topocentric
-information for fixed celestial objects and objects in heliocentric
-and geocentric orbits; has built-in support for all planet positions;
-the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
-meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
+  Xephem is an interactive astronomical ephemeris program for X Windows
+  systems. It computes heliocentric, geocentric and topocentric
+  information for fixed celestial objects and objects in heliocentric
+  and geocentric orbits; has built-in support for all planet positions;
+  the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
+  meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-astronomy/xephem/xephem-3.7.4.ebuild b/sci-astronomy/xephem/xephem-3.7.4.ebuild
new file mode 100644
index 000000000000..c6b5523d38c7
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.4.ebuild,v 1.1 2009/07/26 15:33:25 bicatali Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
+HOMEPAGE="http://www.clearskyinstitute.com/xephem"
+SRC_URI="http://97.74.56.125/free/${P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+SLOT=0
+LICENSE="as-is"
+DEPEND="x11-libs/openmotif
+	media-libs/jpeg
+	media-libs/libpng"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# make sure we use system libs and respect user flags
+	epatch "${FILESDIR}"/${P}-libs-flags.patch
+}
+
+src_compile() {
+	cd GUI/xephem
+	emake || die "emake failed"
+	for i in tools/{lx200xed,xedb,xephemdbd}; do
+		emake -C ${i} || die "emake ${i} failed"
+	done
+}
+
+src_install() {
+	into "/usr"
+	cd "${S}"/GUI/xephem
+	dobin xephem  || die "dobin xephem failed"
+	doman xephem.1 || die
+	newicon XEphem.png ${PN}.png
+	insinto /usr/share/${PN}
+	for i in auxil catalogs fifos fits gallery lo; do
+		doins -r ${i} || die
+	done
+	insinto /usr/share/doc/${PF}/html
+	doins -r help/* || die
+	cd tools
+	for file in lx200xed/lx200xed xedb/xedb xephemdbd/xephemdbd; do
+		dobin ${file} || die "dobin ${file} failed"
+	done
+	for file in {xedb,lx200xed}/README; do
+		newdoc ${file} README.$(dirname ${file}) || die "newdoc ${file} failed"
+	done
+	cd xephemdbd
+	insinto /usr/share/doc/${PF}/xephemdbd
+	doins README cgi-lib.pl start-xephemdbd.pl xephemdbd.html xephemdbd.pl || die
+
+	cd "${S}"
+	echo > XEphem "XEphem.ShareDir: /usr/share/${PN}"
+	insinto /usr/share/X11/app-defaults
+	has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
+	doins XEphem || die
+	echo > 99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
+	doenvd 99xephem || die
+	dodoc Copyright README
+	make_desktop_entry xephem XEphem ${PN}
+}
+
+pkg_postinst() {
+	elog "See /usr/share/doc/${PF}/xephemdbd/README to set up a web interface"
+}