From 2bd95e189e829f2282bea13b6d7b67c2b256ed6a Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 26 Aug 2018 09:26:51 +0200
Subject: media-video/ccextractor: EAPI-6 bump, HOMEPAGE, cleanup

Package-Manager: Portage-2.3.48, Repoman-2.3.10
---
 media-video/ccextractor/ccextractor-0.85-r1.ebuild | 16 ++---
 .../ccextractor/files/ccextractor-0.85-cmake.patch | 76 ++++++++++++++++++++++
 .../files/ccextractor-0.85-makefile.patch          | 76 ----------------------
 3 files changed, 81 insertions(+), 87 deletions(-)
 create mode 100644 media-video/ccextractor/files/ccextractor-0.85-cmake.patch
 delete mode 100644 media-video/ccextractor/files/ccextractor-0.85-makefile.patch

(limited to 'media-video')

diff --git a/media-video/ccextractor/ccextractor-0.85-r1.ebuild b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
index 35c0f63e14fe..aad1f505d1f3 100644
--- a/media-video/ccextractor/ccextractor-0.85-r1.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
+HOMEPAGE="https://www.ccextractor.org/"
 SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
 
 LICENSE="GPL-2"
@@ -24,10 +24,4 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}/src"
 
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/media-video/ccextractor/files/ccextractor-0.85-cmake.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
new file mode 100644
index 000000000000..2fcf6cfee4b0
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
@@ -0,0 +1,76 @@
+--- a/CMakeLists.txt	2017-07-25 12:22:29.294144514 -0600
++++ b/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
+@@ -25,14 +25,13 @@
+ include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
+ include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
+ 
+ # Adding some platform specific library path
+ link_directories (/opt/local/lib)
+ link_directories (/usr/local/lib)
+ 
+-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_FILE_OFFSET_BITS=64")
+ add_subdirectory (lib_ccx)
+ 
+ aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
+@@ -43,24 +42,8 @@
+ set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 
+-
+-find_package (PkgConfig)
+-if(PKG_CONFIG_FOUND)
+-  pkg_check_modules(PNG libpng )
+-  if(PNG_FOUND)
+-    set (EXTRA_LIBS ${EXTRA_LIBS} png)
+-  else (PNG_FOUND)
+-    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-  endif(PNG_FOUND)
+-else(PKG_CONFIG_FOUND)
+-    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-endif (PKG_CONFIG_FOUND)
++set (EXTRA_LIBS ${EXTRA_LIBS} png)
++set (EXTRA_LIBS ${EXTRA_LIBS} z)
+ 
+ ########################################################
+ # Build using FFmpeg libraries
+--- a/lib_ccx/CMakeLists.txt	2017-07-25 12:32:32.803190443 -0600
++++ b/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
+@@ -1,6 +1,6 @@
+ cmake_policy (SET CMP0037 NEW)
+ 
+-set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ 
+ if (WITH_FFMPEG)
+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
+@@ -37,20 +37,3 @@
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-
+-
+-file (GLOB HeaderFiles *.h)
+-file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
+-                  "includedir=\${prefix}/include\n"
+-                  "libdir=\${prefix}/lib\n\n"
+-                  "Name: ccx\n"
+-                  "Description: Closed Caption Extraction library\n"
+-                  "Version: 0.75\n"
+-                  "Cflags: -I\${includedir}/\n"
+-                  "Libs: -L\${libdir} -lccx -lpng\n"
+-                  "Libs.private: -lpng\n"
+-                  )
+-
+-install (TARGETS ccx DESTINATION lib)
+-install (FILES ${HeaderFiles} DESTINATION include)
+-install (FILES ccx.pc DESTINATION lib/pkgconfig)
diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
deleted file mode 100644
index 6937869180de..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- ccextractor/src/CMakeLists.txt.orig	2017-07-25 12:22:29.294144514 -0600
-+++ ccextractor/src/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
-@@ -25,14 +25,13 @@
- include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
- include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
- aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
--aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
- aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
- 
- # Adding some platform specific library path
- link_directories (/opt/local/lib)
- link_directories (/usr/local/lib)
- 
--set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
-+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_FILE_OFFSET_BITS=64")
- add_subdirectory (lib_ccx)
- 
- aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
-@@ -43,24 +42,8 @@
- set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
- endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- 
--
--find_package (PkgConfig)
--if(PKG_CONFIG_FOUND)
--  pkg_check_modules(PNG libpng )
--  if(PNG_FOUND)
--    set (EXTRA_LIBS ${EXTRA_LIBS} png)
--  else (PNG_FOUND)
--    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
--    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
--  endif(PNG_FOUND)
--else(PKG_CONFIG_FOUND)
--    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
--    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
--endif (PKG_CONFIG_FOUND)
-+set (EXTRA_LIBS ${EXTRA_LIBS} png)
-+set (EXTRA_LIBS ${EXTRA_LIBS} z)
- 
- ########################################################
- # Build using FFmpeg libraries
---- ccextractor/src/lib_ccx/CMakeLists.txt.orig	2017-07-25 12:32:32.803190443 -0600
-+++ ccextractor/src/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
-@@ -1,6 +1,6 @@
- cmake_policy (SET CMP0037 NEW)
- 
--set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
-+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- 
- if (WITH_FFMPEG)
-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
-@@ -37,20 +37,3 @@
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
- endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--
--
--file (GLOB HeaderFiles *.h)
--file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
--                  "includedir=\${prefix}/include\n"
--                  "libdir=\${prefix}/lib\n\n"
--                  "Name: ccx\n"
--                  "Description: Closed Caption Extraction library\n"
--                  "Version: 0.75\n"
--                  "Cflags: -I\${includedir}/\n"
--                  "Libs: -L\${libdir} -lccx -lpng\n"
--                  "Libs.private: -lpng\n"
--                  )
--
--install (TARGETS ccx DESTINATION lib)
--install (FILES ${HeaderFiles} DESTINATION include)
--install (FILES ccx.pc DESTINATION lib/pkgconfig)
-- 
cgit v1.2.3-65-gdbad