diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2021-02-11 20:34:23 +0100 |
|---|---|---|
| committer |   Ben Kohler <bkohler@gentoo.org> | 2021-02-12 07:44:36 -0600 |
| commit | e81771fa9ff1f899e22c045f20cb724815db8a43 (patch) | |
| tree | f75bf45ff854b684e4789a0e33c5bb926b70a70a /app-text/cuneiform/cuneiform-1.1.0-r3.ebuild | |
| parent | app-crypt/dieharder: Apply gcc-10 workaround and cross-compile patch (diff) | |
| download | gentoo-e81771fa9ff1f899e22c045f20cb724815db8a43.tar.gz gentoo-e81771fa9ff1f899e22c045f20cb724815db8a43.tar.bz2 gentoo-e81771fa9ff1f899e22c045f20cb724815db8a43.zip | |
app-text/cuneiform: Port to EAPI 7
* Apply gcc-10 workaround (dead upstream)
Closes: https://bugs.gentoo.org/729530
Closes: https://bugs.gentoo.org/760830
Closes: https://bugs.gentoo.org/707636
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'app-text/cuneiform/cuneiform-1.1.0-r3.ebuild')
| -rw-r--r-- | app-text/cuneiform/cuneiform-1.1.0-r3.ebuild | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild index 53d1efd18b7b..3874e69f95e6 100644 --- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild +++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils versionator +inherit cmake flag-o-matic -PV_MAJ=$(get_version_component_range 1-2) +PV_MAJ=$(ver_cut 1-2) MY_P=${PN}-linux-${PV} DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies" @@ -15,7 +15,6 @@ SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="debug graphicsmagick" RDEPEND=" @@ -25,21 +24,20 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -DOCS=( readme.txt ) PATCHES=( # From Fedora - "${FILESDIR}/c-assert.diff" - "${FILESDIR}/libm.diff" - "${FILESDIR}/${P}-fix_buffer_overflow.patch" - "${FILESDIR}/${P}-fix_buffer_overflow_2.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-gcc7.patch" - "${FILESDIR}/${P}-typos.patch" + "${FILESDIR}"/${P}-c-assert.patch + "${FILESDIR}"/${P}-libm.patch + "${FILESDIR}"/${P}-fix_buffer_overflow.patch + "${FILESDIR}"/${P}-fix_buffer_overflow_2.patch + "${FILESDIR}"/${P}-gcc6.patch + "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${P}-typos.patch ) src_prepare() { - use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" ) - cmake-utils_src_prepare + use graphicsmagick && PATCHES+=( "${FILESDIR}"/${P}-graphicsmagick.patch ) + cmake_src_prepare # respect LDFLAGS sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \ @@ -48,12 +46,16 @@ src_prepare() { # Fix automagic dependencies / linking if use graphicsmagick; then sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \ - cuneiform_src/CMakeLists.txt \ - || die "Sed for ImageMagick automagic dependency failed." + cuneiform_src/CMakeLists.txt || die fi } +src_configure() { + append-flags -fcommon + cmake_src_configure +} + src_install() { - cmake-utils_src_install - doman "${FILESDIR}/${PN}.1" + cmake_src_install + doman "${FILESDIR}"/${PN}.1 } |