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: Sat, 29 Dec 2018 13:37:28
Message-Id: 1546090588.171f77b5e336fc38e73948f801cb5e2672675f7f.asturm@gentoo
1 commit: 171f77b5e336fc38e73948f801cb5e2672675f7f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 13:36:28 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 13:36:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171f77b5
7
8 media-gfx/zbar: Drop 0.10_p20121015-r3
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/zbar/Manifest | 1 -
14 media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 130 ---------------------------
15 2 files changed, 131 deletions(-)
16
17 diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
18 index b5bf4950fae..00a21a631d2 100644
19 --- a/media-gfx/zbar/Manifest
20 +++ b/media-gfx/zbar/Manifest
21 @@ -1,2 +1 @@
22 -DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
23 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
24
25 diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
26 deleted file mode 100644
27 index 6990df2d2b3..00000000000
28 --- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
29 +++ /dev/null
30 @@ -1,130 +0,0 @@
31 -# Copyright 1999-2018 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -PYTHON_COMPAT=( python2_7 )
37 -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
38 -
39 -DESCRIPTION="Library and tools for reading barcodes from images or video"
40 -HOMEPAGE="https://github.com/mchehab/zbar"
41 -SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
42 -
43 -LICENSE="LGPL-2.1"
44 -SLOT="0"
45 -KEYWORDS="amd64 ~arm x86"
46 -IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
47 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
48 - test? ( X ${PYTHON_REQUIRED_USE} )"
49 -
50 -CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
51 - x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
52 - imagemagick? ( virtual/imagemagick-tools )
53 - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
54 - python? (
55 - ${PYTHON_DEPS}
56 - gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
57 - )
58 - X? (
59 - x11-libs/libXext[${MULTILIB_USEDEP}]
60 - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
61 - )"
62 -RDEPEND="${CDEPEND}
63 - java? ( >=virtual/jre-1.4 )"
64 -DEPEND="${CDEPEND}
65 - java? ( >=virtual/jdk-1.4
66 - test? ( dev-java/junit:4
67 - dev-java/hamcrest-core:1.3 ) )
68 - test? ( ${PYTHON_DEPS} )
69 - app-arch/unzip
70 - sys-devel/gettext
71 - virtual/pkgconfig"
72 -
73 -pkg_setup() {
74 - if use python || use test; then
75 - python-single-r1_pkg_setup
76 - fi
77 - java-pkg-opt-2_pkg_setup
78 -}
79 -
80 -src_unpack() {
81 - #vcs-snapshot doesn't work on .zip
82 - default
83 - mv * ${P} || die
84 -}
85 -
86 -src_prepare() {
87 - eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
88 - "${FILESDIR}"/${PN}-0.10-python-crash.patch \
89 - "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
90 -
91 - # fix use of deprecated qt4 function, bug 572488
92 - sed -e 's:numBytes:byteCount:g' \
93 - -i "${S}"/include/zbar/QZBarImage.h || die
94 -
95 - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
96 - eapply "${FILESDIR}/${P}-ImageMagick-7.patch"
97 - fi
98 -
99 - use python && python_fix_shebang examples/upcrpc.py test/*.py
100 - java-pkg-opt-2_src_prepare
101 -
102 - sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
103 - -e '/^AM_CFLAGS=/s: -Werror::' \
104 - -i configure.ac || die
105 - sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
106 - -i java/Makefile.am
107 - eautoreconf
108 -}
109 -
110 -multilib_src_configure() {
111 - if multilib_is_native_abi && use java; then
112 - export JAVACFLAGS="$(java-pkg_javac-args)"
113 - export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
114 - if use test ; then # bug 629078
115 - java-pkg_append_ CLASSPATH .
116 - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
117 - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
118 - fi
119 - fi
120 -
121 - append-cppflags -DNDEBUG
122 -
123 - # different flags for image/graphics magick (bug 552350)
124 - myimagemagick="--without-imagemagick"
125 - has_version media-gfx/imagemagick &&
126 - myimagemagick="$(multilib_native_use_with imagemagick)"
127 - mygraphicsmagick="--without-graphicsmagick"
128 - has_version media-gfx/graphicsmagick &&
129 - mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
130 - ECONF_SOURCE=${S} \
131 - econf \
132 - $(multilib_native_use_with java) \
133 - $(use_with jpeg) \
134 - $(use_with gtk) \
135 - ${myimagemagick} \
136 - ${mygraphicsmagick} \
137 - $(multilib_native_use_with python) \
138 - --without-qt \
139 - $(use_enable static-libs static) \
140 - $(use_enable threads pthread) \
141 - $(use_with X x) \
142 - $(use_with xv xv) \
143 - $(use_enable v4l video)
144 -
145 - # work-around out-of-source build issue
146 - mkdir gtk pygtk qt test || die
147 -}
148 -
149 -src_test() {
150 - virtx multilib-minimal_src_test
151 -}
152 -
153 -multilib_src_install_all() {
154 - dodoc HACKING NEWS README TODO
155 - find "${D}" -name '*.la' -delete || die
156 -}
157 -
158 -pkg_preinst() {
159 - java-pkg-opt-2_pkg_preinst
160 -}