[gentoo-commits] proj/qt:master commit in: app-text/poppler/

["Johannes Huber" <johu@gentoo.org>]

commit:     6e20b7d82f56dca2a408beae3311eb61c30dd4af
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 15:51:54 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 15:51:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6e20b7d8

[app-text/poppler] EAPI 4, git-2 eclass.

(Portage version: 2.2.0_alpha86/git/Linux i686, unsigned Manifest commit)

---
 app-text/poppler/poppler-9999.ebuild |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 8ced656..fe68ea9 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
-inherit git cmake-utils
+inherit cmake-utils git-2
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -55,10 +55,6 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=(AUTHORS NEWS README README-XPDF TODO)
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
@@ -93,7 +89,7 @@ src_install() {
 	if use cairo && use doc; then
 		# For now install gtk-doc there
 		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+		doins -r "${S}"/glib/reference/html/*
 	fi
 }