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 2790413832E for ; Tue, 26 Jul 2016 21:24:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1335AE0B32; Tue, 26 Jul 2016 21:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58EA2E0B32 for ; Tue, 26 Jul 2016 21:24:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D524340BE3 for ; Tue, 26 Jul 2016 21:24:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B74D77E3 for ; Tue, 26 Jul 2016 21:24:01 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1469568211.89e08e2711c6fa579da142c41e1a119ada919954.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/Manifest app-text/poppler/poppler-0.43.0.ebuild app-text/poppler/poppler-0.44.0.ebuild X-VCS-Directories: app-text/poppler/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 89e08e2711c6fa579da142c41e1a119ada919954 X-VCS-Branch: master Date: Tue, 26 Jul 2016 21:24:01 +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-Archives-Salt: f74bd290-3e82-43dd-a716-71a49471b3aa X-Archives-Hash: 3087f8cabf44a19c0f04a08c25a4d55f commit: 89e08e2711c6fa579da142c41e1a119ada919954 Author: Johannes Huber gentoo org> AuthorDate: Tue Jul 26 21:23:31 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Jul 26 21:23:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e08e27 app-text/poppler: Remove 0.4{3,4}.0 Package-Manager: portage-2.3.0 app-text/poppler/Manifest | 2 - app-text/poppler/poppler-0.43.0.ebuild | 144 --------------------------------- app-text/poppler/poppler-0.44.0.ebuild | 144 --------------------------------- 3 files changed, 290 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 440c7ff..5bad8c3 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,6 +1,4 @@ DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22 DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736 -DIST poppler-0.43.0.tar.xz 1671368 SHA256 c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456 SHA512 e00422a875be2e9b8b16a268d31d1080f609ce070f553b2db8001fc71efebe44183d5e63f45b1111a99b106548809b1fe8474aca7710c20bc4c654968d42508b WHIRLPOOL 7eec0e630d829a69201d8a7b2078a5c7ebc22e0c18d96907a23408638abe0b07567da81eb5474d036035e8ef7f635d35aa6d224e11c6ba0eaa050ff6824dc665 -DIST poppler-0.44.0.tar.xz 1671900 SHA256 5b467ed26a55e1824da6bd86f5f562b1b45582069c03898c91f01ad5c6fa0eab SHA512 356bb8d5ba333dd86f2350dab3d18e7beddabc54f0449514248e7928e56bbcd8a5941bf817a12fc780810927425567fddbfacf723894414ae21814189b54c1f8 WHIRLPOOL abcaa306a7ac90eb39d161483225091e832f4c366ee166fcbda2b3fbb4287619de42234f15cd30e52b66f57c2af87137981dfbf2065478a4736298ee2ab7ac38 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8 DIST poppler-0.46.0.tar.xz 1680940 SHA256 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487 SHA512 c303875ae8082e8cd0332ecff82e52678393d0015d092aee6fec3cc191218f155aca049ce43996c255122f550aae53ed019bb7855291d117d0b9e25ab83e9caf WHIRLPOOL 332aa78ba5a905a1c1b1fa62b20e730c7e7cde91f0a6f3c0291f85ea35188d65e496db8145c4eca8b382e8be6061bf16201603a3654c83f8c9f40e142fef0e74 diff --git a/app-text/poppler/poppler-0.43.0.ebuild b/app-text/poppler/poppler-0.43.0.ebuild deleted file mode 100644 index 0eb864e..0000000 --- a/app-text/poppler/poppler-0.43.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CMAKE_WARN_UNUSED_CLI=1 -inherit cmake-utils toolchain-funcs xdg-utils - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - SLOT="0/9999" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/60" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION -fi - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="https://poppler.freedesktop.org/" - -LICENSE="GPL-2" -IUSE="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" - -REQUIRED_USE="cairo-qt? ( qt4 )" - -# No test data provided -RESTRICT="test" - -COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) - ) - cairo-qt? ( >=x11-libs/cairo-1.10.0 ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.4 ) -" - -DOCS=(AUTHORS NEWS README README-XPDF TODO) - -PATCHES=( - "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - # Clang doesn't grok this flag, the configure nicely tests that, but - # cmake just uses it, so remove it if we use clang - if [[ ${CC} == clang ]] ; then - sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die - fi - - # Enable experimental patchset for subpixel font rendering using cairo - # backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend. - if use cairo-qt; then - ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs." - epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch" - fi -} - -src_configure() { - xdg_environment_reset - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - -DENABLE_ZLIB_UNCOMPRESS=OFF - -DENABLE_XPDF_HEADERS=ON - -DENABLE_LIBCURL="$(usex curl)" - -DENABLE_CPP="$(usex cxx)" - -DENABLE_UTILS="$(usex utils)" - -DSPLASH_CMYK=OFF - -DUSE_FIXEDPOINT=OFF - -DUSE_FLOAT=OFF - -DWITH_Cairo="$(usex cairo)" - -DWITH_GObjectIntrospection="$(usex introspection)" - -DWITH_JPEG="$(usex jpeg)" - -DWITH_NSS3="$(usex nss)" - -DWITH_PNG="$(usex png)" - -DWITH_Qt4="$(usex qt4)" - $(cmake-utils_use_find_package qt5 Qt5Core) - -DWITH_TIFF="$(usex tiff)" - ) - if use jpeg2k; then - mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) - else - mycmakeargs+=(-DENABLE_LIBOPENJPEG=) - fi - if use lcms; then - mycmakeargs+=(-DENABLE_CMS=lcms2) - else - mycmakeargs+=(-DENABLE_CMS=) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # live version doesn't provide html documentation - if use cairo && use doc && [[ ${PV} != 9999 ]]; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* - fi -} diff --git a/app-text/poppler/poppler-0.44.0.ebuild b/app-text/poppler/poppler-0.44.0.ebuild deleted file mode 100644 index 0217e63..0000000 --- a/app-text/poppler/poppler-0.44.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CMAKE_WARN_UNUSED_CLI=1 -inherit cmake-utils toolchain-funcs xdg-utils - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - SLOT="0/9999" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/61" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION -fi - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="https://poppler.freedesktop.org/" - -LICENSE="GPL-2" -IUSE="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" - -REQUIRED_USE="cairo-qt? ( qt4 )" - -# No test data provided -RESTRICT="test" - -COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) - ) - cairo-qt? ( >=x11-libs/cairo-1.10.0 ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.7 ) -" - -DOCS=(AUTHORS NEWS README README-XPDF TODO) - -PATCHES=( - "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - # Clang doesn't grok this flag, the configure nicely tests that, but - # cmake just uses it, so remove it if we use clang - if [[ ${CC} == clang ]] ; then - sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die - fi - - # Enable experimental patchset for subpixel font rendering using cairo - # backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend. - if use cairo-qt; then - ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs." - epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" - epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch" - fi -} - -src_configure() { - xdg_environment_reset - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - -DENABLE_ZLIB_UNCOMPRESS=OFF - -DENABLE_XPDF_HEADERS=ON - -DENABLE_LIBCURL="$(usex curl)" - -DENABLE_CPP="$(usex cxx)" - -DENABLE_UTILS="$(usex utils)" - -DSPLASH_CMYK=OFF - -DUSE_FIXEDPOINT=OFF - -DUSE_FLOAT=OFF - -DWITH_Cairo="$(usex cairo)" - -DWITH_GObjectIntrospection="$(usex introspection)" - -DWITH_JPEG="$(usex jpeg)" - -DWITH_NSS3="$(usex nss)" - -DWITH_PNG="$(usex png)" - -DWITH_Qt4="$(usex qt4)" - $(cmake-utils_use_find_package qt5 Qt5Core) - -DWITH_TIFF="$(usex tiff)" - ) - if use jpeg2k; then - mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) - else - mycmakeargs+=(-DENABLE_LIBOPENJPEG=) - fi - if use lcms; then - mycmakeargs+=(-DENABLE_CMS=lcms2) - else - mycmakeargs+=(-DENABLE_CMS=) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # live version doesn't provide html documentation - if use cairo && use doc && [[ ${PV} != 9999 ]]; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* - fi -}