From d6ff6e82a5822922e3c24e1e1ee0d39651406a4f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 7 Jan 2007 12:05:03 +0000 Subject: [PATCH] arm/ia64/s390/sh stable Package-Manager: portage-2.1.2_rc4-r6 --- .../poppler-bindings-0.5.4.ebuild | 19 +++++++++---------- app-text/poppler-data/poppler-data-0.1.ebuild | 8 ++++---- app-text/poppler/poppler-0.5.4.ebuild | 8 ++++---- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild index abbb5c63415e..abdbb9e70019 100644 --- a/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild +++ b/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild,v 1.6 2006/12/21 13:04:31 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild,v 1.7 2007/01/07 12:05:03 vapier Exp $ inherit autotools eutils multilib MY_P=${P/-bindings/} -DESCRIPTION="Poppler bindings are rendering bindings for GUI toolkits for poppler" -HOMEPAGE="http://poppler.freedesktop.org" +DESCRIPTION="rendering bindings for GUI toolkits for poppler" +HOMEPAGE="http://poppler.freedesktop.org/" SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="gtk qt3 cairo qt4" RDEPEND="~app-text/poppler-${PV} @@ -22,19 +22,18 @@ RDEPEND="~app-text/poppler-${PV} ) qt3? ( =x11-libs/qt-3* ) qt4? ( =x11-libs/qt-4* )" - DEPEND="${RDEPEND} dev-util/pkgconfig >=sys-devel/automake-1.9.6" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} src_unpack(){ unpack ${A} - cd ${S} + cd "${S}" - epatch ${FILESDIR}/poppler-0.5.2-bindings.patch - epatch ${FILESDIR}/glib-2.0.fix + epatch "${FILESDIR}"/poppler-0.5.2-bindings.patch + epatch "${FILESDIR}"/glib-2.0.fix AT_M4DIR="m4" eautoreconf sed -i s:/usr/lib/qt:/usr/lib/qt4: configure @@ -63,7 +62,7 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" } pkg_postinst() { diff --git a/app-text/poppler-data/poppler-data-0.1.ebuild b/app-text/poppler-data/poppler-data-0.1.ebuild index fbfb063c90f4..cf7e755c084f 100644 --- a/app-text/poppler-data/poppler-data-0.1.ebuild +++ b/app-text/poppler-data/poppler-data-0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.1.ebuild,v 1.6 2006/12/21 13:03:08 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.1.ebuild,v 1.7 2007/01/07 12:00:09 vapier Exp $ DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc" HOMEPAGE="http://poppler.freedesktop.org/" @@ -8,13 +8,13 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" LICENSE="adobe-ps MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="" DEPEND="" RDEPEND="" src_install() { - emake prefix=/usr DESTDIR=${D} install || die "emake install failed" + emake prefix=/usr DESTDIR="${D}" install || die "emake install failed" dodoc README } diff --git a/app-text/poppler/poppler-0.5.4.ebuild b/app-text/poppler/poppler-0.5.4.ebuild index b4c5e6075ec6..7feb5a51dd98 100644 --- a/app-text/poppler/poppler-0.5.4.ebuild +++ b/app-text/poppler/poppler-0.5.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.5.4.ebuild,v 1.8 2006/12/21 13:03:50 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.5.4.ebuild,v 1.9 2007/01/07 12:00:12 vapier Exp $ inherit flag-o-matic eutils libtool @@ -10,7 +10,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="cjk jpeg zlib" RDEPEND=">=media-libs/freetype-2.1.8 @@ -45,6 +45,6 @@ src_compile() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd } -- 2.26.2