Version bump, bug #156581. Added a patch for problems linking with lesstif and some minor compile problem.

Package-Manager: portage-2.1.1

5 files changed, 129 insertions, 5 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index b2abceebb22b..dd234608c0a2 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/xephem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.11 2006/07/28 14:56:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.12 2006/11/29 15:22:44 phosphan Exp $
+
+*xephem-3.7.2 (29 Nov 2006)
+
+  29 Nov 2006; Patrick Kursawe <phosphan@gentoo.org> +files/3.7.2.patch,
+  +xephem-3.7.2.ebuild:
+  Version bump, bug #156581. Added a patch for problems linking with lesstif
+  and some minor compile problem.
 
 *xephem-3.7.1 (28 Jul 2006)
 
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 71470b78e886..4153836f00a1 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,5 +1,10 @@
+AUX 3.7.2.patch 1290 RMD160 e1f2e66a1b417b2fb66a3c13e74760d8f87977f5 SHA1 5d49ec0a316943287a94ad473778b56db02bf7f2 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35
+MD5 bb57d7c388577b704299370151764e04 files/3.7.2.patch 1290
+RMD160 e1f2e66a1b417b2fb66a3c13e74760d8f87977f5 files/3.7.2.patch 1290
+SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35 files/3.7.2.patch 1290
 DIST xephem-3.6.4.tar.gz 10022695
 DIST xephem-3.7.1.tar.gz 12986819 RMD160 7debeb25b9e76b3e796ae5349d84d6b36ae04e54 SHA1 e6567b358c3b00f696e71eace20f4f5226bab011 SHA256 f818c54b9533502734402578424a3546d34df91a145dea9f88930293aa348a1a
+DIST xephem-3.7.2.tar.gz 19369598 RMD160 585ed51d167869919b512561714d380c83db8865 SHA1 8027f73e934e257316d15c474c88d435241c521d SHA256 51697f36e08000fc5f8f5e5edc570f82c92d0b323331291877814410396d0354
 DIST xephem-3.7.tar.gz 11058376 RMD160 6df2c7a81f493e0a3846a8d15acbc0f79e2c5a3a SHA1 ee661358d7c245759de0df031bdd731ed0d136cd SHA256 efa6e706a06414c1f8a960275f3482f70338e6ef6fb41ea67ce7dfa425a18087
 EBUILD xephem-3.6.4.ebuild 1471 RMD160 34e1c64ce470c6aa1d423bfc3e1feff4eb0760ce SHA1 3211bd609a51eaf9807333bb2f858610db6e3666 SHA256 834d4fc41e28d0fc6aa74ad8a0b16cb4b37799acc188a75d6558d866f744932f
 MD5 aab3a4315ed3eb13df78350c61357dca xephem-3.6.4.ebuild 1471
@@ -9,14 +14,18 @@ EBUILD xephem-3.7.1.ebuild 1886 RMD160 7e8706d69e6e194645ba18c6ca24631a66a891a1
 MD5 d6e06ea2043a5b913f78ea7e6c8b6ee9 xephem-3.7.1.ebuild 1886
 RMD160 7e8706d69e6e194645ba18c6ca24631a66a891a1 xephem-3.7.1.ebuild 1886
 SHA256 bdb4b330fc23ec75a3558b7f26f0144e731bb25c8c3249c1e2751fd71d451c79 xephem-3.7.1.ebuild 1886
+EBUILD xephem-3.7.2.ebuild 1974 RMD160 4c2e31b678ed50a9c1c550895c12d68a03a963a0 SHA1 761e761ad253f8c1b19daf3e7378185d1d7f474f SHA256 1acc328e63f42020c536c8181949b59c1e3880259036ea0629503da545efec57
+MD5 fd85475c6e3906ccafc1e2a060503af0 xephem-3.7.2.ebuild 1974
+RMD160 4c2e31b678ed50a9c1c550895c12d68a03a963a0 xephem-3.7.2.ebuild 1974
+SHA256 1acc328e63f42020c536c8181949b59c1e3880259036ea0629503da545efec57 xephem-3.7.2.ebuild 1974
 EBUILD xephem-3.7.ebuild 1480 RMD160 239f178058fdd3262f29876b45bee0b3961e3e27 SHA1 78e948c20cbeeb7b27357d798198a819d95b1588 SHA256 55d8bbd8721d6ee01d26b18aad595d382ccf6fbc7639f13588a75c461bead5c1
 MD5 92015d2b69d3cea40a57fb20c50e9cb2 xephem-3.7.ebuild 1480
 RMD160 239f178058fdd3262f29876b45bee0b3961e3e27 xephem-3.7.ebuild 1480
 SHA256 55d8bbd8721d6ee01d26b18aad595d382ccf6fbc7639f13588a75c461bead5c1 xephem-3.7.ebuild 1480
