From b9d2f30f03617dabfc30aaf49017ed5336d06981 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 11 Feb 2017 20:21:52 +0100 Subject: media-gfx/zbar: Depend on virtual/imagemagick-tools Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3907 --- media-gfx/zbar/zbar-0.10-r5.ebuild | 72 --------------------- media-gfx/zbar/zbar-0.10-r6.ebuild | 70 ++++++++++++++++++++ media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild | 94 +++++++++++++++++++++++++++ media-gfx/zbar/zbar-0.10_p20121015.ebuild | 96 ---------------------------- 4 files changed, 164 insertions(+), 168 deletions(-) delete mode 100644 media-gfx/zbar/zbar-0.10-r5.ebuild create mode 100644 media-gfx/zbar/zbar-0.10-r6.ebuild create mode 100644 media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild delete mode 100644 media-gfx/zbar/zbar-0.10_p20121015.ebuild (limited to 'media-gfx/zbar') diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r5.ebuild deleted file mode 100644 index 34c55306ec3b..000000000000 --- a/media-gfx/zbar/zbar-0.10-r5.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils flag-o-matic python-single-r1 - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="http://zbar.sourceforge.net/" -SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" - -RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) - imagemagick? ( - || ( media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] ) ) - jpeg? ( virtual/jpeg:0 ) - python? ( ${PYTHON_DEPS} - gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) - qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) - X? ( x11-libs/libXext - xv? ( x11-libs/libXv ) )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \ - "${FILESDIR}"/${P}-errors.patch \ - "${FILESDIR}"/${P}-python-crash.patch \ - "${FILESDIR}"/${P}-v4l2-uvcvideo.patch - - use python && python_fix_shebang examples/upcrpc.py test/*.py - - sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 - eautoreconf -} - -src_configure() { - append-cppflags -DNDEBUG - econf \ - $(use_with jpeg) \ - $(use_with gtk) \ - $(use_with imagemagick) \ - $(use_with python) \ - $(use_with qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable threads pthread) \ - $(use_with X x) \ - $(use_with xv xv) \ - $(use_enable v4l video) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc HACKING NEWS README TODO - rm -r "${ED}"/usr/share/doc/${PN} - prune_libtool_files --all -} diff --git a/media-gfx/zbar/zbar-0.10-r6.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild new file mode 100644 index 000000000000..f3ca161657e0 --- /dev/null +++ b/media-gfx/zbar/zbar-0.10-r6.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils flag-o-matic python-single-r1 + +DESCRIPTION="Library and tools for reading barcodes from images or video" +HOMEPAGE="http://zbar.sourceforge.net/" +SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" + +RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) + imagemagick? ( virtual/imagemagick-tools ) + jpeg? ( virtual/jpeg:0 ) + python? ( ${PYTHON_DEPS} + gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) + qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + X? ( x11-libs/libXext + xv? ( x11-libs/libXv ) )" +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \ + "${FILESDIR}"/${P}-errors.patch \ + "${FILESDIR}"/${P}-python-crash.patch \ + "${FILESDIR}"/${P}-v4l2-uvcvideo.patch + + use python && python_fix_shebang examples/upcrpc.py test/*.py + + sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 + eautoreconf +} + +src_configure() { + append-cppflags -DNDEBUG + econf \ + $(use_with jpeg) \ + $(use_with gtk) \ + $(use_with imagemagick) \ + $(use_with python) \ + $(use_with qt4 qt) \ + $(use_enable static-libs static) \ + $(use_enable threads pthread) \ + $(use_with X x) \ + $(use_with xv xv) \ + $(use_enable v4l video) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc HACKING NEWS README TODO + rm -r "${ED}"/usr/share/doc/${PN} + prune_libtool_files --all +} diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild new file mode 100644 index 000000000000..e0e063cd122c --- /dev/null +++ b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 + +DESCRIPTION="Library and tools for reading barcodes from images or video" +HOMEPAGE="http://zbar.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv" + +CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) + imagemagick? ( virtual/imagemagick-tools ) + jpeg? ( virtual/jpeg:0 ) + python? ( ${PYTHON_DEPS} + gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) + qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + X? ( x11-libs/libXext + xv? ( x11-libs/libXv ) )" +REPEND="${CDEPEND} + java? ( >=virtual/jre-1.4 ) " +DEPEND="${CDEPEND} + java? ( >=virtual/jdk-1.4 ) + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_setup() { + use python && python-single-r1_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + #vcs-snapshot doesn't work on .zip + default + mv * ${P} || die +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.10-errors.patch \ + "${FILESDIR}"/${PN}-0.10-python-crash.patch \ + "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch + + 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 + eautoreconf +} + +src_configure() { + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + append-cppflags -DNDEBUG + econf \ + $(use_with java) \ + $(use_with jpeg) \ + $(use_with gtk) \ + $(use_with imagemagick) \ + $(use_with python) \ + $(use_with qt4 qt) \ + $(use_enable static-libs static) \ + $(use_enable threads pthread) \ + $(use_with X x) \ + $(use_with xv xv) \ + $(use_enable v4l video) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc HACKING NEWS README TODO + rm -r "${ED}"/usr/share/doc/${PN} + prune_libtool_files --all +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015.ebuild deleted file mode 100644 index 8a10c4ba8d5f..000000000000 --- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="http://zbar.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv" - -CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) - imagemagick? ( - || ( media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] ) ) - jpeg? ( virtual/jpeg:0 ) - python? ( ${PYTHON_DEPS} - gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) - qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) - X? ( x11-libs/libXext - xv? ( x11-libs/libXv ) )" -REPEND="${CDEPEND} - java? ( >=virtual/jre-1.4 ) " -DEPEND="${CDEPEND} - java? ( >=virtual/jdk-1.4 ) - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_setup() { - use python && python-single-r1_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - #vcs-snapshot doesn't work on .zip - default - mv * ${P} || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.10-errors.patch \ - "${FILESDIR}"/${PN}-0.10-python-crash.patch \ - "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch - - 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 - eautoreconf -} - -src_configure() { - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - append-cppflags -DNDEBUG - econf \ - $(use_with java) \ - $(use_with jpeg) \ - $(use_with gtk) \ - $(use_with imagemagick) \ - $(use_with python) \ - $(use_with qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable threads pthread) \ - $(use_with X x) \ - $(use_with xv xv) \ - $(use_enable v4l video) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc HACKING NEWS README TODO - rm -r "${ED}"/usr/share/doc/${PN} - prune_libtool_files --all -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} -- cgit v1.2.3-65-gdbad