From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- media-gfx/zbar/Manifest | 4 +- media-gfx/zbar/zbar-0.20.1-r2.ebuild | 168 ----------------------------------- media-gfx/zbar/zbar-0.23-r1.ebuild | 2 +- 3 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 media-gfx/zbar/zbar-0.20.1-r2.ebuild (limited to 'media-gfx/zbar') diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index af7c283a4248..54bd8c86cc17 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -5,8 +5,6 @@ AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1 -DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b -EBUILD zbar-0.20.1-r2.ebuild 3795 BLAKE2B a2d47958dd6175ab9bad3f4cfb34e14cb41ff8265848784ade15d5e7de7e4d105d206b0a34739de7119dd35398cdc3f041a6917734234ad0dab9a3d34ca90e30 SHA512 f2fe964c7196ac539aaf95324855b024f594461af471d9bcbb4d611f76b99a25ee430616a2213398beb1e25a66ea511a816ecd0b711be08b8b54ef9cd2f0e616 -EBUILD zbar-0.23-r1.ebuild 5032 BLAKE2B ff4c538a9afacc4007dee2b186cdf5dbf086c93f7915305b6d882b5e326cace8bc25942475b6bb64ce4915c04e08dd4730c7ed537ef5fee3632e664c4806a064 SHA512 f15df43d499480c3d7c85f6207ee3cef58609d5d8723fce35f4c027e136efe9fc8277576a307e8ecd5b9fdb356402bf0dfd38f5e4ed66d908946cf74ec0611f9 +EBUILD zbar-0.23-r1.ebuild 5030 BLAKE2B 53eda120af7cfab90e0894f8e8e07a92f2a45b0c4e4187e161ba877d49bfa044f9c207c7f6123ef3605bca451aa8f56f5a4537eb29d96a4474f8e251d44c9991 SHA512 6968f47c8a701b8d97c4abecccad03c26ba9e52cd58247a89ad34a4c1817e7d46763757dc4e92647ea3dbf637496397c85842de141aa0261b62665824d6afe95 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19 diff --git a/media-gfx/zbar/zbar-0.20.1-r2.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild deleted file mode 100644 index 5aba21e790d8..000000000000 --- a/media-gfx/zbar/zbar-0.20.1-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" - -IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( X ${PYTHON_REQUIRED_USE} ) -" - -COMMON_DEPEND=" - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - gtk? ( - $(python_gen_cond_dep ' - >=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}] - ') - ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - v4l? ( media-libs/libv4l:0= ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8 ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils ) - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/junit:4 - dev-java/hamcrest-core:1.3 - ) - ) - test? ( ${PYTHON_DEPS} ) -" - -PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch ) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch" - fi - - use python && python_fix_shebang examples/upcrpc.py test/*.py - java-pkg-opt-2_src_prepare - - sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \ - -e '/^AM_CFLAGS=/s: -Werror::' \ - -i configure.ac || die - sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ - -i java/Makefile.am || die - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with gtk) - $(multilib_native_use_with graphicsmagick graphicsmagick) - $(multilib_native_use_with imagemagick) - $(multilib_native_use_with java) - $(use_with jpeg) - $(multilib_native_use_with python python2) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable v4l video) - $(use_with X x) - $(use_with X xshm) - $(use_with xv xv) - ) - - if multilib_is_native_abi; then - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" - if use test ; then # bug 629078 - java-pkg_append_ CLASSPATH . - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) - fi - fi - if use qt5; then - myeconfargs+=( - $(use_with qt5 qt) - $(use_with qt5) - ) - else - myeconfargs+=( --without-qt ) - fi - else - myeconfargs+=( --without-qt ) - fi - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems - # https://bugs.gentoo.org/672184 - mkdir gtk pygtk qt test zbarcam || die -} - -src_test() { - virtx multilib-minimal_src_test -} - -src_install() { - if use qt5; then - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/zbar/QZBar.h - /usr/include/zbar/QZBarImage.h - ) - fi - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild index 87656810dce6..015ed0d88df6 100644 --- a/media-gfx/zbar/zbar-0.23-r1.ebuild +++ b/media-gfx/zbar/zbar-0.23-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" -- cgit v1.2.3