diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /media-gfx/zbar | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r-- | media-gfx/zbar/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/zbar/zbar-0.20.1-r1.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/zbar/zbar-0.20.1.ebuild | 161 |
3 files changed, 2 insertions, 164 deletions
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index ad74f040f13b..0b5867510540 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,6 +1,5 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 -EBUILD zbar-0.20.1-r1.ebuild 3725 BLAKE2B afedede5b3120e473e3d72d15f386a4931d318c096d338f070b65d7dbf9f722d6d292b5759b5a7d9f13e040ff7f54ff444e9c1d3603f0aa23333b770ab18fdd1 SHA512 182b93701cc615df4db4aa83e8ff8fe38ecafb2aa376ae69d3ee89f9fd86e0036e6f2bc8ce20c2ef9c52808bf815831b4e7ae3a7b8608c093fe92ce61dd4b4e4 -EBUILD zbar-0.20.1.ebuild 3691 BLAKE2B 189ed71aaefad1f83cf257ff7963198abb196fc0ada528f303f2d10ebe6564351c256328716dbf0f58a84cd02c2ec5acf64a505dff9611adb91f3ef68d1603d1 SHA512 6e9bc1e749fefc3d0502b5115f6f0f64ba70035916df793c0110d259d1a91f122dd34c11c2b387a192b7a0df2d7d59fd39955b8a900af9b423b93ed5cf78b4e4 +EBUILD zbar-0.20.1-r1.ebuild 3723 BLAKE2B 4cda360aa4207d10b9f23c6a3f4389f6a5e89ee6ed067ec59f1cf31875ab88b28ffd624e076774aaf425ebbc787de327f345e88b677a20c348cc4cef63be2760 SHA512 3fa329f034162bfac7eb0ef827ac23349eabff32698b147062a5828fad7ac0513ac840300e32757e9be72d373db617235a234c8d360588db2e3e4f8e126fa183 MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild index a374101200a2..1a03d35fa4d5 100644 --- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild +++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild @@ -12,7 +12,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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild deleted file mode 100644 index 700328f75383..000000000000 --- a/media-gfx/zbar/zbar-0.20.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2018 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" -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? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - 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 -} |