reinit the tree, so we can have metadata

5 files changed, 312 insertions, 0 deletions

diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
new file mode 100644
index 000000000000..341db3c3304a
--- /dev/null
+++ b/x11-misc/xplanet/Manifest
@@ -0,0 +1,7 @@
+AUX xplanet-1.3.1-giflib.patch 1232 SHA256 6f6a315935876ddf298fdc6c2c1874cd591c20abb334395a4688b63efe969499 SHA512 56547a679361b7adf47191dfa5c011f93f1de288857f93a981c1bcdab6b4bc78c81b568748586f41fe0c49b634e5d7373875c579c0dfc05a5e256200889d7384 WHIRLPOOL 6fe2f470fa44a3b1c4029ec25642159a7fe4148195c9b500f663e37c48ba1a3bb4ccc2ecb8a7c812d791d411863cb781d182485290bab2ddf9454259b23e7778
+AUX xplanet-1.3.1-remove-null-comparison.patch 6773 SHA256 e651c7081c43ea48090186580b5a2a5d5039ab3ffbf34f7dd970037a16081454 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d WHIRLPOOL dd79e90c900bc2df4e1c4e7a8b3c963d2c76aec32c2ae38be984d3ca06b5e1432bbce0697fd9fb755168c9eb8fa0b69e935787b31038544e5b9b02d4bb5f998f
+DIST xplanet-1.3.1.tar.gz 1236035 SHA256 4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7 SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0 WHIRLPOOL 4c40fac4056654aa195f9955053d2dfba6791e8e2021673f05c334163ee5b1d842e6101447228844573ed41a88f37c0fd96df633716bddeb55c8940941621ad9
+EBUILD xplanet-1.3.1-r1.ebuild 1654 SHA256 846b05079b26c3b6e77e020cad8f905a65158a6458ee047d906e71690f71c78f SHA512 545671717ecd4f1ae42b85989f24d6738ca455c2df81e58c933b98d8d3abd7830c9ec3cf8ae4b2148b981c8b80b77c906255acbf89e4e5e3da86c008c54ece65 WHIRLPOOL 9fd07cbefe1453651586b426925ad42de5cfae513679914c4bdd1a6fd78bf13cdfb692f42073743bad13d984f99d1679624ec48c0e6b49dd07fa90000a523a29
+MISC ChangeLog 3423 SHA256 a17a6f7495e9a8f28fa8319ebe50c24261a574427c43856e67d3d5ec6a3bbc7a SHA512 1c131ba8d1d05a0c905c1dbe04f6ff88b011fffa2154ddf2b2328b8cb724f47972782e85e14a22487ac9af23a6ce2d41a8dc1c52ab43856e00eced111d60b713 WHIRLPOOL d6208e9fba91c0da087a67bda3666053b7f8593e5079167141fe02dd726f45577b7394221b22880bfe2ba2efb9ede4d24e38170b6e3d6b6eeccd78120bda52f3
+MISC ChangeLog-2015 10628 SHA256 cf820defe0c3d8a97de73785163a4eef8fa1728c57fa06ccfb6ddbac1daa2b9d SHA512 1c26cc4cdad60ffa3980f7087bbddcd17da3a274a9ce5e55d3ca0bca853fe32ff326e48d7c1e51bb479fd569d1dd7bde4003952fd346dcb0a13908809e46c572 WHIRLPOOL 7090ab0d164fb8e1d07063466bcd7d12dc51abad17525d8d858e542f1978e4e4f3553bd6b2e4c018772617d3586a9ad76f74103e1acde4226929056ee66ae036
+MISC metadata.xml 353 SHA256 206807d432fd618d0b0b305fc86cd2f16dbe37d1fc81ab13e31efeea6cb03736 SHA512 ec6c412d7af2d2e5541e26d007fd5244c07aae866242eed9c57e6bdd3a05c05958b69989b14f1d8d9054a70abac7344872265eb1bf96e32310f1a444a7463e6e WHIRLPOOL c66b40aa3aad9727a8ca5dfd33665137b0235077b4c9a61812295dfe9dbbfa317f449d987221dfea4129627c1bc851c36f4ee9feedb6cb78692551010c67c643
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch b/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch
new file mode 100644
index 000000000000..b4d6fb9ddb3c
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-giflib.patch
@@ -0,0 +1,55 @@
+--- a/src/libimage/gif.c
++++ b/src/libimage/gif.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ 
+ #include <gif_lib.h>
+@@ -179,7 +180,11 @@
+ 	}
+     }
+     
++#if GIFLIB_MAJOR >= 5
++    if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
++#else
+     if (DGifCloseFile(GifFile) == GIF_ERROR) {
++#endif
+ 	return(0);
+     }
+ 
+@@ -240,7 +245,7 @@
+  *   Also non of the parameter are allocated by this routine.
+  *   This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
+  ******************************************************************************/
+-static int
++int
+ QuantizeBuffer(unsigned int Width,
+                unsigned int Height,
+                int *ColorMapSize,
+@@ -493,7 +498,11 @@
+ static void QuitGifError(GifFileType *GifFile)
+ {
+     fprintf(stderr, "Error writing GIF file\n");
++#if GIFLIB_MAJOR >= 5
++    if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
++#else
+     if (GifFile != NULL) EGifCloseFile(GifFile);
++#endif
+ }
+ 
+ int 
+@@ -589,7 +598,11 @@
+ 	Ptr += width;
+     }
+ 
++#if GIFLIB_MAJOR >= 5
++    if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
++#else
+     if (EGifCloseFile(GifFile) == GIF_ERROR)
++#endif
+ 
+     {
+ 	QuitGifError(GifFile);
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
new file mode 100644
index 000000000000..3ead8872e0cb
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch
@@ -0,0 +1,157 @@
+Index: src/libannotate/addArcs.cpp
+===================================================================
+diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp
+--- a/src/libannotate/addArcs.cpp	(revision 206)
++++ b/src/libannotate/addArcs.cpp	(revision 207)
+@@ -258,7 +258,7 @@
+         {
+             ifstream inFile(arcFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+                 readArcFile(line, planet, view, projection,
+                             planetProperties, annotationMap);
+             
+@@ -292,7 +292,7 @@
+         {
+             ifstream inFile(arcFile.c_str());
+             char *line = new char[256];
+-            while (inFile.getline (line, 256, '\n') != NULL)
++            while (inFile.getline (line, 256, '\n'))
+                 readArcFile(line, NULL, view, NULL, NULL, annotationMap);
+ 
+             inFile.close();
+Index: src/libannotate/addMarkers.cpp
+===================================================================
+diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp
+--- a/src/libannotate/addMarkers.cpp	(revision 206)
++++ b/src/libannotate/addMarkers.cpp	(revision 207)
+@@ -429,7 +429,7 @@
+         {
+             ifstream inFile(markerFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+             {
+                 unsigned char color[3];
+                 memcpy(color, planetProperties->MarkerColor(), 3);
+@@ -475,7 +475,7 @@
+         {
+             ifstream inFile(markerFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+             {
+                 unsigned char color[3];
+                 memcpy(color, options->Color(), 3);
+Index: src/libannotate/addSatellites.cpp
+===================================================================
+diff --git a/src/libannotate/addSatellites.cpp b/src/libannotate/addSatellites.cpp
+--- a/src/libannotate/addSatellites.cpp	(revision 206)
++++ b/src/libannotate/addSatellites.cpp	(revision 207)
+@@ -488,10 +488,10 @@
+         {
+             ifstream inFile(tleFile.c_str());
+             char lines[3][80];
+-            while (inFile.getline(lines[0], 80) != NULL)
++            while (inFile.getline(lines[0], 80))
+             {
+-                if ((inFile.getline(lines[1], 80) == NULL) 
+-                    || (inFile.getline(lines[2], 80) == NULL))
++                if ((!inFile.getline(lines[1], 80)) 
++                    || (!inFile.getline(lines[2], 80)))
+                 {
+                     ostringstream errStr;
+                     errStr << "Malformed TLE file (" << tleFile << ")?\n";
+@@ -542,7 +542,7 @@
+         {
+             ifstream inFile(satFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+                 readSatelliteFile(line, planet, view, projection,
+                                   planetProperties, annotationMap);
+             
+Index: src/libannotate/addSpiceObjects.cpp
+===================================================================
+diff --git a/src/libannotate/addSpiceObjects.cpp b/src/libannotate/addSpiceObjects.cpp
+--- a/src/libannotate/addSpiceObjects.cpp	(revision 206)
++++ b/src/libannotate/addSpiceObjects.cpp	(revision 207)
+@@ -524,7 +524,7 @@
+         {
+             ifstream inFile(kernelFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+             {
+                 int ii = 0;
+                 while (isDelimiter(line[ii]))
+@@ -576,7 +576,7 @@
+         {
+             ifstream inFile(spiceFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+                 readSpiceFile(line, planetsFromSunMap, view, projection,
+                               annotationMap);
+             inFile.close();
+Index: src/libmultiple/RayleighScattering.cpp
+===================================================================
+diff --git a/src/libmultiple/RayleighScattering.cpp b/src/libmultiple/RayleighScattering.cpp
+--- a/src/libmultiple/RayleighScattering.cpp	(revision 206)
++++ b/src/libmultiple/RayleighScattering.cpp	(revision 207)
+@@ -369,7 +369,7 @@
+ 
+     diskTemplate_.clear();
+     limbTemplate_.clear();
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+@@ -439,7 +439,7 @@
+     values.clear();
+ 
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+@@ -470,7 +470,7 @@
+                               double &value)
+ {
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+Index: src/libmultiple/drawStars.cpp
+===================================================================
+diff --git a/src/libmultiple/drawStars.cpp b/src/libmultiple/drawStars.cpp
+--- a/src/libmultiple/drawStars.cpp	(revision 206)
++++ b/src/libmultiple/drawStars.cpp	(revision 207)
+@@ -41,7 +41,7 @@
+     ifstream inFile(starMap.c_str());
+ 
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         if (line[0] == '#') continue;
+ 
+Index: src/readConfig.cpp
+===================================================================
+diff --git a/src/readConfig.cpp b/src/readConfig.cpp
+--- a/src/readConfig.cpp	(revision 206)
++++ b/src/readConfig.cpp	(revision 207)
+@@ -550,7 +550,7 @@
+ 
+         ifstream inFile(configFile.c_str());
+         char *line = new char[256];
+-        while (inFile.getline(line, 256, '\n') != NULL)
++        while (inFile.getline(line, 256, '\n'))
+             readConfig(line, planetProperties);
+         
+         // This condition will only be true if [default] is the only
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
new file mode 100644
index 000000000000..6037d71217ba
--- /dev/null
+++ b/x11-misc/xplanet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xplanet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..c469ef0208a8
--- /dev/null
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="Render images of the earth into the X root window"
+HOMEPAGE="http://xplanet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="gif jpeg png tiff truetype X"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0 )
+	png? (
+		media-libs/libpng:0=
+		media-libs/netpbm
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/pango
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+"
+DEPEND="
+	${RDEPEND}
+	truetype? ( virtual/pkgconfig )
+	X? (
+		x11-proto/scrnsaverproto
+		x11-proto/xproto
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-giflib.patch
+	"${FILESDIR}"/${P}-remove-null-comparison.patch
+)
+
+src_configure() {
+	# econf says 'checking pnm.h presence... no'
+	use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm
+
+	local myconf=()
+
+	use X \
+		&& myconf+=( --with-x --with-xscreensaver ) \
+		|| myconf+=( --with-x=no --with-xscreensaver=no )
+
+	use gif \
+		&& myconf+=( --with-gif ) \
+		|| myconf+=( --with-gif=no )
+
+	use jpeg \
+		&& myconf+=( --with-jpeg ) \
+		|| myconf+=( --with-jpeg=no )
+
+	use tiff \
+		&& myconf+=( --with-tiff ) \
+		|| myconf+=( --with-tiff=no )
+
+	use png \
+		&& myconf+=( --with-png --with-pnm ) \
+		|| myconf+=( --with-png=no --with-pnm=no )
+
+	use truetype \
+		&& myconf+=( --with-freetype --with-pango ) \
+		|| myconf+=( --with-freetype=no --with-pango=no )
+
+	econf \
+		--with-cspice=no \
+		"${myconf[@]}"
+}