gentoo resync : 15.01.2020

4 files changed, 3 insertions, 49 deletions

diff --git a/app-laptop/hdaps-gl/Manifest b/app-laptop/hdaps-gl/Manifest
index faac2b6ddb00..6822c6241a7a 100644
--- a/app-laptop/hdaps-gl/Manifest
+++ b/app-laptop/hdaps-gl/Manifest
@@ -1,6 +1,3 @@
-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
 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
+EBUILD hdaps-gl-0.0.7.ebuild 451 BLAKE2B 02bbe9b3a2268cd9b0fd510fdcd7ab5730f108d2d865932bae7047b1351b847f44ebb1d1bab35d3d9e76fb8c61144a60e409b0c55e894f0752d3dfe3c695838e SHA512 f16903ec2b30ce58056aa151d2c1abdbad99391aa5ffb038474969174566dc7a0af6e337311781a3eae83e946eb3212c99c3cc23b228b15dd93b93dac173323c
 MISC metadata.xml 346 BLAKE2B f76b65b1705cbb544d056b6556d7119a788b99b0b6da3b8b0276cc602d38a05780b0ca2eea45dd3234652011c0c2aecb6173710b855fc46dd9eca99635088167 SHA512 d268cceebe74bcc1a59438ea6a6330745f0bcb53d906950f3e3113f8671c559a6941a028a66233fe354bc4c4f71b68239a13d7f512c1c27ca772cce941d422eb
diff --git a/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff b/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff
deleted file mode 100644
index 0d0214033252..000000000000
--- a/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdaps-gl-0.0.5/Makefile	2005-08-30 20:06:53.000000000 +0200
-+++ hdaps-gl-0.0.5-1/Makefile	2008-09-22 22:55:57.000000000 +0200
-@@ -10,7 +10,7 @@
- all: hdaps-gl
- 
- hdaps-gl: hdaps-gl.c
--	$(CC) $(CFLAGS) $(LIBDIR) $(LIBRARIES) -o hdaps-gl hdaps-gl.c
-+	$(CC) $(CFLAGS) $(LIBDIR) -o hdaps-gl hdaps-gl.c $(LIBRARIES)
- 
- clean:
- 	rm -f hdaps-gl *.o
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
deleted file mode 100644
index a4c362d093ee..000000000000
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils 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=""
-
-DEPEND="virtual/opengl
-	media-libs/freeglut"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-as-needed.diff"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
index 9fa8e04322e6..9eb97d143ccf 100644
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
@@ -5,11 +5,11 @@ 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"
+SRC_URI="https://github.com/linux-thinkpad/hdaps-gl/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND=""