Various fixes for sci-astronomy/open-phd-guiding

2 files changed, 21 insertions, 32 deletions

diff --git a/sci-astronomy/open-phd-guiding/metadata.xml b/sci-astronomy/open-phd-guiding/metadata.xml
index cf5e369..c736923 100644
--- a/sci-astronomy/open-phd-guiding/metadata.xml
+++ b/sci-astronomy/open-phd-guiding/metadata.xml
@@ -1,30 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ctibor@brancik.cz</email>
-    <name>Ctibor Brančík</name>
-  </maintainer>	
-  <longdescription>
-    PHD2 is the next generation of Stark Labs PHD Guiding. PHD2 provides a number of new features and enhancements over the original PHD1, such as
-    A more responsive user interface, with a new multi-threaded design
-    Improved visualization tools for observing guiding performance in units of arc-seconds or pixels
-    Declination-compensated guiding, eliminating the need for recalibrating when switching targets
-    Support for guiding with Adaptive Optics units
-    Equipment profiles for managing multiple guiding configurations
-    Internationalization improvements, with French, German, Japanese, Polish, Russian, and Simplified Chinese translations available
-    A new server interface for controlling and monitoring PHD2 by other imaging applications
-    New tools, such as a polar drift alignment tool and a calibration step size calculator, a Comet tracking mode, and more
-    Dark-frame libraries and Bad-pixel maps
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>andy.galasso@gmail.com</email>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<longdescription>
+	PHD2 is the next generation of Stark Labs PHD Guiding. PHD2 provides a number of new features and enhancements over the original PHD1.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+		<email>andy.galasso@gmail.com</email>
 		<name>Andy Gallasso</name>
-        </maintainer>
-        <changelog>http://openphdguiding.org/</changelog>
-        <doc lang="en">https://sites.google.com/site/openphdguiding/phd2-drift-alignment</doc>
-        <bugs-to>https://code.google.com/p/open-phd-guiding/issues/list</bugs-to>
-        <remote-id type="google-code">open-phd-guiding</remote-id>
-  </upstream>
+		</maintainer>
+		<changelog>http://openphdguiding.org/</changelog>
+		<doc lang="en">https://sites.google.com/site/openphdguiding/phd2-drift-alignment</doc>
+		<bugs-to>https://code.google.com/p/open-phd-guiding/issues/list</bugs-to>
+		<remote-id type="google-code">open-phd-guiding</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild b/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
index 88354ff..7d55086 100644
--- a/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
+++ b/sci-astronomy/open-phd-guiding/open-phd-guiding-2.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
 
-inherit git-r3 cmake-utils wxwidgets
+inherit git-r3 cmake wxwidgets
 
 DESCRIPTION="Astrophoto guiding software"
 HOMEPAGE="http://code.google.com/p/open-phd-guiding/"
@@ -15,15 +15,13 @@ KEYWORDS=""
 
 SLOT="2"
 
-DEPEND="x11-libs/wxGTK:3.0[X]
+DEPEND="x11-libs/wxGTK:3.0-gtk3[X]
 	virtual/libusb:1
 	sci-libs/cfitsio
 	media-libs/opencv"
 
 RDEPEND="${DEPEND}"
 
-#PATCHES=( "${FILESDIR}/open-phd-guiding-2.9999-remove_compiler_strict_warnings.patch" "${FILESDIR}/open-phd-guiding-2.9999-build_helper_script.patch" )
-
 src_install() {
 	/bin/sh "${S}"/build/build_help.sh
 	dohtml -r "${S}"/help