gentoo resync : 15.12.2019

4 files changed, 41 insertions, 34 deletions

diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
index 24f9d0ad106d..9b158cf4499b 100644
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -1,5 +1,5 @@
-AUX alevt-1.6.2-libpng15.patch 179 BLAKE2B 9d3c4f20fd6b43e1574af1d9a1a3dffd89050cab64f64ececfaf31e18a4a39a8ca6690eaee3ec8c91618efad39440f4ef4341bb61abee763ca546925a84b158e SHA512 f97967c6eab94a4e302b0ded693c9c7ea1150fc698bf949959077bf680a446632f11798a29c11bcae86b97266e1afa644afc428c31f0e7a21f4ee31365b6cbb3
-AUX alevt-1.6.2-respectflags.patch 1178 BLAKE2B f9059064ad67d538fec73817adc2db453b60a5299a695664e32add959980c4023465d1d68b000cd7f1b4d72677a2260d5c167fba74b28ace7b6859ffe39954f9 SHA512 e3450a688c1e0c010b0644d70e4a07675dc84b0823b15902730f651df3e1156d0f1bbedae6a086082dc3f4de12ae3d265e0d68fee4a8e27025237e3784d796e9
+AUX alevt-1.6.2-libpng15.patch 183 BLAKE2B a50dfcd01e7bb0e75206bae94e46cb463580284205a0d58d72d4b77b6c1d5b8ec066247d733ec95218f6c02c4208e814e19011ef205e6831f794629e6b0a7b15 SHA512 c445d02a782ff9d3b9b92418a11ef08af2c3062234ea6d3b1111cfbed41447cfa6d3c67fae8274acd372ca3f751e5414953df283babee1fb70b9fedd75029763
+AUX alevt-1.6.2-respectflags.patch 1378 BLAKE2B e337cdac7339238bedad7abe500805d2e7a80dd1af49a6d1edcce3113f252b25d62b38681349d73f4c15c09b1d9a7ec85f5c8b123ab57262d66de94d009652ee SHA512 50350fcb1c4a9e4b44c9cbfcb5d4ca20140f9ef6f8ec0b7031a03658198e3b107ebe9a837a97978107b326ea920e1edf2e11c1df5fb0d70e5756a131b75a28f6
 DIST alevt-1.6.2.tar.gz 133234 BLAKE2B f252fb2ce1fbbad6c1aeb7649fea8b83aacfb62c38b7efa205680b32ad3c5dd7e60efa8be754c42040488860a59ff8a1cee235cf5adb75a5c738a503ee369db1 SHA512 8ddc0b03065b186bff8b705ec6ee8581460c4da4e65f97d15915d3bf708c7898661f61fa5fe004c7634adc9f850747b3fa08fe9ec94a5155482fcda479a884ed
-EBUILD alevt-1.6.2.ebuild 1015 BLAKE2B 6e8d7a0154f11fe4dccc9e222c5e7a865a1c82e08fd3657dc43399fe3bcee8b4d41cbc5c7dcebdae4e71a60b540283f68df4c12c22467ab24978a2003a876224 SHA512 67b43f695ca17db2582f6887464074e61d069a4ee049a500b590f234fa89621abbf6fc7a1fca2e075c61720474ef5d2c479ea0484c838f89b4cedf3704fe959f
+EBUILD alevt-1.6.2.ebuild 872 BLAKE2B d4f181ac1b4fcd2ed9db1bcd21ff80ff0a435f2b9c84d141f3b164a76ceb10cc4f2928d2256f53002bdd805a04979f6a83b6261465476b9d26ee0dbd372f96c2 SHA512 5b7ec693f2c06e2551b219f952d09c23c427255a978a620a221f54b7d16fec311d97bd4602bffb950dc2793aa102c58dfead662c75b00f12af489ee0a8609bf5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index d93fd6f0ccb3..efa778cbc210 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Teletext viewer for X11"
 HOMEPAGE="http://www.goron.de/~froese/"
@@ -11,37 +12,30 @@ SRC_URI="http://www.goron.de/~froese/alevt/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
+RESTRICT="strip"
 
-RDEPEND="x11-libs/libX11
-	>=media-libs/libpng-1.4"
+RDEPEND="
+	x11-libs/libX11
+	media-libs/libpng:="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-RESTRICT="strip"
-
-src_prepare() {
-	cp -va Makefile{,.orig}
+PATCHES=(
+	"${FILESDIR}"/${P}-respectflags.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+)
 
-	epatch \
-		"${FILESDIR}"/${P}-respectflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	emake CC="$(tc-getCC)"
+src_configure() {
+	append-cflags -fno-strict-aliasing
+	tc-export BUILD_CC CC
 }
 
 src_install() {
 	dobin alevt alevt-cap alevt-date
 	doman alevt.1x alevt-date.1 alevt-cap.1
-	dodoc CHANGELOG README
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins contrib/mini-alevt.xpm alevt.xpm
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins contrib/icon48x48.xpm alevt.xpm
+	einstalldocs
 
+	newicon -s 16 contrib/mini-alevt.xpm alevt.xpm
+	newicon -s 48 contrib/icon48x48.xpm alevt.xpm
 	make_desktop_entry alevt "AleVT" alevt
 }
diff --git a/media-video/alevt/files/alevt-1.6.2-libpng15.patch b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
index 337a6f7c709f..a134fd014051 100644
--- a/media-video/alevt/files/alevt-1.6.2-libpng15.patch
+++ b/media-video/alevt/files/alevt-1.6.2-libpng15.patch
@@ -1,5 +1,5 @@
---- exp-gfx.c
-+++ exp-gfx.c
+--- a/exp-gfx.c
++++ b/exp-gfx.c
 @@ -4,6 +4,8 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/media-video/alevt/files/alevt-1.6.2-respectflags.patch b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
index 368b0ff614cd..62716d0e8f43 100644
--- a/media-video/alevt/files/alevt-1.6.2-respectflags.patch
+++ b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
@@ -1,21 +1,25 @@
---- alevt-1.6.2/Makefile.orig	2007-12-03 06:19:54.000000000 +0100
-+++ alevt-1.6.2/Makefile	2009-05-14 10:17:39.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,4 @@
  VER=1.6.2
 -OPT=-O2 -s -w
  #OPT=-O -g
  DEFS=-DWITH_PNG
  FONT=vtxt
-@@ -11,7 +10,7 @@
+@@ -7,11 +6,10 @@
+ #USR_X11R6=/usr
+ MAN_DIR=man
+ #MAN_DIR=share/man
+-HOSTCC=$(CC)
  # a smaller and thinner font
  #FONT=neep9
  
 -CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
-+CFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
++CPPFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
  
  EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
  OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
-@@ -25,13 +24,13 @@
+@@ -25,13 +23,13 @@
  all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
  
  alevt: $(OBJS)
@@ -32,3 +36,12 @@
  
  font.o: font1.xbm font2.xbm
  fontsize.h: font1.xbm font2.xbm
+@@ -44,7 +42,7 @@
+ 	./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
+ 
+ bdf2xbm: bdf2xbm.c
+-	$(HOSTCC) bdf2xbm.c -o bdf2xbm
++	$(BUILD_CC) bdf2xbm.c -o bdf2xbm
+ 
+ alevt.1x: alevt.1x.in
+ 	sed s/VERSION/$(VER)/g <alevt.1x.in >alevt.1x