1 |
commit: 16f1da9c90d70828618799bfb580f04bbce450eb |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 22 18:58:26 2014 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 22 18:58:26 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=16f1da9c |
7 |
|
8 |
[app-text/poppler] moved to main tree |
9 |
|
10 |
--- |
11 |
.../files/poppler-0.26.0-qt5-dependencies.patch | 31 ------ |
12 |
app-text/poppler/metadata.xml | 14 --- |
13 |
app-text/poppler/poppler-9999.ebuild | 110 --------------------- |
14 |
3 files changed, 155 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index bf1effd..0000000 |
19 |
--- a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch |
20 |
+++ /dev/null |
21 |
@@ -1,31 +0,0 @@ |
22 |
-From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001 |
23 |
-From: Johannes Huber <johu@g.o> |
24 |
-Date: Sat, 10 May 2014 15:00:48 +0200 |
25 |
-Subject: [PATCH] [Qt5] Drop unused dependencies |
26 |
- |
27 |
---- |
28 |
- CMakeLists.txt | 6 ++---- |
29 |
- 1 file changed, 2 insertions(+), 4 deletions(-) |
30 |
- |
31 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
32 |
-index fbafc4e..073f39b 100644 |
33 |
---- a/CMakeLists.txt |
34 |
-+++ b/CMakeLists.txt |
35 |
-@@ -106,12 +106,10 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_ |
36 |
- find_package(Qt5Core) |
37 |
- find_package(Qt5Gui) |
38 |
- find_package(Qt5Xml) |
39 |
-- find_package(Qt5Widgets) |
40 |
-- find_package(Qt5Test) |
41 |
-- if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) |
42 |
-+ if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND) |
43 |
- set(QT5_FOUND true) |
44 |
- else () |
45 |
-- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") |
46 |
-+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") |
47 |
- set(QT5_FOUND false) |
48 |
- endif() |
49 |
- else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) |
50 |
--- |
51 |
-1.9.2 |
52 |
- |
53 |
|
54 |
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml |
55 |
deleted file mode 100644 |
56 |
index 9124e13..0000000 |
57 |
--- a/app-text/poppler/metadata.xml |
58 |
+++ /dev/null |
59 |
@@ -1,14 +0,0 @@ |
60 |
-<?xml version="1.0" encoding="UTF-8"?> |
61 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
62 |
-<pkgmetadata> |
63 |
-<herd>kde</herd> |
64 |
-<herd>printing</herd> |
65 |
-<maintainer> |
66 |
- <email>reavertm@g.o</email> |
67 |
- <name>Maciej Mrozowski</name> |
68 |
-</maintainer> |
69 |
-<use> |
70 |
- <flag name='introspection'>Enable GObject introspection.</flag> |
71 |
- <flag name='utils'>Install command-line PDF converters and various utilities.</flag> |
72 |
-</use> |
73 |
-</pkgmetadata> |
74 |
|
75 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
76 |
deleted file mode 100644 |
77 |
index b869f21..0000000 |
78 |
--- a/app-text/poppler/poppler-9999.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,110 +0,0 @@ |
81 |
-# Copyright 1999-2014 Gentoo Foundation |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: $ |
84 |
- |
85 |
-EAPI=5 |
86 |
- |
87 |
-inherit cmake-utils toolchain-funcs |
88 |
- |
89 |
-if [[ "${PV}" == "9999" ]] ; then |
90 |
- inherit git-r3 |
91 |
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" |
92 |
- KEYWORDS="" |
93 |
- SLOT="0/9999" |
94 |
-else |
95 |
- SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz" |
96 |
- 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" |
97 |
- SLOT="0/46" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
98 |
-fi |
99 |
- |
100 |
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
101 |
-HOMEPAGE="http://poppler.freedesktop.org/" |
102 |
- |
103 |
-LICENSE="GPL-2" |
104 |
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils" |
105 |
- |
106 |
-# No test data provided |
107 |
-RESTRICT="test" |
108 |
- |
109 |
-COMMON_DEPEND=" |
110 |
- >=media-libs/fontconfig-2.6.0 |
111 |
- >=media-libs/freetype-2.3.9 |
112 |
- sys-libs/zlib |
113 |
- cairo? ( |
114 |
- dev-libs/glib:2 |
115 |
- >=x11-libs/cairo-1.10.0 |
116 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) |
117 |
- ) |
118 |
- curl? ( net-misc/curl ) |
119 |
- jpeg? ( virtual/jpeg:0 ) |
120 |
- jpeg2k? ( media-libs/openjpeg:0 ) |
121 |
- lcms? ( media-libs/lcms:2 ) |
122 |
- png? ( media-libs/libpng:0= ) |
123 |
- qt4? ( |
124 |
- dev-qt/qtcore:4 |
125 |
- dev-qt/qtgui:4 |
126 |
- ) |
127 |
- qt5? ( |
128 |
- dev-qt/qtcore:5 |
129 |
- dev-qt/qtgui:5 |
130 |
- dev-qt/qtxml:5 |
131 |
- ) |
132 |
- tiff? ( media-libs/tiff:0 ) |
133 |
-" |
134 |
-DEPEND="${COMMON_DEPEND} |
135 |
- virtual/pkgconfig |
136 |
-" |
137 |
-RDEPEND="${COMMON_DEPEND} |
138 |
- cjk? ( >=app-text/poppler-data-0.4.4 ) |
139 |
-" |
140 |
- |
141 |
-DOCS=(AUTHORS NEWS README README-XPDF TODO) |
142 |
- |
143 |
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" ) |
144 |
- |
145 |
-src_configure() { |
146 |
- # this is needed for multilib, see bug 459394 |
147 |
- local ft_libdir ft_includedir |
148 |
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)" |
149 |
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)" |
150 |
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}" |
151 |
- einfo "Detected FreeType at ${FREETYPE_DIR}" |
152 |
- |
153 |
- mycmakeargs=( |
154 |
- -DBUILD_GTK_TESTS=OFF |
155 |
- -DBUILD_QT4_TESTS=OFF |
156 |
- -DBUILD_QT5_TESTS=OFF |
157 |
- -DBUILD_CPP_TESTS=OFF |
158 |
- -DENABLE_SPLASH=ON |
159 |
- -DENABLE_ZLIB=ON |
160 |
- -DENABLE_XPDF_HEADERS=ON |
161 |
- $(cmake-utils_use_enable curl LIBCURL) |
162 |
- $(cmake-utils_use_enable cxx CPP) |
163 |
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) |
164 |
- $(cmake-utils_use_enable utils) |
165 |
- $(cmake-utils_use_with cairo) |
166 |
- $(cmake-utils_use_with introspection GObjectIntrospection) |
167 |
- $(cmake-utils_use_with jpeg) |
168 |
- $(cmake-utils_use_with png) |
169 |
- $(cmake-utils_use_with qt4) |
170 |
- $(cmake-utils_use_find_package qt5 Qt5Core) |
171 |
- $(cmake-utils_use_with tiff) |
172 |
- ) |
173 |
- if use lcms; then |
174 |
- mycmakeargs+=(-DENABLE_CMS=lcms2) |
175 |
- else |
176 |
- mycmakeargs+=(-DENABLE_CMS=) |
177 |
- fi |
178 |
- |
179 |
- cmake-utils_src_configure |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- cmake-utils_src_install |
184 |
- |
185 |
- if use cairo && use doc; then |
186 |
- # For now install gtk-doc there |
187 |
- insinto /usr/share/gtk-doc/html/poppler |
188 |
- doins -r "${S}"/glib/reference/html/* |
189 |
- fi |
190 |
-} |