Version bump, drop old. Use subslot dependency on libpng

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 895192F9)

8 files changed, 208 insertions, 158 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index bf8059d0a502..9e706a5f39e1 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-astronomy/xephem
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.44 2012/10/24 19:25:50 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.45 2013/04/07 17:18:11 xarthisius Exp $
+
+*xephem-3.7.6 (07 Apr 2013)
+
+  07 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/xephem-3.7.6-implicits.patch,
+  +files/xephem-3.7.6-respect_env_vars.patch, +xephem-3.7.6.ebuild,
+  -files/3.7.2.patch, -files/xephem-3.7.3-use-system-lib.patch,
+  -xephem-3.7.3.ebuild, xephem-3.7.5.ebuild:
+  Version bump, drop old. Use subslot dependency on libpng
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xephem-3.7.3.ebuild,
   xephem-3.7.5.ebuild:
diff --git a/sci-astronomy/xephem/files/3.7.2.patch b/sci-astronomy/xephem/files/3.7.2.patch
deleted file mode 100644
index 968d5c7df36a..000000000000
--- a/sci-astronomy/xephem/files/3.7.2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- GUI/xephem/tools/xephemdbd/request.c	2006-11-29 14:43:38.000000000 +0100
-+++ GUI/xephem/tools/xephemdbd/request.c.fixed	2006-04-10 11:01:17.000000000 +0200
-@@ -155,7 +155,7 @@
- {
- 	char str1[32], str2[32];
- 
--	fs_date (str1, mjd_day(mjd));
-+	fs_date (str1, pref_get(PREF_DATE_FORMAT), mjd_day(mjd));
- 	fs_sexa (str2, mjd_hr(mjd), 2, 3600);
- 	printf ("UTC Time:  %s  %s  JD %13.5f\n", str1, str2, mjd+MJD0);
- 
---- GUI/xephem/Makefile	2006-11-29 16:08:02.000000000 +0100
-+++ GUI.new/xephem/Makefile	2006-11-29 16:08:56.000000000 +0100
-@@ -15,7 +15,7 @@
- LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
- 
- # MOTIFI is the directory containing the Xm directory of include files.
--# MOTIFL is the directory containing the libXm.a library.
-+# MOTIFL is the directory containing libXm
- # MOTIF can be used to set one common directory if desired.
- # Defaults work ok for Linux and Mac OS X.
- ifdef MOTIF
-@@ -34,7 +34,7 @@
- CLDFLAGS = -g
- CFLAGS=  $(LIBINC)     -Wall -I$(MOTIFI) -I/usr/X11R6/include -march=athlon-xp -O2 -pipe
- LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
--XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
-+XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
- 
- # for ppc Apple OS X to make universal (i386 and ppc binary), requires
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
deleted file mode 100644
index 9eec93ecb291..000000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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.
- 
- # -I and -L flags to find required 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
--LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
-+LIBINC = -I../../libastro -I../../libip -I../../liblilxml 
-+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
-+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
- 
- # MOTIFI is the directory containing the Xm directory of include files.
- # MOTIFL is the directory containing the libXm.a library.
-@@ -34,7 +34,7 @@
- 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
-+XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
- 
- # for ppc Apple OS X to make universal (i386 and ppc binary), requires
-@@ -187,10 +187,7 @@
- libs:
- 	cd ../../libastro; make
- 	cd ../../libip; make
--	cd ../../libjpegd; make
- 	cd ../../liblilxml; make
--	cd ../../libpng; make
--	cd ../../libz; make
- 
- clean:
- 	touch x.o
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch b/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
new file mode 100644
index 000000000000..4c340711e0e8
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.6-implicits.patch
@@ -0,0 +1,12 @@
+sunmenu.c:920:3: warning: implicit declaration of function ‘strptime’
+
+--- a/GUI/xephem/sunmenu.c
++++ b/GUI/xephem/sunmenu.c
+@@ -1,6 +1,7 @@
+ /* code to manage the sun display 
+  */
+ 
++#define _XOPEN_SOURCE /* See feature_test_macros(7) */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
new file mode 100644
index 000000000000..4fc48a763c5e
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.6-respect_env_vars.patch
@@ -0,0 +1,129 @@
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+index b4c26f2..ab4f256 100644
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -10,9 +10,9 @@
+ # 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
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -32,12 +32,9 @@ endif
+ 
+ # 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
++CFLAGS := $(LIBINC) $(CFLAGS)
+ XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+-LIBS = $(XLIBS) $(LIBLIB) -lm
++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
+ 
+ # 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 @@ xephem.1: xephem.man
+ 	nroff -man $? > $@
+ 
+ libs:
+-	cd ../../libastro; make
+-	cd ../../libip; make
+-	cd ../../libjpegd; make
+-	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
++	$(MAKE) -C ../../libastro
++	$(MAKE) -C ../../libip
++	$(MAKE) -C ../../liblilxml
+ 
+ clean:
+ 	rm -fr *.o ../../lib*/*.[ao]
+diff --git a/libastro/Makefile b/libastro/Makefile
+index b1ab0bf..62c5412 100644
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -83,11 +81,11 @@ OBJS =			\
+ 	vsop87_data.o
+ 
+ libastro.a: $(HS) $(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libastro.so: $(HS) $(OBJS)
+-	$(CC) -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libastro.a
+diff --git a/libip/Makefile b/libip/Makefile
+index 35cb9c6..cba71e1 100644
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -2,8 +2,7 @@
+ # (C) 2001 Elwood Charles Downey
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -I../libastro -O2 -Wall
++CFLAGS += -I../libastro
+ 
+ # macosx universal binary
+ # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
+@@ -36,11 +35,11 @@ OBJS =	\
+ HS = ip.h fsmatch.h
+ 
+ libip.a: $(HS)	$(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libip.so:    $(OBJS)
+-	gcc -shared -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libip.a
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile
+index 9ab98cb..85e7889 100644
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -4,8 +4,6 @@
+ # compiler and flags
+ 
+ # gcc
+-CC = gcc
+-CFLAGS= -O2 -Wall
+ 
+ # macosx universal binary
+ # CFLAGS= -O2 -Wall -arch i386 -arch ppc
+@@ -27,8 +25,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+ 
+ liblilxml.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ liltest: liltest.o liblilxml.a
+ 	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-3.7.3.ebuild b/sci-astronomy/xephem/xephem-3.7.3.ebuild
deleted file mode 100644
index c9123d8c7415..000000000000
--- a/sci-astronomy/xephem/xephem-3.7.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.14 2012/10/24 19:25:50 ulm Exp $
-
-EAPI=1
-
-inherit eutils multilib
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-SRC_URI="http://www.clearskyinstitute.com/xephem/${P}.tar.gz"
-HOMEPAGE="http://www.clearskyinstitute.com/xephem"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-SLOT="0"
-LICENSE="XEphem"
-DEPEND=">=x11-libs/motif-2.3:0
-	virtual/jpeg
-	media-libs/libpng"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make sure we use system libs not the ones that
-	# ship with the xephem tarball
-	rm -fr libjpegd/ libpng/ libz/ libXm/ GUI/xephem/tools/indi \
-		|| die "Failed to remove unneeded libs and tools"
-	epatch "${FILESDIR}"/${P}-use-system-lib.patch
-
-	for i in libastro/Makefile libip/Makefile liblilxml/Makefile \
-		GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do
-		einfo "Fixing CFLAGS in ${i}"
-		sed -e "s~^CFLAGS[ ]*=\(.*\)-O2\(.*\)~CFLAGS= \1 \2 ${CFLAGS}~" \
-			-i ${i} \
-			|| die "sed failed"
-	done
-	sed -e 's~^CFLAGS[ ]*=\(.*\)$(CLDFLAGS)\(.*\)~CFLAGS=\1 \2~' \
-		-i GUI/xephem/Makefile \
-		|| die "sed in GUI/xephem failed"
-}
-
-src_compile() {
-
-	cd libastro
-	emake || die "emake failed"
-	local myldflags
-	cd "${S}"
-	for dir in libip liblilxml GUI/xephem/tools/* GUI/xephem; do
-		echo "going into ${dir}"
-		cd "${S}"/${dir}
-		if [ ${dir:0:3} != "lib" ]; then
-			myldflags="${CLDFLAGS}"
-		fi
-		emake \
-			MOTIFI="/usr/include" \
-			MOTIFL="/usr/$(get_libdir)" \
-			CLDFLAGS="${myldflags}" \
-			|| die "emake in ${dir} failed"
-	done
-}
-
-src_install() {
-
-	into /usr
-	cd "${S}"/GUI/xephem
-	dobin xephem  || die "dobin xephem failed"
-	for file in tools/{lx200xed/lx200xed,xedb/xedb,xephemdbd/xephemdbd}; do
-		dobin ${file} || die "dobin ${file} failed"
-	done
-	doman xephem.1
-	mv tools .. # do not install tool sources into share directory
-	for i in $(find . -mindepth 1 -type d); do
-		insinto /usr/share/${PN}/${i}
-		doins ${i}/*
-	done
-
-	echo > "${S}/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 "${S}"/XEphem
-
-	cd "${S}"
-	dodoc Copyright README INSTALL
-	newicon GUI/xephem/XEphem.png ${PN}.png
-	make_desktop_entry xephem XEphem ${PN}
-}
diff --git a/sci-astronomy/xephem/xephem-3.7.5.ebuild b/sci-astronomy/xephem/xephem-3.7.5.ebuild
index 6c656220b3aa..7e174b567fd6 100644
--- a/sci-astronomy/xephem/xephem-3.7.5.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.5.ebuild,v 1.8 2012/10/24 19:25:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.5.ebuild,v 1.9 2013/04/07 17:18:11 xarthisius Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
diff --git a/sci-astronomy/xephem/xephem-3.7.6.ebuild b/sci-astronomy/xephem/xephem-3.7.6.ebuild
new file mode 100644
index 000000000000..e9eecbf171fc
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.6.ebuild,v 1.1 2013/04/07 17:18:11 xarthisius Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+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"
+
+LICENSE="XEphem"
+SLOT=0
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/motif-2.3:0
+	virtual/jpeg
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	sys-apps/groff"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect_env_vars.patch \
+		"${FILESDIR}"/${P}-implicits.patch
+	echo > "${T}"/XEphem "XEphem.ShareDir: /usr/share/${PN}"
+	echo > "${T}"/99xephem "XEHELPURL=/usr/share/doc/${PF}/html/xephem.html"
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+	emake -C GUI/xephem
+}
+
+src_install() {
+	dodoc README
+
+	insinto /usr/share/X11/app-defaults
+	has_version '<x11-base/xorg-x11-7.0' && insinto /etc/X11/app-defaults
+	doins "${T}"/XEphem
+
+	doenvd "${T}"/99xephem
+
+	cd GUI/xephem
+	dobin xephem
+	doman xephem.1
+	newicon XEphem.png ${PN}.png
+	insinto /usr/share/${PN}
+	doins -r auxil catalogs fifos fits gallery lo
+	dohtml -r help/*
+
+	make_desktop_entry xephem XEphem ${PN}
+}