commit: 16f1da9c90d70828618799bfb580f04bbce450eb Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Jun 22 18:58:26 2014 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Jun 22 18:58:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=16f1da9c
[app-text/poppler] moved to main tree --- .../files/poppler-0.26.0-qt5-dependencies.patch | 31 ------ app-text/poppler/metadata.xml | 14 --- app-text/poppler/poppler-9999.ebuild | 110 --------------------- 3 files changed, 155 deletions(-) diff --git a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch deleted file mode 100644 index bf1effd..0000000 --- a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <[email protected]> -Date: Sat, 10 May 2014 15:00:48 +0200 -Subject: [PATCH] [Qt5] Drop unused dependencies - ---- - CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fbafc4e..073f39b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,12 +106,10 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_ - find_package(Qt5Core) - find_package(Qt5Gui) - find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) -+ if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND) - set(QT5_FOUND true) - else () -- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") - set(QT5_FOUND false) - endif() - else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) --- -1.9.2 - diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml deleted file mode 100644 index 9124e13..0000000 --- a/app-text/poppler/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>kde</herd> -<herd>printing</herd> -<maintainer> - <email>[email protected]</email> - <name>Maciej Mrozowski</name> -</maintainer> -<use> - <flag name='introspection'>Enable GObject introspection.</flag> - <flag name='utils'>Install command-line PDF converters and various utilities.</flag> -</use> -</pkgmetadata> diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild deleted file mode 100644 index b869f21..0000000 --- a/app-text/poppler/poppler-9999.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit cmake-utils toolchain-funcs - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - KEYWORDS="" - SLOT="0/9999" -else - SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~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/46" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION -fi - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/"; - -LICENSE="GPL-2" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils" - -# 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 ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - lcms? ( media-libs/lcms:2 ) - 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" ) - -src_configure() { - # this is needed for multilib, see bug 459394 - local ft_libdir ft_includedir - ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" - ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" - export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" - einfo "Detected FreeType at ${FREETYPE_DIR}" - - mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - -DENABLE_XPDF_HEADERS=ON - $(cmake-utils_use_enable curl LIBCURL) - $(cmake-utils_use_enable cxx CPP) - $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with introspection GObjectIntrospection) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) - $(cmake-utils_use_find_package qt5 Qt5Core) - $(cmake-utils_use_with tiff) - ) - if use lcms; then - mycmakeargs+=(-DENABLE_CMS=lcms2) - else - mycmakeargs+=(-DENABLE_CMS=) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use cairo && use doc; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* - fi -}
