Prune older versions and fix compilation against poppler-0.6, fix bug #183361

(Portage version: 2.1.3.7)

5 files changed, 23 insertions, 84 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index e35df0d7a860..0b94dbb0cf99 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.34 2007/06/26 07:32:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.35 2007/09/08 11:30:46 eva Exp $
+
+  08 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/abiword-plugins-2.4.6-poppler-0.6-api.patch,
+  -abiword-plugins-2.4.5.ebuild, abiword-plugins-2.4.6.ebuild:
+  Prune older release, fix compilation against poppler-0.6
 
   26 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   abiword-plugins-2.4.6.ebuild:
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild
deleted file mode 100644
index 4a65eb35474d..000000000000
--- a/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2007 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.5.ebuild,v 1.10 2007/06/24 09:11:08 eva Exp $
-
-inherit eutils
-
-DESCRIPTION="Set of plugins for abiword"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bzip2 debug gnome grammar jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect"
-
-# libgsf dependency used by some document format importers
-RDEPEND="=app-office/abiword-${PV}*
-	virtual/xft
-	>=media-libs/fontconfig-1
-	>=dev-libs/fribidi-0.10.4
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-extra/libgsf-1.12.1
-	bzip2? ( app-arch/bzip2 )
-	gnome? ( >=x11-libs/goffice-0.1 )
-	grammar? ( >=dev-libs/link-grammar-4.2.2 )
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	libgda? (
-		=gnome-extra/libgda-1*
-		=gnome-extra/libgnomedb-1* )
-	math? ( >=x11-libs/gtkmathview-0.7.5 )
-	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.4.1 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
-	readline? ( sys-libs/readline )
-	thesaurus? ( >=app-text/aiksaurus-1.2 )
-	wordperfect? ( >=app-text/libwpd-0.8 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	svg? ( >=gnome-base/librsvg-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-S="${WORKDIR}/abiword-${PV}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/poppler_abi_change.patch
-}
-
-src_compile() {
-	local myconf="--enable-all \
-		--with-abiword=${WORKDIR}/abiword-${PV}/abi \
-		$(use_enable debug) \
-		$(use_with bzip2 bz2abw) \
-		$(use_with gnome abigochart) \
-		$(use_with grammar abigrammar) \
-		$(use_with jpeg) \
-		$(use_with libgda gda) \
-		$(use_with math abimathview) \
-		$(use_with ots) \
-		$(use_with pdf) \
-		$(use_with readline abicommand)
-		$(use_with svg librsvg) \
-		$(use_with thesaurus aiksaurus) \
-		$(use_with wmf) \
-		$(use_with wordperfect) \
-		--without-psion"
-
-	econf $myconf || die "./configure failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
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 a92fb667fea3..a31f9c786dac 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,6 @@
 # Copyright 1999-2007 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.10 2007/06/26 07:32:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.11 2007/09/08 11:30:46 eva Exp $
 
 inherit eutils
 
@@ -47,6 +47,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	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
 }
 
 src_compile() {
diff --git a/app-office/abiword-plugins/files/abiword-plugins-2.4.6-poppler-0.6-api.patch b/app-office/abiword-plugins/files/abiword-plugins-2.4.6-poppler-0.6-api.patch
new file mode 100644
index 000000000000..045e7fee6582
--- /dev/null
+++ b/app-office/abiword-plugins/files/abiword-plugins-2.4.6-poppler-0.6-api.patch
@@ -0,0 +1,11 @@
+--- abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2007-09-07 21:45:24.000000000 +0000
++++ abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2007-09-07 21:49:02.000000000 +0000
+@@ -63,7 +63,7 @@
+   
+     PDFDoc * doc = new PDFDoc(fileName);
+ 
+-    globalParams = new GlobalParams("");
++    globalParams = new GlobalParams();
+     globalParams->setTextEncoding("UTF-8");
+     globalParams->setTextEOL("\n");
+     globalParams->setTextPageBreaks(gFalse);
diff --git a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.5 b/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.5
deleted file mode 100644
index 92a5bbc12741..000000000000
--- a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 24930028
-RMD160 f0de27f97135f8fff9b4400b05d74a27eee348cd abiword-2.4.5.tar.bz2 24930028
-SHA256 b8e5f61697c6d796e8f9f0812886666487fd0125bc777ca093c096b4b3e31264 abiword-2.4.5.tar.bz2 24930028