Version bump, drop old. Use subslot dependency on libpng

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

9 files changed, 227 insertions, 177 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/Manifest b/sci-astronomy/xephem/Manifest
index d5ed1f1b1cb3..eeefdbc2673b 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 3.7.2.patch 1290 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35 SHA512 f383437d4a153d239d194c0b661d820c7a133f4a7551fe84f8bb8a38b5d07845b2cdf664c0ec4bef10e15a0cff5ae3e5aaf9e6fcfd681e088c3b326ce8d78311 WHIRLPOOL c24190532ba7ec8d6f9b4a9ea00152361b3c20207a0a52f204e6215ef131237890d9ee36cd54116af874eacae7fa79396ceb15f1fca716a038b394ffa9046285
-AUX xephem-3.7.3-use-system-lib.patch 1422 SHA256 6520076d6f201e05d3c5285a6bf58b859363bd0fdfc653b09c93769c57a44746 SHA512 db3433a8d4384a08b0b49e20f6973dbf577cf6351f6643c46d482b136554e26ed2317dec9be74577db6e74144cc4ea0ba26ba817edaad62e69a66999ecb9f855 WHIRLPOOL 558b53e7503f5f81926466e26f00cc1ea0c32a5cb7ce7d160abc6b9dfca217c06e64bdf9111ec121c3dcadc4381f24f1f1d95af2ed3627facdb1564e58b40fdc
 AUX xephem-3.7.4-libs-flags.patch 5206 SHA256 ae5eebb288daa710cceb19e2e5d52307137b1f190095387915ed8bc33c5f575d SHA512 36025f3b42c89137a09af1e9d3f6fccff5e4a6d8466c4818de074cf018813a02cb8ff5a27d0907e7c5dba3ab889ca1af89402fa3f02614b5519f28a9af28161b WHIRLPOOL f7a3bd53c5dea73e3ad1b0bdd869d2fd1c24f1bc5c2e8ea3c0e0d4638b819ad3c8d6341680e74444c03928c6d0c182cd34466b0555b8b3dfbb76e408b0f0957e
 AUX xephem-3.7.4-overflows.patch 426 SHA256 89591dd616340a114e951a7d7c6661bc4379a8da7ec821bd5a29e60d4186fd8f SHA512 be610e5221c41380b4d98fbb9cb20a0ff72a67b86772e340e914aa46d3c26f3c9c12dbe0213d33aa497dde168a6110d2068e014d506a2888797c2cff0ea5e634 WHIRLPOOL 0baf1b6a997c6270e6766f688b875470f32ee21d59e7958fdcc4e73b6e3086c20a2ba8518857693f15624bcc28bb6c098e2f4dd7884bc6db8d0e21da2adda339
 AUX xephem-3.7.5-respect-flags.patch 1133 SHA256 11e351d150a670ab417e2f2b9eccc6cf6839f258c577c32c39bf3dffd461c357 SHA512 0d47ff6b60488aa9b209e34a9e561adf033465137bd3a176418e9b2cf4bb6b948d83647a1a4c7f4a09da8b02a53d64f42c4f5794d7700f2404bb9791dcdf89bf WHIRLPOOL e7249f80818d95304aa88d3c99dd65617804930c36e4f497ba9223e84553127377b2b921a6bb6740172de0804f687fc888d789f5f73eb4d7da4fcb6d25ab0d4b
-DIST xephem-3.7.3.tar.gz 22148450 SHA256 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337 SHA512 0f7241f560cd7f41874570911f0387570606be128230a56071621cdd2fbca873694e3d65194a4b937716517a5575aff9ef8ebace9f6f9faf2f21332a43f961bc WHIRLPOOL 6cf5804da2b0de0c5b5e445d26463b7c16aafb96a8e52140e44b733201dc7a3a34b7d569a397f361919e6eb0ee885428388d32cc550e62fe511dca411c58cb72
+AUX xephem-3.7.6-implicits.patch 305 SHA256 c512083980a72c03ca37cfc1db4d23bf7a6a4fa343cae41ec50bf790d9f50846 SHA512 220186bb7f72fe0de6ca75a67df7b1a4d4cc57cc4768d565dc8225e20df93738c7bdd62bde6297941d1ec6638800950ef56e355de8ca1e3e8192b903b021adba WHIRLPOOL ce6bf19fdcced1059b62f7b73f4eb79dc6028aabea85e33733220c4cb431b6a91306f9d12aaabe5d0b9a8bd54c6384237ccb6deea48c119b0a0583e37dcc66b5
+AUX xephem-3.7.6-respect_env_vars.patch 3395 SHA256 ea65bc83c8a00cc1623f167c73b8f0f7437229fde8c97192f58b7a8c004741bd SHA512 d23196737fa307a16d98222dbe463f82c47f8f1184ff55cfaa4a7a7cfa62b2bb20a0144f5bf22ff881f825b78f027e1de8552cf2664670781c382b522b00ec5f WHIRLPOOL 47466717dcc67afccb3613bd1c519a7148ba71bb6ed0c88e53dc7568f05c2b2108a9845ecb065bf0269d642088f9faccaf7a2369071691bb374c3abb6481c013
 DIST xephem-3.7.5.tar.gz 18908521 SHA256 edda7975bb690f74b1853d2729de2b0f4ada69fb37a08117ace7a22c23ee7d1a SHA512 58cd75e4cf8b541d818631e50453f14275cf81ca3349c442ac62eb7fa15509d3d2d57f88420f866312e41ecfd333c8aeeade7656a84e6e527811f98a26b8588d WHIRLPOOL 6d97bf755cc5e98909aa66c1a0ae942f32dd74541ef6e7c03d7c76214462a10929935a38a5a7c468e28ba315f019d9a0489e345f95ee547238d2250fdc9f8005
