gentoo resync : 15.12.2019

3 files changed, 68 insertions, 18 deletions

diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
index 18fc7e037a61..4053a68f11ba 100644
--- a/media-video/subtitler-yuv/Manifest
+++ b/media-video/subtitler-yuv/Manifest
@@ -1,3 +1,4 @@
+AUX subtitler-yuv-0.6.5-fix-build-system.patch 908 BLAKE2B c0c9e62378c409d29fc14ed3480d23c7d01f441499ea2ecfbd4c75f97c7fa9d794f1f2ac654d855f80268a4d0c9801f2250ae79523f1c64fd61520f691ac4c30 SHA512 f7166cbac4d70e915e39ba00fa6d74a9cc8b71edcbb64d90fbbf505afffb107fec5d87a8421944aaac76103ae106a091bc593443f22e1f8de0688d95ef453f0d
 DIST subtitler-yuv-0.6.5.tgz 568408 BLAKE2B 0e4ff441fbb75bafaf45b3bf3b234336e04dce90400fd1bfc65c2441c9406dca2ba6137c5e04e5b8e6140d1b55c6166f797a865ac88ea9e09cc58368ee9b0c24 SHA512 2dabb720896ef0c1bd54a7b8fdf4ab7097d95ba9e81608b713f4dd62c0f8a156d41bb7fe74cb5113f70f5390186fdea3e7d2e9add5d5748b677657ef356117dc
-EBUILD subtitler-yuv-0.6.5.ebuild 828 BLAKE2B 2f23654f8df7bc3050cf346e24e040a9f55c6f8ff3eaa4ed6d8ceda6471822de6e538761a353485a81e00f39feb937438a5aa44d66514cd73cee6276ead8a17f SHA512 4821e3e58a397cecbd6e26ae6987b5186c79c7e9b4671a52857b81e5a00886fb7c0d91820ac235345b6acb8f3f7f796b803138b47c477afe2f1b94578dc2ffd7
+EBUILD subtitler-yuv-0.6.5.ebuild 665 BLAKE2B a1258fcd0dbc73f3eb7ad8da29fbb01b378ef0748c848ecb1216f093a9def690052c267603a2e555ae69c7307f3b73081c23181b794ccd53a59c3d823f43105e SHA512 b8f1f74491fa39c7c8fa45618b55bd2615a253a1d6edb97ec6eb1ea6f3dbf60642f3fc6417f9cb664aacb8a615fe2923b7fcc8b10935a84d6c5b4eb3098d8ec1
 MISC metadata.xml 334 BLAKE2B da68c733a593f81e7a8096a93827aa43bccee5f9470fccdf66ffdc76a5bb29a9bbeaa163180559714d4c7dca2c7cdd69cd50054d36a79b725100fdaaf093df43 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de
diff --git a/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch b/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch
new file mode 100644
index 000000000000..da5ec86e40b3
--- /dev/null
+++ b/media-video/subtitler-yuv/files/subtitler-yuv-0.6.5-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,28 +1,7 @@
+ #need -O2 for io in beep.c
+-CFLAGS = -O2 -Wall
+-
+-#CC = gcc
+-#CC=/usr/local/bin/gcc
+-
+-SRC1 = \
+-subtitler-yuv.c \
+-color_processor.c \
+-frame_list.c \
+-load_font.c \
+-load_pictures.c \
+-load_ppml_file.c \
+-object_list.c \
+-parser.c \
+-text_processing.c \
+-external_programs.c \
+-x11.c
+-
+-SRC2 = \
+-process_wave.c
+-
++CFLAGS += -Wall
+ 
+ OBJECT1 = \
+-subtitler-yuv.o \
+ color_processor.o \
+ frame_list.o \
+ load_font.o \
+@@ -34,20 +13,11 @@
+ external_programs.o \
+ x11.o
+ 
+-OBJECT2 = \
+-process_wave.o
+-
+-LIBRARY1 = -lm -lXt -lXpm -lXaw
+-LIBRARY2 =
++LDLIBS = -lm -lXt -lX11 -lXaw
+ 
+ #$(XLIB) $(XAWLIB) $(XTOOLLIB) $(XLIB)
+ 
+-all:
+-	gcc $(CFLAGS) -c $(SRC1)
+-	gcc $(CFLAGS) -c $(SRC2)
+-
+-	gcc -o subtitler-yuv  -L/usr/X11R6/lib/ $(OBJECT1) $(LIBRARY1)
+-	gcc -o process_wave  -L/usr/X11R6/lib/ $(OBJECT2) $(LIBRARY2)
++subtitler-yuv: $(OBJECT1)
+ 
+ # DEPENDENCIES
+ 
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
index d1e7738874fe..37e21cbb86a2 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
+DESCRIPTION="for mjpegtools for adding subtitles, pictures & effects embedded in the picture"
 HOMEPAGE="http://panteltje.com/panteltje/subtitles/"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:= -O2:+=:' \
-		-e '/CFLAGS/s:gcc:$(CC):' \
-		-e 's:gcc -o:$(CC) $(LDFLAGS) -o:' \
-		-e 's:-L/usr/X11R6/lib/::' \
-		-e 's:-lXpm:-lX11:' \
-		Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake
 }
 
 src_install() {
 	dobin ${PN}
-	dodoc CHANGES HOWTO_USE_THIS README*
+	einstalldocs
+	dodoc HOWTO_USE_THIS
+
 	insinto /usr/share/${PN}
 	doins *.{ppm,ppml,zip}
 }