-MISC ChangeLog 4231 RMD160 bb7426c787bcb39312d1e16e5ce777771a655f45 SHA1 9511fe7dd4798167643a06023d9ee45ab223a8a0 SHA256 3025ab1a5d0b6e60ff05697423e09f2cd1d5d2b9c11479c462ab5f1f07263c80
-MD5 d51a4b80aed24f19faecd61ebec020bf ChangeLog 4231
-RMD160 bb7426c787bcb39312d1e16e5ce777771a655f45 ChangeLog 4231
-SHA256 3025ab1a5d0b6e60ff05697423e09f2cd1d5d2b9c11479c462ab5f1f07263c80 ChangeLog 4231
+MISC ChangeLog 4469 RMD160 f079df7e88a9f2fcdfd89c11a0741a901b681894 SHA1 5ce7bdaeca767a6159c74179c0a5a62d52b3d80a SHA256 36f0f685a823c803c42c565c143142a2064389d76ab3bbdd72aa2aee33bcb4a3
+MD5 76a6aafdba912754192adc36ebd77ae7 ChangeLog 4469
+RMD160 f079df7e88a9f2fcdfd89c11a0741a901b681894 ChangeLog 4469
+SHA256 36f0f685a823c803c42c565c143142a2064389d76ab3bbdd72aa2aee33bcb4a3 ChangeLog 4469
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -30,3 +39,6 @@ SHA256 3118c39dee305acdec572f020ebdf696b801d166e1f5af59601986f1c7b4a41b files/di
 MD5 8041785e8f5c9cb878e223bc76c2a006 files/digest-xephem-3.7.1 244
 RMD160 5b18c17594561eb436399bc10a83910c1b5e0644 files/digest-xephem-3.7.1 244
 SHA256 8b85a77a1af9399a2e9129fefb7fdcac930232167161e69b58ad46d65033bc7e files/digest-xephem-3.7.1 244
+MD5 054a0b582548ec48906db73e5a320c3b files/digest-xephem-3.7.2 244
+RMD160 7891defa1d9a4db21f9e8b5beea5920c8b9c1453 files/digest-xephem-3.7.2 244
+SHA256 94ebc7e234e987509cbc14fe4048fcfd66edf275e51ecd5a132c05a3d1965916 files/digest-xephem-3.7.2 244
diff --git a/sci-astronomy/xephem/files/3.7.2.patch b/sci-astronomy/xephem/files/3.7.2.patch
new file mode 100644
index 000000000000..968d5c7df36a
--- /dev/null
+++ b/sci-astronomy/xephem/files/3.7.2.patch
@@ -0,0 +1,31 @@
+--- 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/digest-xephem-3.7.2 b/sci-astronomy/xephem/files/digest-xephem-3.7.2
new file mode 100644
index 000000000000..110bf20d4480
--- /dev/null
+++ b/sci-astronomy/xephem/files/digest-xephem-3.7.2
@@ -0,0 +1,3 @@
+MD5 1074e04b9a89302d9f2bad7107674311 xephem-3.7.2.tar.gz 19369598
+RMD160 585ed51d167869919b512561714d380c83db8865 xephem-3.7.2.tar.gz 19369598
+SHA256 51697f36e08000fc5f8f5e5edc570f82c92d0b323331291877814410396d0354 xephem-3.7.2.tar.gz 19369598
diff --git a/sci-astronomy/xephem/xephem-3.7.2.ebuild b/sci-astronomy/xephem/xephem-3.7.2.ebuild
new file mode 100644
index 000000000000..326568be810b
--- /dev/null
+++ b/sci-astronomy/xephem/xephem-3.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.2.ebuild,v 1.1 2006/11/29 15:22:44 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="XEphem is the X Windows Ephemeris, and provides a scientific-grade solar system model, star charts, sky views, plus a whole lot more."
+SRC_URI="http://www.clearskyinstitute.com/xephem/${P}.tar.gz"
+HOMEPAGE="http://www.clearskyinstitute.com/xephem"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
+DEPEND="virtual/motif"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}.patch
+	for i in libastro/Makefile libip/Makefile libjpegd/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
+}
+
+src_compile() {
+
+	cd libastro
+	emake || die
+	local myldflags
+	cd ${S}
+	for dir in libip liblilxml libjpegd GUI/xephem/tools/* GUI/xephem; do
+		echo "going into ${dir}"
+		cd ${S}/${dir}
+		if [ ${dir:0:3} = "lib" ]; then
+			myldflags=""
+		else
+			myldflags="${CLDFLAGS}"
+		fi
+		emake MOTIFI="/usr/include" MOTIFL="/usr/lib" CLDFLAGS="${myldflags}" || die
+	done
+}
+
+src_install() {
+
+	into /usr
+	cd ${S}/GUI/xephem
+	dobin xephem
+	for file in tools/indi/{evalINDI,getINDI,setINDI,tmount,ota,wx,cam,security,indiserver} \
+		tools/{lx200xed/lx200xed,xedb/xedb,xephemdbd/xephemdbd}; do
+		dobin ${file}
+	done
+	doman xephem.1 tools/*/*.1
+	mv tools .. # do not install tool sources into share directory
+	for i in $(find . -type d -mindepth 1); do
+		insinto /usr/share/${PN}/${i}
+		doins ${i}/*
+	done
+
+	echo > ${S}/XEphem "XEphem.ShareDir: /usr/share/${PN}"
+	insinto /usr/lib/X11/app-defaults/
+	doins ${S}/XEphem
+
+	cd ${S}
+	dodoc Copyright README INSTALL
+}