Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. Go EAPI=2 so abiword-plugins can depend on poppler-utils[abiword]. Also convert built_with_use checks for x11-libs/goffice[gnome] to USE deps.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

6 files changed, 46 insertions, 56 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index dc1c20648e67..7ce7fa2ab101 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.62 2009/03/15 01:00:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.63 2009/03/30 15:01:03 loki_val Exp $
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  abiword-plugins-2.4.6.ebuild, abiword-plugins-2.6.4.ebuild,
+  abiword-plugins-2.6.5.ebuild, abiword-plugins-2.6.6.ebuild,
+  abiword-plugins-2.6.8.ebuild:
+  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
+  Go EAPI=2 so abiword-plugins can depend on poppler-utils[abiword]. Also
+  convert built_with_use checks for x11-libs/goffice[gnome] to USE deps.
 
 *abiword-plugins-2.6.8 (15 Mar 2009)
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
index 705a77bbb2dd..9b363dc52c39 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.15 2009/01/04 22:54:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.16 2009/03/30 15:01:03 loki_val Exp $
+
+EAPI=2
 
 inherit eutils
 
@@ -31,7 +33,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
 	!ia64? ( !ppc64? ( !sparc? ( ots? ( =app-text/ots-0.4* ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
+	pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -43,18 +45,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/abiword-${PV}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/poppler_abi_change.patch"
-
-	# Fix use of poppler API
-	if has_version '>=app-text/poppler-0.6'; then
-		epatch "${FILESDIR}"/${P}-poppler-0.6-api.patch
-	fi
+	epatch "${FILESDIR}"/${P}-poppler-0.6-api.patch
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}/abi" \
 		$(use_enable debug) \
@@ -74,7 +70,9 @@ src_compile() {
 		--without-psion"
 
 	econf $myconf || die "./configure failed"
+}
 
+src_compile() {
 	emake || die "Compilation failed"
 }
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild
index aba715791250..281a08fa7bbc 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild,v 1.8 2009/01/04 22:54:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild,v 1.9 2009/03/30 15:01:03 loki_val Exp $
 
-EAPI="1"
+EAPI=2
 
 inherit eutils
 
@@ -28,7 +28,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	>=gnome-base/libglade-2
 	>=gnome-extra/libgsf-1.14.4
 	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4:0.4 )
+	gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
@@ -39,7 +39,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
 	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
+	pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -50,19 +50,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 pkg_setup() {
-	if use gnome && ! built_with_use x11-libs/goffice gnome; then
-		eerror "abiword-plugin requires x11-libs/goffice to be compiled"
-		eerror "with USE=\"gnome\""
-		die "gnome support missing in x11-libs/goffice"
-	fi
-
 	if use jabber && ! use cxx; then
 		eerror "AbiCollab needs dev-libs/boost to be build"
 		die "Add USE=\"cxx\" to build AbiCollab plugin"
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}" \
 		$(use_with cxx boost) \
@@ -85,7 +79,9 @@ src_compile() {
 		--without-psion"
 
 	econf $myconf || die "./configure failed"
+}
 
+src_compile() {
 	emake || die "Compilation failed"
 }
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild
index 93b6ac2c2a36..33bd2bb4585a 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild,v 1.2 2009/01/04 22:54:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild,v 1.3 2009/03/30 15:01:03 loki_val Exp $
 
-EAPI="1"
+EAPI=2
 
 inherit eutils
 
@@ -28,7 +28,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	>=gnome-base/libglade-2
 	>=gnome-extra/libgsf-1.14.4
 	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4:0.4 )
+	gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
@@ -39,7 +39,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
 	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
+	pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -50,19 +50,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 pkg_setup() {
-	if use gnome && ! built_with_use x11-libs/goffice gnome; then
-		eerror "abiword-plugin requires x11-libs/goffice to be compiled"
-		eerror "with USE=\"gnome\""
-		die "gnome support missing in x11-libs/goffice"
-	fi
-
 	if use jabber && ! use cxx; then
 		eerror "AbiCollab needs dev-libs/boost to be build"
 		die "Add USE=\"cxx\" to build AbiCollab plugin"
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}" \
 		$(use_with cxx boost) \
@@ -85,7 +79,9 @@ src_compile() {
 		--without-psion"
 
 	econf ${myconf}
+}
 
+src_compile() {
 	emake || die "Compilation failed"
 }
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild
index 7f07e7f7bdb9..10a59eea01f3 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild,v 1.1 2009/02/20 00:20:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild,v 1.2 2009/03/30 15:01:03 loki_val Exp $
 
-EAPI="1"
+EAPI=2
 
 inherit eutils
 
@@ -28,7 +28,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	>=gnome-base/libglade-2
 	>=gnome-extra/libgsf-1.14.4
 	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4:0.4 )
+	gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
@@ -39,7 +39,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
 	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
+	pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -50,19 +50,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 pkg_setup() {
-	if use gnome && ! built_with_use x11-libs/goffice gnome; then
-		eerror "abiword-plugin requires x11-libs/goffice to be compiled"
-		eerror "with USE=\"gnome\""
-		die "gnome support missing in x11-libs/goffice"
-	fi
-
 	if use jabber && ! use cxx; then
 		eerror "AbiCollab needs dev-libs/boost to be build"
 		die "Add USE=\"cxx\" to build AbiCollab plugin"
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}" \
 		$(use_with cxx boost) \
@@ -85,7 +79,9 @@ src_compile() {
 		--without-psion"
 
 	econf ${myconf}
+}
 
+src_compile() {
 	emake || die "Compilation failed"
 }
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
index 38150975e2de..b70dc5cfed62 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.1 2009/03/15 01:00:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.2 2009/03/30 15:01:03 loki_val Exp $
 
-EAPI="1"
+EAPI=2
 
 inherit eutils
 
@@ -28,7 +28,7 @@ RDEPEND="=app-office/abiword-${PV}*
 	>=gnome-base/libglade-2
 	>=gnome-extra/libgsf-1.14.4
 	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4:0.4 )
+	gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
@@ -39,7 +39,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
 	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
+	pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -50,19 +50,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 pkg_setup() {
-	if use gnome && ! built_with_use x11-libs/goffice gnome; then
-		eerror "abiword-plugin requires x11-libs/goffice to be compiled"
-		eerror "with USE=\"gnome\""
-		die "gnome support missing in x11-libs/goffice"
-	fi
-
 	if use jabber && ! use cxx; then
 		eerror "AbiCollab needs dev-libs/boost to be build"
 		die "Add USE=\"cxx\" to build AbiCollab plugin"
 	fi
 }
 
-src_compile() {
+src_configure(){
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}" \
 		$(use_with cxx boost) \
@@ -85,7 +79,9 @@ src_compile() {
 		--without-psion"
 
 	econf ${myconf}
+}
 
+src_compile() {
 	emake || die "Compilation failed"
 }