-EBUILD xephem-3.7.3.ebuild 2402 SHA256 601e898485c6e735a528c6d8410d7d9edbcef255c9e4c91b70b2a242bd997f3f SHA512 336a52e379af11f7609b7fa89560dc5fe597db360cc171775f7d300fef6ba6f9a7e8b8aba40cae6f746b2069a99f480c4d555b68dd9b6cf647c8deb8f25e8976 WHIRLPOOL 37cb71d103189e5a7de376fc95717fdc9ed6ed94607147fc00484b3b9a4e58aa3d16bfa67274deeeecab423d9a7148a421ff3cf4fa32f2ca80cf7c83bc4b54d0
-EBUILD xephem-3.7.5.ebuild 1899 SHA256 0612e931293db53efc885fe00f5c483306b2d0b50b4062aad266653e0a62ee9a SHA512 3fdcfe7f987ae5b9437dad73d59a551800a413aa3734c538aefebcf7a9457d25e7c3a7876a3bc3de4b07fb6ac6f9a8cc35a4b72a94ff7113bdca8cd8a2e323fc WHIRLPOOL 98ed424b6bc18e0870fc6165cbc67eea7438a0a44cbc20cbfc34a1c6506cb4715844ec60edbe51939bb4f6e31e05e90f647dcebc02719ea1a168a807b1cd92e9
-MISC ChangeLog 9157 SHA256 2fb7eff42e06f94db4a600170aaedb8d0e1c9c6841a1024b5598fa81dcd763c3 SHA512 7edf5f8ff2292abba5f587d7b6b268d2897ea9b2888531d14d1c66ce0d19b9a6e1be7350db3972215903ba50e68ef77784d1e0c3d5d571fb9f7ee8f2cb95c769 WHIRLPOOL 0e0bc868f1670b8ca27636c664717ec8da92c2a9687fb99a270ee7841a33039d01c5bb5f3a0a8201335995c4658ee1c25dcc2c1127b98eb5d3ca781a4dd78536
+DIST xephem-3.7.6.tar.gz 17975496 SHA256 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 SHA512 96d77852045e3d3cb996de5884a9272b2f3157216816acf3ad05a0bc60f20673fccc0f1efd54443cf7c38d0aaa86da1cf3f11989c2e37e26feb0cbd78855c84f WHIRLPOOL 94bba9595863cc30f5a058ea72dc4d4824d62355ce0bfef05c63a741667c064febb26bc4da884d7cc15ee04b74cf402031efbdbae844c458acc1c8cb0ec2a91a
+EBUILD xephem-3.7.5.ebuild 1906 SHA256 3c3f0d8e869adeb56d4878a73898c20a6e75d267931cede905bf77f54f1f03f1 SHA512 a8b6599df399bd4055f933cf28848b9432eaee9e33f6e24d085c96689d41f36a0f8500ae2150f5c21a7d41abfa86b77dd1ef13f53d443d855bf6d2dfad438be5 WHIRLPOOL a3936e0254ad0fa674b34dc902cb856f6a0754ee1366ae4ade8608f1d78c6a3604c5da6c4a36a4c038f9aed95bdd59381ae08bb05908385f6a50a5ddc969fcd0
+EBUILD xephem-3.7.6.ebuild 1350 SHA256 76ab5ae912ec62c693942c160a9583f7923e1664f11848c602a2f4254ee03921 SHA512 be9d5e8bd1c9cdae2aef6fe16a4b3aa82512f9e83d4815870ff5e1608c8c5b830fd6307f402d62a192b4df40ab8125e05ec11ac5be828dad52e8b0941c8ba9dc WHIRLPOOL 7ecfb68de52c8815fcc2b6455819e335d1282399dc4155c07b3e3db86c43c36d393be90c7e5c70347d762d5cca547dba0650515e13aa2d9d32fa77a4b0d5b25d
+MISC ChangeLog 9523 SHA256 1991fd54ab5c192f351fca327943ee998f5028d21d12eb18084b469f2bcb73f6 SHA512 5ff4afb15f3c6c5dae19ed301ad5b7ec18705190b5edcaeb76fe718394891123b77a88677f268b74e2cfdcd886599c1932dadd8198f812f5fcc124b8623b3314 WHIRLPOOL 2c405ec9c93b1b085cc7e5de1e11bf655c909ad8e8b73f57e299d763dabda86142d413b4a3a8e36aa828bcd9e1a6840dc7077e9c2530973e6b9992072c04cfca
 MISC metadata.xml 629 SHA256 8513581aa7fd9a7322ccb643ec327986f298cc5dda38efa615cf3fc24feeedaf SHA512 c2f602cce8a7391004eab42ac6beffaf4cf26db131661372300f75052ebff3318e128baed2d9de8ac6f4b3d2a669322d03558992772d170b6f7deb1e44edc620 WHIRLPOOL 12d998845b4e4424f61cfe305488d803f307af03971b92ca43c8140b8843ce02f075859de91730a9f7c901c52abeec5c2dfe6895d1d7cda4d71d818ead99ad80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiEDKAAoJEDxpGckxwJCBxhgP/R6gu9bZ7F6YWOX/BWWpKJml
