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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF15B158089 for ; Fri, 29 Sep 2023 13:05:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8B8D2BC0B8; Fri, 29 Sep 2023 13:04:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B3802BC0B8 for ; Fri, 29 Sep 2023 13:04:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACB42335C8E for ; Fri, 29 Sep 2023 13:04:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06241FAC for ; Fri, 29 Sep 2023 13:04:18 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1695992652.235c87a514ce6b92326ae084c749dbc9c86b726c.arthurzam@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.23.90.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 235c87a514ce6b92326ae084c749dbc9c86b726c X-VCS-Branch: master Date: Fri, 29 Sep 2023 13:04:18 +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: c9a8c6d5-5f85-4949-b898-24532f42feb1 X-Archives-Hash: 52022dc9170382dfbf387ec5ec885864 commit: 235c87a514ce6b92326ae084c749dbc9c86b726c Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Sep 29 11:10:39 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 29 13:04:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235c87a5 media-gfx/zbar: drop 0.23.90 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33120 Signed-off-by: Arthur Zamarin gentoo.org> media-gfx/zbar/Manifest | 1 - media-gfx/zbar/zbar-0.23.90.ebuild | 229 ------------------------------------- 2 files changed, 230 deletions(-) diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 3cac58789899..bad02d9095d4 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,2 +1 @@ -DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513 diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild b/media-gfx/zbar/zbar-0.23.90.ebuild deleted file mode 100644 index 68bd3dce3e8e..000000000000 --- a/media-gfx/zbar/zbar-0.23.90.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" - -REQUIRED_USE=" - introspection? ( gtk ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - X? ( imagemagick ) - ) - xv? ( X )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - introspection? ( dev-libs/gobject-introspection ) - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) - ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) - 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} - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - ) - ) - test? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_USEDEP}] - ') - )" - -BDEPEND=" - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils ) - nls? ( - sys-devel/gettext - virtual/libiconv - )" - -DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) - -PATCHES=( - # git master - "${FILESDIR}/${P}-fix-gtk-default.patch" - # TODO: upstream? - "${FILESDIR}/${PN}-0.23_fix_python_detect.patch" - "${FILESDIR}/${P}-fix-unittest.patch" - "${FILESDIR}/${P}-fix-qt5x11extras-detect.patch" -) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if use python || use test; then - if use test; then - # make tests happy - # because one of the test requires loadable py module from the current ${BUILD_DIR} - sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ - -i test/Makefile.am.inc || die - fi - - python_fix_shebang \ - examples/*.py \ - test/{test_python,barcodetest}.py # test_pygtk.py — py2 only - fi - - if use java; then - java-pkg-opt-2_src_prepare - sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ - -i java/Makefile.am || die - fi - - # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead) - sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with dbus) - $(use_with gtk gtk gtk3) # avoid 'auto' - $(use_with jpeg) - $(multilib_native_use_with introspection gir) - $(multilib_native_use_with java) - $(multilib_native_use_with python python auto) - $(use_enable nls) - $(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 - # both must be enabled to use GraphicsMagick - if use imagemagick && use graphicsmagick; then - myeconfargs+=( - --with-graphicsmagick - --without-imagemagick - ) - elif ! use graphicsmagick && use imagemagick; then - myeconfargs+=( - --with-imagemagick - --without-graphicsmagick - ) - else - myeconfargs+=( - --without-imagemagick - --without-graphicsmagick - ) - fi - - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - if use test; then # bug 629078 - myeconfargs+=( --with-java-unit ) - 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+=( - --with-qt - --with-qt5 - ) - else - myeconfargs+=( --without-qt ) - fi - else - myeconfargs+=( - --without-graphicsmagick - --without-imagemagick - --without-qt - ) - - # zbarimg tests with native abi only - # (this option from the patch above, stay up to date) - use test && myeconfargs+=( --without-zbarimg-tests ) - fi - - # use bash (bug 721370) - CONFIG_SHELL='/bin/bash' \ - ECONF_SOURCE="${S}" \ - MOC="$(qt5_get_bindir)"/moc \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems (bug 672184) - mkdir qt 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() { - use java && java-pkg-opt-2_pkg_preinst -}