commit: ad2cee1cf849f205059690bb4d146261abb9cb6b Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Apr 15 17:57:06 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 19:36:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2cee1c
app-cdr/cddetect: EAPI=7 bump Closes: https://github.com/gentoo/gentoo/pull/11699 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> app-cdr/cddetect/cddetect-2.1.ebuild | 12 +++++------- app-cdr/cddetect/files/cddetect-2.1-fix-include.patch | 9 +++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app-cdr/cddetect/cddetect-2.1.ebuild b/app-cdr/cddetect/cddetect-2.1.ebuild index 5de6bf19692..ed051629ee1 100644 --- a/app-cdr/cddetect/cddetect-2.1.ebuild +++ b/app-cdr/cddetect/cddetect-2.1.ebuild @@ -1,23 +1,21 @@ -# 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="A tool for detecting the type of a CD/DVD without mounting it" +DESCRIPTION="Tool for detecting the type of a CD/DVD without mounting it" HOMEPAGE="http://www.bellut.net/projects.html"; SRC_URI="http://www.bellut.net/files/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" S=${WORKDIR} -src_prepare() { - sed -i -e '1i#include <limits.h>' ${PN}.c || die #337628 -} +PATCHES=( "${FILESDIR}"/"${P}"-fix-include.patch ) #337628 src_compile() { emake CC="$(tc-getCC)" CFLAGS="-Wall ${CFLAGS}" diff --git a/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch b/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch new file mode 100644 index 00000000000..77386abd1bc --- /dev/null +++ b/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/337628 + +--- a/cddetect.c ++++ b/cddetect.c +@@ -1,3 +1,4 @@ ++#include <limits.h> + /* big parts taken from cdfs (C) 1999, 2000, 2001 by Michiel Ronsse + * relesed under the GPL v.2 + * more parts taken from isoinfo/isodump (W) 1993 Eric Youngdale,
