From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAB9D13997D for ; Sun, 10 Nov 2019 10:30:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9881E099B; Sun, 10 Nov 2019 10:30:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85DB1E099F for ; Sun, 10 Nov 2019 10:30:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA43F34CC14 for ; Sat, 9 Nov 2019 19:34:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F1B78AB for ; Sat, 9 Nov 2019 19:33:59 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1573328031.b0dc15366b6071842dc7a73e94304a7aa705c5ad.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subtitleripper/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild X-VCS-Directories: media-video/subtitleripper/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b0dc15366b6071842dc7a73e94304a7aa705c5ad X-VCS-Branch: master Date: Sat, 9 Nov 2019 19:33:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d68de350-5c33-4b57-a0cf-0169f5398124 X-Archives-Hash: 5fb4d868c27406718eb4b3d4da92c0d4 commit: b0dc15366b6071842dc7a73e94304a7aa705c5ad Author: Michał Górny gentoo org> AuthorDate: Sat Nov 9 19:27:07 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 9 19:33:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0dc1536 media-video/subtitleripper: Bump to EAPI 7 Bug: https://bugs.gentoo.org/697264 Signed-off-by: Michał Górny gentoo.org> .../subtitleripper/subtitleripper-0.3.4-r4.ebuild | 41 +++++++++++++--------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild index 226c2b9531a..e547faecaf7 100644 --- a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild +++ b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit versionator eutils toolchain-funcs +inherit toolchain-funcs -MY_PV="$(replace_version_separator 2 "-")" +MY_PV="$(ver_rs 2 "-")" DESCRIPTION="DVD Subtitle Ripper for Linux" HOMEPAGE="http://subtitleripper.sourceforge.net/" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc ppc64 x86" SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz" + +LICENSE="GPL-2" SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" + RDEPEND=">=media-libs/netpbm-10.41.0 media-libs/libpng sys-libs/zlib @@ -22,23 +24,28 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" -src_unpack() { - unpack ${A} - cd "${S}" +PATCHES=( + "${FILESDIR}"/${P}-linkingorder.patch + "${FILESDIR}"/${P}-libpng.patch + "${FILESDIR}"/${P}-glibc210.patch + "${FILESDIR}"/${P}-respect-ldflags.patch +) + +src_prepare() { # PPM library is libnetppm - sed -i -e "s:ppm:netpbm:g" Makefile + sed -i -e "s:ppm:netpbm:g" Makefile || die # fix for bug 210435 - sed -i -e "s:#include :#include :g" spudec.c subtitle2pgm.c + sed -i -e "s:#include :#include :g" \ + spudec.c subtitle2pgm.c || die # we will install the gocrfilters into /usr/share/subtitleripper - sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt + sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' \ + pgm2txt || die + + default - epatch "${FILESDIR}/${P}-linkingorder.patch" - epatch "${FILESDIR}"/${P}-libpng.patch - epatch "${FILESDIR}"/${P}-glibc210.patch - # respect CC and LDFLAGS + # respect CC sed -i -e "s:CC =.*:CC = $(tc-getCC):" \ -e "/^CFLAGS/s: = :& ${CFLAGS} :" "${S}"/Makefile - epatch "${FILESDIR}"/${P}-respect-ldflags.patch } src_install () {