-E9Y1X4YBmI9M0GsoUEm+2h1LR8JmbSE4bnEq5VhYGO/Fn6hmlmXqYZE5ZXGER9Vo
-u+LZApOeUKa7EDsIArrkUajoG84/0SSDWNJ/rL+tllksSHcJsZ8VkOJ7QlU/iVPw
-Mjwm7lOKPANqEOaUkxsSSaXIqfnxNdfo1ujk+SCfCXRzF2fFTDZ+v01IbRrAHj8J
-j08EyFl/rGHB8pR57bziTgCD//c3MPqDvHIeCHM+TqFyedwaZJqZD9x49gxU+YMp
-x2P10fpoR8jfcrsACKwzeoT1Xatjc3dlztQrEfNqNcYrtp9pXYfR1NPhcWrM8F6f
-YNrvWwG9jKI7OxNuQjrYIYaqbume+5rlzxWjS6XX2PKF1plrStXcIVCIgCnesRf0
-Wi/lJzBO7uof5Ud8d1ptS2tDAgiokUOWhDg3fyd23yB9OfYHlapwhkDZiYazjKrf
-Uf2zp1R2M4EWX1+Zzjun/kyHIBmfgY07cPbCuHG3zFz9dYgtIbxA5XtKnhKshXtV
-o12yfWT78WLzWVH3X6uA1evfg8ZMCrDOHj2LzW7UFy7UoW2MmrAyNs7pw72RO7af
-bsMvYeVir1/iiyhf+9HRRWrUwXArdu7ZqSnnKiMtOCNY7benAPZuvExMiG+rQnas
-lRKb3UuunRUbM8Lk29B7
-=4TlB
+iQIcBAEBCAAGBQJRYapaAAoJEF0huFKJUZL5T8AP/R8DsDItEQTyo19yQBNU6+28
+tm+ecgiPnkwD8mK5/jdHI2CS6wyEf/oTRx67z5BwwZcJWvM4Nz1NeMCmBRKyl7sB
+7k6YQHaxvtYSnCrVlSbDsf85/6qWtgmGvWKbfli64joWz9biI4noikFvAWw6gzE5
+TW0p1J7SToHn+A3+slTyqekpgwV9lRECIE9OdZesuA6G4e/AYVic0tF8ATFB0W3G
+BUJN0oHgEmlpkSJOHUooJr8e0wdwgx67GWtMczXAz2ZeaGmyck7TZKQoEqGhzqEs
+YXQPqGs2pBPJgtG/o9dBNoce7RIRL0MWsu5rKIcS1mCPlLhijgN2L8+8aC18FIPu
+FnM39CbO+ZuEQ+sLH5wx+5oo2ff/DVV3Cm8buDfxbDMQof/sPqwjKpgRsjVVMVQR
+dbp2VoyCcRKaHwJbX/+XzOnQP5AGUr2qIqwHeEhN+qIbWSsEGrlb7pQdvi1zR5hN
+0S8olXSvSDaScQuFSYfZFn0vvZovh/mu/7claFGVEj0CWW6H/nq694I+iJfWoNRC
+qum/WG8N+3mm0hRUykHClTlKIO+hvrBG5QrLx5sIqahJxLmnYQh5fzQTuVZy5gso
+tZ7TCXv//01v6Ief4Vlv5htttycRFqf/Ia3wrZia3zoNTNJMpxwBH2REO+E+13BR
+QOP2GV9FR0/a3NTu4Tme
+=hKo2
 -----END PGP SIGNATURE-----
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}
+}