From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QCcxh-0000OG-03 for garchives@archives.gentoo.org; Wed, 20 Apr 2011 19:21:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6CCF1C0CC; Wed, 20 Apr 2011 19:21:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 95D071C0CC for ; Wed, 20 Apr 2011 19:21:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED8BF1B4054 for ; Wed, 20 Apr 2011 19:21:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1600B8028A for ; Wed, 20 Apr 2011 19:21:05 +0000 (UTC) From: "Martin von Gagern" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin von Gagern" Message-ID: <689da48a52420ed3df70bc1ccc87f1b984ccbf5e.martinvg@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, app-text/poppler/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: Documentation/package.unmask/kde-3.5 app-text/poppler/ChangeLog app-text/poppler/poppler-0.14.5-r1.ebuild app-text/poppler/poppler-0.16.3.ebuild app-text/poppler/poppler-0.16.4.ebuild X-VCS-Directories: Documentation/package.unmask/ app-text/poppler/ X-VCS-Committer: martinvg X-VCS-Committer-Name: Martin von Gagern X-VCS-Revision: 689da48a52420ed3df70bc1ccc87f1b984ccbf5e Date: Wed, 20 Apr 2011 19:21:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e0865afc7e48df123e884e31e3a152c7 commit: 689da48a52420ed3df70bc1ccc87f1b984ccbf5e Author: Martin von Gagern gmx net> AuthorDate: Wed Apr 20 19:20:44 2011 +0000 Commit: Martin von Gagern gmx net> CommitDate: Wed Apr 20 19:20:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde-sunset.gi= t;a=3Dcommit;h=3D689da48a [app-text/poppler] Update from main portage tree --- Documentation/package.unmask/kde-3.5 | 3 +- app-text/poppler/ChangeLog | 26 ++++++++++++++= +++++- ...pler-0.16.3.ebuild =3D> poppler-0.14.5-r1.ebuild} | 17 ++++-------- ...poppler-0.16.3.ebuild =3D> poppler-0.16.4.ebuild} | 7 ++--- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package= .unmask/kde-3.5 index 32de361..4e72afa 100644 --- a/Documentation/package.unmask/kde-3.5 +++ b/Documentation/package.unmask/kde-3.5 @@ -66,7 +66,8 @@ =3Dapp-text/kchmviewer-3.1_p2-r1 =3Dapp-text/kding-0.4.3 =3Dapp-text/poppler-0.14.5 -=3Dapp-text/poppler-0.16.3 +=3Dapp-text/poppler-0.14.5-r1 +=3Dapp-text/poppler-0.16.4 =3Ddev-db/hk_classes-0.8.3 =3Ddev-db/hk_classes-0.8.3-r1 =3Ddev-db/knoda-0.8.3 diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 0f858bf..0b5f52f 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for app-text/poppler # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.281 20= 11/04/03 18:27:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.286 20= 11/04/16 05:56:36 tomka Exp $ + + 16 Apr 2011; Thomas Kahle poppler-0.14.5-r1.ebuild: + x86 stable per bug 308017 + + 15 Apr 2011; Christoph Mende poppler-0.14.5-r1.eb= uild: + Stable on amd64 wrt bug #308017 + +*poppler-0.16.4 (15 Apr 2011) + + 15 Apr 2011; Maciej Mrozowski + -poppler-0.16.3-r1.ebuild, +poppler-0.16.4.ebuild: + Version bump, remove old + + 14 Apr 2011; Jeroen Roovers poppler-0.14.5-r1.ebuild: + Stable for HPPA (bug #308017). + +*poppler-0.16.3-r1 (14 Apr 2011) +*poppler-0.14.5-r1 (14 Apr 2011) + + 14 Apr 2011; Andreas K. Huettel + +poppler-0.14.5-r1.ebuild, -poppler-0.16.3.ebuild, + +poppler-0.16.3-r1.ebuild: + Disable abiword backend (not supported anymore, security issues, bug + 308017) =20 03 Apr 2011; Andreas K. Huettel -poppler-0.14.4.ebuild: diff --git a/app-text/poppler/poppler-0.16.3.ebuild b/app-text/poppler/po= ppler-0.14.5-r1.ebuild similarity index 72% copy from app-text/poppler/poppler-0.16.3.ebuild copy to app-text/poppler/poppler-0.14.5-r1.ebuild index 94f2f87..5f7bd9f 100644 --- a/app-text/poppler/poppler-0.16.3.ebuild +++ b/app-text/poppler/poppler-0.14.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.3.ebuil= d,v 1.1 2011/02/28 18:54:52 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.5-r1.eb= uild,v 1.4 2011/04/16 05:56:36 tomka Exp $ =20 EAPI=3D"2" =20 @@ -11,10 +11,9 @@ HOMEPAGE=3D"http://poppler.freedesktop.org/" SRC_URI=3D"http://poppler.freedesktop.org/${P}.tar.gz" =20 LICENSE=3D"GPL-2" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~= ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sp= arc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS=3D"~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sp= arc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia6= 4-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc= 64-solaris ~x64-solaris ~x86-solaris" SLOT=3D"0" -IUSE=3D"+abiword cairo cjk curl cxx debug doc exceptions +introspection = jpeg -jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers" +IUSE=3D"cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt= 3 qt4 +utils +xpdf-headers" =20 # No test data provided RESTRICT=3D"test" @@ -23,12 +22,10 @@ COMMON_DEPEND=3D" >=3Dmedia-libs/fontconfig-2.6.0 >=3Dmedia-libs/freetype-2.3.9 sys-libs/zlib - abiword? ( dev-libs/libxml2:2 ) cairo? ( dev-libs/glib:2 - >=3Dx11-libs/cairo-1.10.0 - >=3Dx11-libs/gtk+-2.20.1:2[introspection?] - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.12 ) + >=3Dx11-libs/cairo-1.8.4 + >=3Dx11-libs/gtk+-2.14.0:2 ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) @@ -47,7 +44,6 @@ DEPEND=3D"${COMMON_DEPEND} RDEPEND=3D"${COMMON_DEPEND} !dev-libs/poppler !dev-libs/poppler-glib - !dev-libs/poppler-qt3 !dev-libs/poppler-qt4 !app-text/poppler-utils cjk? ( >=3Dapp-text/poppler-data-0.2.1 ) @@ -63,7 +59,7 @@ src_configure() { $(cmake-utils_use_with qt3) -DENABLE_SPLASH=3DON -DENABLE_ZLIB=3DON - $(cmake-utils_use_enable abiword) + -DENABLE_ABIWORD=3DOFF $(cmake-utils_use_enable curl LIBCURL) $(cmake-utils_use_enable cxx CPP) $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) @@ -72,7 +68,6 @@ src_configure() { $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) $(cmake-utils_use_with cairo) $(cmake-utils_use_with cairo GTK) - $(cmake-utils_use_with introspection GObjectIntrospection) $(cmake-utils_use_with jpeg) $(cmake-utils_use_with png) $(cmake-utils_use_with qt4) diff --git a/app-text/poppler/poppler-0.16.3.ebuild b/app-text/poppler/po= ppler-0.16.4.ebuild similarity index 93% rename from app-text/poppler/poppler-0.16.3.ebuild rename to app-text/poppler/poppler-0.16.4.ebuild index 94f2f87..789b0c3 100644 --- a/app-text/poppler/poppler-0.16.3.ebuild +++ b/app-text/poppler/poppler-0.16.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.3.ebuil= d,v 1.1 2011/02/28 18:54:52 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.4.ebuil= d,v 1.1 2011/04/16 03:55:11 reavertm Exp $ =20 EAPI=3D"2" =20 @@ -13,7 +13,7 @@ SRC_URI=3D"http://poppler.freedesktop.org/${P}.tar.gz" LICENSE=3D"GPL-2" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~= ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sp= arc64-solaris ~x64-solaris ~x86-solaris" SLOT=3D"0" -IUSE=3D"+abiword cairo cjk curl cxx debug doc exceptions +introspection = jpeg +IUSE=3D"cairo cjk curl cxx debug doc exceptions +introspection jpeg jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers" =20 # No test data provided @@ -23,7 +23,6 @@ COMMON_DEPEND=3D" >=3Dmedia-libs/fontconfig-2.6.0 >=3Dmedia-libs/freetype-2.3.9 sys-libs/zlib - abiword? ( dev-libs/libxml2:2 ) cairo? ( dev-libs/glib:2 >=3Dx11-libs/cairo-1.10.0 @@ -61,9 +60,9 @@ src_configure() { -DBUILD_QT4_TESTS=3DOFF -DBUILD_CPP_TESTS=3DOFF $(cmake-utils_use_with qt3) + -DENABLE_ABIWORD=3DOFF -DENABLE_SPLASH=3DON -DENABLE_ZLIB=3DON - $(cmake-utils_use_enable abiword) $(cmake-utils_use_enable curl LIBCURL) $(cmake-utils_use_enable cxx CPP) $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)