Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
Date: Mon, 24 Feb 2020 18:07:58
Message-Id: 1582567662.25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb.asturm@gentoo
1 commit: 25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 24 18:07:08 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 24 18:07:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ce6daf
7
8 media-gfx/zbar: Drop 0.20.1-r2
9
10 Bug: https://bugs.gentoo.org/689406
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-gfx/zbar/Manifest | 1 -
15 media-gfx/zbar/zbar-0.20.1-r2.ebuild | 168 -----------------------------------
16 2 files changed, 169 deletions(-)
17
18 diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
19 index 8d5d753531a..3da8925c591 100644
20 --- a/media-gfx/zbar/Manifest
21 +++ b/media-gfx/zbar/Manifest
22 @@ -1,2 +1 @@
23 -DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
24 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
25
26 diff --git a/media-gfx/zbar/zbar-0.20.1-r2.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
27 deleted file mode 100644
28 index 5aba21e790d..00000000000
29 --- a/media-gfx/zbar/zbar-0.20.1-r2.ebuild
30 +++ /dev/null
31 @@ -1,168 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -PYTHON_COMPAT=( python2_7 )
37 -
38 -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
39 -
40 -DESCRIPTION="Library and tools for reading barcodes from images or video"
41 -HOMEPAGE="https://github.com/mchehab/zbar"
42 -SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="LGPL-2.1"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm x86"
47 -
48 -IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
49 -RESTRICT="!test? ( test )"
50 -REQUIRED_USE="
51 - python? ( ${PYTHON_REQUIRED_USE} )
52 - test? ( X ${PYTHON_REQUIRED_USE} )
53 -"
54 -
55 -COMMON_DEPEND="
56 - gtk? (
57 - dev-libs/glib:2[${MULTILIB_USEDEP}]
58 - x11-libs/gtk+:2[${MULTILIB_USEDEP}]
59 - )
60 - imagemagick? (
61 - !graphicsmagick? ( media-gfx/imagemagick:= )
62 - graphicsmagick? ( media-gfx/graphicsmagick:= )
63 - )
64 - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
65 - python? (
66 - ${PYTHON_DEPS}
67 - gtk? (
68 - $(python_gen_cond_dep '
69 - >=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
70 - ')
71 - )
72 - )
73 - qt5? (
74 - dev-qt/qtcore:5
75 - dev-qt/qtgui:5
76 - dev-qt/qtwidgets:5
77 - dev-qt/qtx11extras:5
78 - )
79 - v4l? ( media-libs/libv4l:0= )
80 - X? (
81 - x11-libs/libX11[${MULTILIB_USEDEP}]
82 - x11-libs/libXext[${MULTILIB_USEDEP}]
83 - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
84 - )
85 -"
86 -RDEPEND="${COMMON_DEPEND}
87 - java? ( >=virtual/jre-1.8 )
88 -"
89 -DEPEND="${COMMON_DEPEND}
90 - sys-devel/gettext
91 - virtual/pkgconfig
92 - gtk? ( dev-util/glib-utils )
93 - java? (
94 - >=virtual/jdk-1.8
95 - test? (
96 - dev-java/junit:4
97 - dev-java/hamcrest-core:1.3
98 - )
99 - )
100 - test? ( ${PYTHON_DEPS} )
101 -"
102 -
103 -PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
104 -
105 -pkg_setup() {
106 - if use python || use test; then
107 - python-single-r1_pkg_setup
108 - fi
109 - java-pkg-opt-2_pkg_setup
110 -}
111 -
112 -src_prepare() {
113 - default
114 -
115 - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
116 - eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
117 - fi
118 -
119 - use python && python_fix_shebang examples/upcrpc.py test/*.py
120 - java-pkg-opt-2_src_prepare
121 -
122 - sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
123 - -e '/^AM_CFLAGS=/s: -Werror::' \
124 - -i configure.ac || die
125 - sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
126 - -i java/Makefile.am || die
127 - eautoreconf
128 -}
129 -
130 -multilib_src_configure() {
131 - append-cppflags -DNDEBUG
132 -
133 - local myeconfargs=(
134 - $(use_with gtk)
135 - $(multilib_native_use_with graphicsmagick graphicsmagick)
136 - $(multilib_native_use_with imagemagick)
137 - $(multilib_native_use_with java)
138 - $(use_with jpeg)
139 - $(multilib_native_use_with python python2)
140 - $(use_enable static-libs static)
141 - $(use_enable threads pthread)
142 - $(use_enable v4l video)
143 - $(use_with X x)
144 - $(use_with X xshm)
145 - $(use_with xv xv)
146 - )
147 -
148 - if multilib_is_native_abi; then
149 - if use java; then
150 - export JAVACFLAGS="$(java-pkg_javac-args)"
151 - export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
152 - if use test ; then # bug 629078
153 - java-pkg_append_ CLASSPATH .
154 - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
155 - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
156 - fi
157 - fi
158 - if use qt5; then
159 - myeconfargs+=(
160 - $(use_with qt5 qt)
161 - $(use_with qt5)
162 - )
163 - else
164 - myeconfargs+=( --without-qt )
165 - fi
166 - else
167 - myeconfargs+=( --without-qt )
168 - fi
169 -
170 - ECONF_SOURCE=${S} \
171 - econf "${myeconfargs[@]}"
172 -
173 - # work around out-of-source build issues for multilib systems
174 - # https://bugs.gentoo.org/672184
175 - mkdir gtk pygtk qt test zbarcam || die
176 -}
177 -
178 -src_test() {
179 - virtx multilib-minimal_src_test
180 -}
181 -
182 -src_install() {
183 - if use qt5; then
184 - local MULTILIB_WRAPPED_HEADERS=(
185 - /usr/include/zbar/QZBar.h
186 - /usr/include/zbar/QZBarImage.h
187 - )
188 - fi
189 - multilib-minimal_src_install
190 -}
191 -
192 -multilib_src_install_all() {
193 - einstalldocs
194 - find "${D}" -name '*.la' -delete || die
195 -}
196 -
197 -pkg_preinst() {
198 - java-pkg-opt-2_pkg_preinst
199 -}