gentoo resync : 15.12.2019

5 files changed, 26 insertions, 39 deletions

diff --git a/app-laptop/hdaps-gl/Manifest b/app-laptop/hdaps-gl/Manifest
index 80c9861f9085..faac2b6ddb00 100644
--- a/app-laptop/hdaps-gl/Manifest
+++ b/app-laptop/hdaps-gl/Manifest
@@ -1,5 +1,6 @@
 AUX hdaps-gl-0.0.5-as-needed.diff 346 BLAKE2B 475c8784ee192f632686177b3d4cf25be97260893621b9bfcff2e649d36cdcf1d4059c9c643cf3153daabb234d8520b51f033de471e2b62d9702db0720bc0782 SHA512 6128fb53c82485a7141d7bff95aea3ab6d20593a9c535bee841c22bcba9504bdf3913eff07fab0de3b58225cab60b3a41638b250d37f1a0f4f67d03c02a29716
 DIST hdaps-gl-0.0.5.tar.gz 2495 BLAKE2B 00b9b79b906e32b5671ae97c30fe0e3007da8ef809078b664befe46e472af39977f6947dfbde53afee30d42e5b104ba055d5e5412d76263d5741db75c663b308 SHA512 6ebef6324fcdfaf5c2ec6cc8382d376c711e5d957a4ffdd4ee150317649ea0a47552e421f8008a3498ac49487657dca2f49b1a50169d7ab02ee5bef856625d19
-EBUILD hdaps-gl-0.0.5-r1.ebuild 595 BLAKE2B 31dc38e9c70ccd7ed05282729c5488d2ac3451d82f0a35b1a271f8c36096992f66dae207f6efaa334f08db8ab67e6deda603920b1bac490423d568e0447689b2 SHA512 22048ef7f3c786e8bb72e9c0bc480a641c22ed6f4cdc9e650f69afe370012ef0d2d1c104892ec194ead43cd01404b7d53fc850c3149a6d57af9c8001410cfadd
-EBUILD hdaps-gl-0.0.5.ebuild 604 BLAKE2B 99848773670133279f29304b88170ecdd66b8e2b5fd01fe41ea9730f577bda063ca513521957741cfd6a719c808e856f8ddd89f0e26445d59e8e1550d2566b69 SHA512 3338f31513e579b73e7ae97eacdcf906076745db0ad01e297114d4db78dcfa8f83a41dec409d77d8cb5d9de84c23b8af282ae62e64bcef0c14b3cf9d1db2c6b4
-MISC metadata.xml 331 BLAKE2B b37ad024d05ff927954691e305f0f8db45f7491b26c35c483f12133f6ec1e820113dd8b9f63574abaaec807a0e1b1fc746a9c99350957bb538cda811fdb4551a SHA512 f8c3780b4eccb984b5dca649b55f3e9f00017bb650dfa580c924a0d0e897ddf50c89db9087800a974a37b154b65c412458db01e30585777f71bdfb8dc448ddf6
+DIST hdaps-gl-0.0.7.tar.xz 226516 BLAKE2B e7de2fa72021e0a98a3e4a9c4501aa8ff05252de29bdc378ae31e0ea741513e6f2205696cacb7169d03c4e3f818e5b24f661bf9119d9afe8daa5bea90a248367 SHA512 4a8eaa556488ae8b0941f51a76e97cbbdc1b7b66aef14ea55e36197a2ad92c7b6fee0617bc71e85ae9320b09b5c903ce053ad9cb78f931618a4c806d5298887b
+EBUILD hdaps-gl-0.0.5.ebuild 578 BLAKE2B 4d927fbe2ba37ccced658d2841c5b14860cee2450faa6d12eddf36ac50411ec4a3c3c8da69853c7f0bf78eaa2bb0f1d0cc92108b83c3dbb1076aa3214371df94 SHA512 87e4d13c210df363f4e4fa1c498f8d86d2609bbf3c0dd3fc3b15461d000a06029134280bff1337dd8f6e866b5741d103cf5146bba1009866607bbf26ffa0594f
+EBUILD hdaps-gl-0.0.7.ebuild 450 BLAKE2B 4498fd82f00de3601fa561f8380e08fcf83d29500735bb0e92aee6172f32306f9ce8ac0820ba9b4596dae465af683a040001a287e678372c5bd481475be28761 SHA512 e54867c0544140f4d6de21967d200af92479c7bb9a152d9eeb4528998998cc6b16e4e449436174ee08c67743ac9db9b3055e6f0983f42254bc718d0a791eff6a
+MISC metadata.xml 346 BLAKE2B f76b65b1705cbb544d056b6556d7119a788b99b0b6da3b8b0276cc602d38a05780b0ca2eea45dd3234652011c0c2aecb6173710b855fc46dd9eca99635088167 SHA512 d268cceebe74bcc1a59438ea6a6330745f0bcb53d906950f3e3113f8671c559a6941a028a66233fe354bc4c4f71b68239a13d7f512c1c27ca772cce941d422eb
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.5-r1.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.5-r1.ebuild
deleted file mode 100644
index 6e145279052f..000000000000
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="OpenGL visualization for HDAPS data"
-HOMEPAGE="http://hdaps.sourceforge.net"
-SRC_URI="mirror://sourceforge/hdaps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND=""
-DEPEND="virtual/opengl
-	media-libs/freeglut"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-as-needed.diff" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin "${PN}"
-}
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
index 7bc369635dc7..a4c362d093ee 100644
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
@@ -24,8 +24,7 @@ src_prepare() {
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		|| die "emake failed"
+		CFLAGS="${CFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
new file mode 100644
index 000000000000..9fa8e04322e6
--- /dev/null
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenGL visualization for HDAPS data"
+HOMEPAGE="https://github.com/linux-thinkpad/${PN}"
+SRC_URI="https://github.com/linux-thinkpad/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND=""
+DEPEND="media-libs/freeglut
+	media-libs/glu
+	virtual/opengl"
+RDEPEND="${DEPEND}"
diff --git a/app-laptop/hdaps-gl/metadata.xml b/app-laptop/hdaps-gl/metadata.xml
index 1b35bde263cc..b925ce86a843 100644
--- a/app-laptop/hdaps-gl/metadata.xml
+++ b/app-laptop/hdaps-gl/metadata.xml
@@ -5,7 +5,7 @@
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">hdaps</remote-id>
+    <upstream>
+    <remote-id type="github">linux-thinkpad/hdaps-gl</remote-id>
   </upstream>
 </pkgmetadata>