From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1677564-garchives=archives.gentoo.org@lists.gentoo.org>
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 E638E15807A
for <garchives@archives.gentoo.org>; Mon, 7 Oct 2024 19:12:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 20660E29E7;
Mon, 7 Oct 2024 19:12:12 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 pigeon.gentoo.org (Postfix) with ESMTPS id 08406E29E7
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Oct 2024 19:12:12 +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 3FF293430DC
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Oct 2024 19:12:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 97BA31293
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Oct 2024 19:12:09 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1728328310.55e6d66ba81287916b224aae9d87a438683c5c85.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.23.92.ebuild
X-VCS-Directories: media-gfx/zbar/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 55e6d66ba81287916b224aae9d87a438683c5c85
X-VCS-Branch: master
Date: Mon, 7 Oct 2024 19:12:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c2aa6b6d-5167-4114-a04b-9411bb4cec17
X-Archives-Hash: 29e36c9242e0f5b84366fcf7d49055b0
commit: 55e6d66ba81287916b224aae9d87a438683c5c85
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 19:10:26 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 19:11:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e6d66b
media-gfx/zbar: drop 0.23.92
Bug: https://bugs.gentoo.org/918543
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/zbar/Manifest | 1 -
media-gfx/zbar/zbar-0.23.92.ebuild | 235 -------------------------------------
2 files changed, 236 deletions(-)
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 4ddf45df9813..c125f86e8aa7 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513
DIST zbar-0.23.93.tar.gz 1009320 BLAKE2B 7476776fbb2b2dca4fb94e4eb8c6c5ca7795e32881e93c45002679bdc048cb0bf8d880d2b31f1469a95d718c6d027b7ee0da195951645478493d6f638ae186b5 SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f
diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild b/media-gfx/zbar/zbar-0.23.92.ebuild
deleted file mode 100644
index 5b8d7360950c..000000000000
--- a/media-gfx/zbar/zbar-0.23.92.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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? ( media-libs/libjpeg-turbo: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}]
- ')
- elibc_musl? ( sys-libs/argp-standalone )
- )"
-
-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}/${PN}-0.23.90-fix-gtk-default.patch"
- # TODO: upstream?
- "${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
- "${FILESDIR}/${PN}-0.23.90-fix-unittest.patch"
- "${FILESDIR}/${PN}-0.23.90-fix-qt5x11extras-detect.patch"
- "${FILESDIR}/${P}-py311-set-size.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 )
- CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)"
- 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
-
- if use test && use elibc_musl; then
- append-ldflags -largp
- 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
-}