Fix poppler depend. Fix USE nls wrt #283507, thanks to Arseny Solokha for reporting.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 38 insertions, 30 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/Manifest b/app-text/epdfview/Manifest
index 9c7a772698ab..446ba2041dea 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -3,7 +3,7 @@ AUX epdfview-0.1.6-print-segfault.patch 4188 RMD160 1688d3fc61e6f980be79c52cbf80
 AUX epdfview-0.1.7-mouse-scrolling.patch 2068 RMD160 1e9fcf00f62033827606833c1be7cd74c9964e7b SHA1 5fdeb8eb9a2b6228cc3e1a02c4fd1178426de6bc SHA256 98646c9bf343c15a98f295ee0237d3170064202fdb9c29a92469399b612fa464
 DIST epdfview-0.1.6.tar.bz2 406037 RMD160 69484cd68c1d344dfc38d321abd1e07fd22521e3 SHA1 1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e SHA256 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 DIST epdfview-0.1.7.tar.bz2 443609 RMD160 485399d1982a3f8128322ee7e13d46225573bae3 SHA1 ff46942c285b8e2c28766a38cdfce1a018b4a015 SHA256 0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
-EBUILD epdfview-0.1.6-r1.ebuild 1132 RMD160 9e74595377771eadc4e9cefc6aabffb52dca45b4 SHA1 3589a914fbcbc7f124005a7eccb804a1305b8402 SHA256 c131af3f00fb6bb2e2e5a2eb7dc25e49667ceeb0008e76fce3f43dd42c58fd6a
-EBUILD epdfview-0.1.7-r2.ebuild 1350 RMD160 3e9a0b0e2baf412d269fedccc4c5efc2b245d310 SHA1 f8d6f423409b354f39cdb29ca8a1ad3fd1276857 SHA256 11092df521a73dbfe80051dfcb1594eee5b8a1897171ab20f468bb5b722b126e
-MISC ChangeLog 5105 RMD160 ac15f16ca0d79f5b9fadc1e6b2ed702c57e94260 SHA1 4331e8b1a21f141c69034470652d46647eae3e7a SHA256 41eb9c2c6b2dcc3d6e126e3e1df6c1c39c4999919e3bcd4f2dd8d0f06207eea2
+EBUILD epdfview-0.1.6-r1.ebuild 1111 RMD160 47fc913d9504125fcd423784c106781802ae978c SHA1 2a338cd3924359a7cce90a28ea169b49621dc5cc SHA256 dccb9c1cb66f4c7c46349b7c37b549d700787debc8273291fa238b577e0d52ef
+EBUILD epdfview-0.1.7-r2.ebuild 1315 RMD160 8a38cafd9f0896c3ac30890cf72929d06d5e74d2 SHA1 f53892460795b69521f502d477baf99b14a73a93 SHA256 85b01442b51ecb186bc57b4ece90a0f903f48c7b2bbc2f11d608a0bea5f2e8d7
+MISC ChangeLog 5304 RMD160 0d713b54cf123f518d6f07aa502e08cf153fae16 SHA1 3c9106be2527dab3699e19bff6208ce43af99b6e SHA256 70d7671cc7b994f9e16036aab1d186e86dadcf4f04393291e66d60fbfa1103c0
 MISC metadata.xml 261 RMD160 d7402790ace8682765c391e69958c501aca805d2 SHA1 d823ac849b4abdebaa2ac8cc9d2116cd4e4e3316 SHA256 aba81eff1db4e2a1fc21cfd833c6173d6cca1e0c981e7bb135b628e32eabeb7d
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
 }