1 |
commit: 376733c6e79af63bc5d5a436cf8ef0d80d4a05f4 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 11 19:21:57 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 11 19:46:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376733c6 |
7 |
|
8 |
app-text/cuneiform: Use sub-slot operators for imagemagick |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/3907 |
12 |
|
13 |
app-text/cuneiform/cuneiform-1.1.0-r1.ebuild | 53 --------------------------- |
14 |
app-text/cuneiform/cuneiform-1.1.0-r2.ebuild | 54 ++++++++++++++++++++++++++++ |
15 |
2 files changed, 54 insertions(+), 53 deletions(-) |
16 |
|
17 |
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild |
18 |
deleted file mode 100644 |
19 |
index 42e1207449..0000000000 |
20 |
--- a/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,53 +0,0 @@ |
23 |
-# Copyright 1999-2012 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI="4" |
28 |
-inherit cmake-utils versionator |
29 |
- |
30 |
-PV_MAJ=$(get_version_component_range 1-2) |
31 |
-MY_P=${PN}-linux-${PV} |
32 |
- |
33 |
-DESCRIPTION="An enterprise quality optical character recognition (OCR) engine by Cognitive Technologies" |
34 |
-HOMEPAGE="https://launchpad.net/cuneiform-linux" |
35 |
-SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2" |
36 |
- |
37 |
-LICENSE="BSD" |
38 |
-SLOT="0" |
39 |
-KEYWORDS="~amd64 ~x86" |
40 |
- |
41 |
-IUSE="debug +imagemagick graphicsmagick" |
42 |
- |
43 |
-REQUIRED_USE="^^ ( imagemagick graphicsmagick )" |
44 |
- |
45 |
-RDEPEND="imagemagick? ( media-gfx/imagemagick ) |
46 |
- graphicsmagick? ( media-gfx/graphicsmagick )" |
47 |
-DEPEND=">=dev-util/cmake-2.6.2 |
48 |
- ${RDEPEND}" |
49 |
- |
50 |
-DOCS="readme.txt" |
51 |
- |
52 |
-S=${WORKDIR}/${MY_P} |
53 |
- |
54 |
-src_prepare(){ |
55 |
- epatch "${FILESDIR}/c-assert.diff" |
56 |
- epatch "${FILESDIR}/libm.diff" |
57 |
- if use graphicsmagick; then |
58 |
- epatch "${FILESDIR}/graphicsmagick.diff" |
59 |
- fi |
60 |
- # respect LDFLAGS |
61 |
- sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \ |
62 |
- "${S}/cuneiform_src/CMakeLists.txt" || die "failed to sed for LDFLAGS" |
63 |
- # Fix automagic dependencies / linking |
64 |
- if ! use imagemagick; then |
65 |
- sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \ |
66 |
- "${S}/cuneiform_src/CMakeLists.txt" \ |
67 |
- || die "Sed for ImageMagick automagic dependency failed." |
68 |
- fi |
69 |
-} |
70 |
- |
71 |
-src_install() { |
72 |
- #default |
73 |
- cmake-utils_src_install |
74 |
- doman "${FILESDIR}/${PN}.1" |
75 |
-} |
76 |
|
77 |
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild |
78 |
new file mode 100644 |
79 |
index 0000000000..564bbd04d8 |
80 |
--- /dev/null |
81 |
+++ b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild |
82 |
@@ -0,0 +1,54 @@ |
83 |
+# Copyright 1999-2017 Gentoo Foundation |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+# $Id$ |
86 |
+ |
87 |
+EAPI=6 |
88 |
+ |
89 |
+inherit cmake-utils versionator |
90 |
+ |
91 |
+PV_MAJ=$(get_version_component_range 1-2) |
92 |
+MY_P=${PN}-linux-${PV} |
93 |
+ |
94 |
+DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies" |
95 |
+HOMEPAGE="https://launchpad.net/cuneiform-linux" |
96 |
+SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2" |
97 |
+ |
98 |
+LICENSE="BSD" |
99 |
+SLOT="0" |
100 |
+KEYWORDS="~amd64 ~x86" |
101 |
+ |
102 |
+IUSE="debug graphicsmagick" |
103 |
+ |
104 |
+RDEPEND=" |
105 |
+ !graphicsmagick? ( media-gfx/imagemagick:= ) |
106 |
+ graphicsmagick? ( media-gfx/graphicsmagick:= )" |
107 |
+DEPEND="${RDEPEND}" |
108 |
+ |
109 |
+S=${WORKDIR}/${MY_P} |
110 |
+ |
111 |
+DOCS=( readme.txt ) |
112 |
+PATCHES=( |
113 |
+ "${FILESDIR}/c-assert.diff" |
114 |
+ "${FILESDIR}/libm.diff" |
115 |
+) |
116 |
+ |
117 |
+src_prepare(){ |
118 |
+ use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" ) |
119 |
+ cmake-utils_src_prepare |
120 |
+ |
121 |
+ # respect LDFLAGS |
122 |
+ sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \ |
123 |
+ cuneiform_src/CMakeLists.txt || die "failed to sed for LDFLAGS" |
124 |
+ |
125 |
+ # Fix automagic dependencies / linking |
126 |
+ if use graphicsmagick; then |
127 |
+ sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \ |
128 |
+ cuneiform_src/CMakeLists.txt \ |
129 |
+ || die "Sed for ImageMagick automagic dependency failed." |
130 |
+ fi |
131 |
+} |
132 |
+ |
133 |
+src_install() { |
134 |
+ cmake-utils_src_install |
135 |
+ doman "${FILESDIR}/${PN}.1" |
136 |
+} |