From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B58C9138350 for ; Mon, 24 Feb 2020 18:07:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD0A3E0891; Mon, 24 Feb 2020 18:07:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D2F4E0891 for ; Mon, 24 Feb 2020 18:07:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E23D034F1D8 for ; Mon, 24 Feb 2020 18:07:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA3EA108 for ; Mon, 24 Feb 2020 18:07:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1582567662.25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/Manifest media-gfx/zbar/zbar-0.20.1-r2.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb X-VCS-Branch: master Date: Mon, 24 Feb 2020 18:07:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44268599-ec6a-4e47-ba94-f90e022022d1 X-Archives-Hash: f455f52d2b551b3291bc94e536ec6ad8 commit: 25ce6daf5d2bc9c97993d9cb4b6a3bd16ede1ffb Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 24 18:07:08 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 24 18:07:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ce6daf media-gfx/zbar: Drop 0.20.1-r2 Bug: https://bugs.gentoo.org/689406 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/zbar/Manifest | 1 - media-gfx/zbar/zbar-0.20.1-r2.ebuild | 168 ----------------------------------- 2 files changed, 169 deletions(-) diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 8d5d753531a..3da8925c591 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,2 +1 @@ -DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b 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 5aba21e790d..00000000000 --- 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 -}