summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-04-15 19:57:06 +0200
committerDavid Seifert <soap@gentoo.org>2019-04-16 21:36:06 +0200
commitad2cee1cf849f205059690bb4d146261abb9cb6b (patch)
treedf272a7ca2d7bfc1308e0df422ea6a6e8f22933f
parentsys-apps/systemd: depend on sys-devel/m4 (diff)
downloadgentoo-ad2cee1cf849f205059690bb4d146261abb9cb6b.tar.gz
gentoo-ad2cee1cf849f205059690bb4d146261abb9cb6b.tar.bz2
gentoo-ad2cee1cf849f205059690bb4d146261abb9cb6b.zip
app-cdr/cddetect: EAPI=7 bump
Closes: https://github.com/gentoo/gentoo/pull/11699 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--app-cdr/cddetect/cddetect-2.1.ebuild12
-rw-r--r--app-cdr/cddetect/files/cddetect-2.1-fix-include.patch9
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 5de6bf19692a..ed051629ee1b 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 000000000000..77386abd1bc6
--- /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,