From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D52961393E9 for ; Sat, 10 May 2014 13:06:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9DB7E09FD; Sat, 10 May 2014 13:06:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5535EE09E7 for ; Sat, 10 May 2014 13:06:06 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72D5633FC4E for ; Sat, 10 May 2014 13:06:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 193E118744 for ; Sat, 10 May 2014 13:06:04 +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: <1399722946.9e746f7f8ef3243da6a32de768b6031442d0fe08.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-text/poppler/ X-VCS-Repository: proj/kde X-VCS-Files: app-text/poppler/metadata.xml app-text/poppler/poppler-9999.ebuild X-VCS-Directories: app-text/poppler/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 9e746f7f8ef3243da6a32de768b6031442d0fe08 X-VCS-Branch: master Date: Sat, 10 May 2014 13:06:04 +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: 028bda9b-4b48-48fc-b144-535ceb5987af X-Archives-Hash: 584e250e792611ef9ee2c6c5898a9bd4 commit: 9e746f7f8ef3243da6a32de768b6031442d0fe08 Author: Johannes Huber gentoo org> AuthorDate: Sat May 10 11:55:46 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat May 10 11:55:46 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9e746f7f [app-text/poppler] Sync with tree, cleanup header Package-Manager: portage-2.2.10 --- app-text/poppler/metadata.xml | 3 --- app-text/poppler/poppler-9999.ebuild | 11 ++++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml index 75a5717..9124e13 100644 --- a/app-text/poppler/metadata.xml +++ b/app-text/poppler/metadata.xml @@ -8,10 +8,7 @@ Maciej Mrozowski - Enable support for app-office/abiword output. Requires dev-libs/libxml2. - Enable exceptions throwing. Enable GObject introspection. Install command-line PDF converters and various utilities. - diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index ba2094e..d123bd2 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.2 2013/07/12 20:34:24 dilfridge Exp $ +# $Header: $ EAPI=5 @@ -12,7 +12,7 @@ EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler" LICENSE="GPL-2" KEYWORDS="" -SLOT="0/43" +SLOT="0/46" IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils" # No test data provided @@ -42,11 +42,6 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " RDEPEND="${COMMON_DEPEND} - !dev-libs/poppler - !dev-libs/poppler-glib - !dev-libs/poppler-qt3 - !dev-libs/poppler-qt4 - !app-text/poppler-utils cjk? ( >=app-text/poppler-data-0.4.4 ) " @@ -63,6 +58,7 @@ src_configure() { mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF + -DBUILD_QT5_TESTS=OFF -DBUILD_CPP_TESTS=OFF -DENABLE_SPLASH=ON -DENABLE_ZLIB=ON @@ -76,6 +72,7 @@ src_configure() { $(cmake-utils_use_with jpeg) $(cmake-utils_use_with png) $(cmake-utils_use_with qt4) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON $(cmake-utils_use_with tiff) ) if use lcms; then