diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-10 14:21:28 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-10 14:21:28 +0000 |
commit | 29fa61f215a271134fb33afddb1264d467ae5f25 (patch) | |
tree | 0a9beba85dedc5451ca837aa9bb9edfa816034d9 /app-text/epdfview | |
parent | old (diff) | |
download | gentoo-2-29fa61f215a271134fb33afddb1264d467ae5f25.tar.gz gentoo-2-29fa61f215a271134fb33afddb1264d467ae5f25.tar.bz2 gentoo-2-29fa61f215a271134fb33afddb1264d467ae5f25.zip |
Fix poppler depend. Fix USE nls wrt #283507, thanks to Arseny Solokha for reporting.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-text/epdfview')
-rw-r--r-- | app-text/epdfview/ChangeLog | 9 | ||||
-rw-r--r-- | app-text/epdfview/epdfview-0.1.6-r1.ebuild | 13 | ||||
-rw-r--r-- | app-text/epdfview/epdfview-0.1.7-r2.ebuild | 40 |
3 files changed, 35 insertions, 27 deletions
diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog index a83444143a10..a3734b2bf00b 100644 --- a/app-text/epdfview/ChangeLog +++ b/app-text/epdfview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/epdfview -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.36 2009/04/26 13:22:25 loki_val Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.37 2010/02/10 14:21:28 ssuominen Exp $ + + 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + epdfview-0.1.6-r1.ebuild, epdfview-0.1.7-r2.ebuild: + Fix poppler depend. Fix USE nls wrt #283507, thanks to Arseny Solokha for + reporting. *epdfview-0.1.7-r2 (26 Apr 2009) diff --git a/app-text/epdfview/epdfview-0.1.6-r1.ebuild b/app-text/epdfview/epdfview-0.1.6-r1.ebuild index 132337c2dbd0..049c1bafb4f0 100644 --- a/app-text/epdfview/epdfview-0.1.6-r1.ebuild +++ b/app-text/epdfview/epdfview-0.1.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild,v 1.13 2009/04/10 23:20:31 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild,v 1.14 2010/02/10 14:21:28 ssuominen Exp $ EAPI="2" inherit eutils @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" IUSE="cups nls test" -COMMON_DEPEND=">=virtual/poppler-glib-0.5.0[cairo] - >=x11-libs/gtk+-2.6 +COMMON_DEPEND=">=app-text/poppler-0.12.3-r3[cairo] + >=x11-libs/gtk+-2.6:2 cups? ( >=net-print/cups-1.1 )" DEPEND="${COMMON_DEPEND} >=dev-util/pkgconfig-0.9 @@ -24,10 +24,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} nls? ( virtual/libintl )" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { epatch "${FILESDIR}/${P}-gcc-4.3.patch" epatch "${FILESDIR}/${P}-print-segfault.patch" } diff --git a/app-text/epdfview/epdfview-0.1.7-r2.ebuild b/app-text/epdfview/epdfview-0.1.7-r2.ebuild index 15de84f0ee04..d3a6fc0cc29c 100644 --- a/app-text/epdfview/epdfview-0.1.7-r2.ebuild +++ b/app-text/epdfview/epdfview-0.1.7-r2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.1 2009/04/26 13:22:25 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.2 2010/02/10 14:21:28 ssuominen Exp $ -EAPI="2" - -inherit gnome2 flag-o-matic eutils +EAPI=2 +inherit eutils gnome2 DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries." HOMEPAGE="http://trac.emma-soft.com/epdfview/" @@ -15,32 +14,39 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="cups nls test" -RDEPEND=">=virtual/poppler-glib-0.5.0[cairo] - >=x11-libs/gtk+-2.6 +RDEPEND=">=app-text/poppler-0.12.3-r3[cairo] + >=x11-libs/gtk+-2.6:2 cups? ( >=net-print/cups-1.1 )" DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 + dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-util/cppunit ) - userland_GNU? ( >=sys-apps/findutils-4.4.0 )" + userland_GNU? ( >=sys-apps/findutils-4.4 )" pkg_setup() { - G2CONF=$(use_with cups) + G2CONF="--disable-dependency-tracking + $(use_enable nls) + $(use_with cups)" + DOCS="AUTHORS NEWS README THANKS" } src_prepare() { - gnome2_src_prepare - sed -i -e 's:Icon=icon_epdfview-48:Icon=epdfview:' data/epdfview.desktop || die "desktop sed failed" + sed -i \ + -e 's:Icon=icon_epdfview-48:Icon=epdfview:' \ + data/epdfview.desktop || die + epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch + + gnome2_src_prepare } src_install() { gnome2_src_install - for size in 24 32 48 - do - icnsdir="/usr/share/icons/hicolor/${size}x${size}/apps/" - insinto "${icnsdir}" || die "insinto failed" - newins data/icon_epdfview-${size}.png epdfview.png || die "newins failed" + + local res + for res in 24 32 48; do + insinto /usr/share/icons/hicolor/${res}x${res}/apps + newins data/icon_epdfview-${res}.png epdfview.png || die done } |