Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/abiword-plugins/ChangeLog10
-rw-r--r--app-office/abiword-plugins/Manifest22
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild20
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild18
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild18
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild18
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild18
7 files changed, 52 insertions, 72 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/Manifest b/app-office/abiword-plugins/Manifest
index 02b2db0c00f6..41ec6d8c15cc 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX abiword-plugins-2.4.6-poppler-0.6-api.patch 452 RMD160 e3557bc1e3fec284e5b68459514e8973b3f24cdf SHA1 536669f3b353347ada9af4b28da51a2e98a1217f SHA256 18738b2bb410b8116be9a766aaeedddc1c1dc879668ccf77b16313e064594abc
AUX poppler_abi_change.patch 766 RMD160 982e40c24d73111356501ec8687011f4f489c2c7 SHA1 11889099d30cd64bc04140a0d2ef4dac775d2649 SHA256 a0a76849b595daee8369c0f3c81ce8f814e39c1225bb4b316e60b4dd30d0b500
DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
@@ -12,17 +9,10 @@ DIST abiword-plugins-2.6.4.tar.gz 1777721 RMD160 f7a15493b642c6c6727f8c71761f5a3
DIST abiword-plugins-2.6.5.tar.gz 1930003 RMD160 c8b7e2325c27b0eabc1f0ed8b9a63f36840ec2fb SHA1 2572bdfe0d19390ff839310102cef75802ba7fa8 SHA256 5e3013ed14eac12efcd81ce4180ef81f85413e4f98f86866e7c9b6d06d006cba
DIST abiword-plugins-2.6.6.tar.gz 1970233 RMD160 18150b40186263f62a98b47486161730ff04d7f0 SHA1 e7282802f5d3fcb804542e7092bad6576943a623 SHA256 282b9641fd934a0b77310d594ef8606e9d4f3e52837e14164a8d64348a2c1d17
DIST abiword-plugins-2.6.8.tar.gz 1991215 RMD160 be4e7b0fd87dfffc5f32f0a8a9d81f0ce403cc54 SHA1 fa8ad1985de5523f9993cef93af0dad174e8e5a5 SHA256 151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
-EBUILD abiword-plugins-2.4.6.ebuild 2376 RMD160 8174c009a8446eb5e0d5e600590399ef45fadb59 SHA1 607a64c5faffde4dfdebafd07133020bb82418d5 SHA256 2f64f5e424fefc83edc3f18ef3e7cff32a7906e2653acb4fb9f0844074b2dc93
-EBUILD abiword-plugins-2.6.4.ebuild 2806 RMD160 0d2bc2699ba836be9e4fb0f0c992fb49f6f26c4c SHA1 44414a613b0fc27ca3c0e977872ccfa7568d2510 SHA256 ffbbe102d2dfe92a0c6c4f03dd58a9916990ff06d342236c4e7267be9031d257
-EBUILD abiword-plugins-2.6.5.ebuild 2788 RMD160 5df00abd188abc3e96c6028ba1876f84b20a2e25 SHA1 5938f338e888c6126f758202dc79f48e0d3a44ca SHA256 fa8134a397544d45ed5152c24827f275fde0155149717a2329b9c5c798ad212e
-EBUILD abiword-plugins-2.6.6.ebuild 2788 RMD160 43b0f7942a691b84c19f363b6c6bcd735356525a SHA1 d607a127db337e52147c516f33d649d12fa25f03 SHA256 6063e3da4b74db16c5187c021d205e0a9cc389c3f7b5d0f8f97cd75c3eb052bd
-EBUILD abiword-plugins-2.6.8.ebuild 2807 RMD160 ab0ccdde2682ee68de775854868dc09bb36d54a2 SHA1 02654af1372c037b59def0dac47ab9e1a616f505 SHA256 64996fb15685fd00b056b823fd3b0c767577ffa1276a25629fe7ea3a4f519d01
-MISC ChangeLog 9612 RMD160 469e067818af86495bf57672c7e748d309d2f84e SHA1 2cd2197de3d96021d893752d999eee18e0d76784 SHA256 7c82836ec9ac947e411bbb6b0ae0a44aaee0d0fbd758afa3dd121712adb8feda
+EBUILD abiword-plugins-2.4.6.ebuild 2321 RMD160 7cdbf7c478b547c0136c4f7c4a08a35292cf929e SHA1 6ecf6109bd3c94557bcf8a186036afbfd8a9f0e7 SHA256 6952319dadf78501a258476c366cbea371459e391081c026bbc0e6c4e9bc859e
+EBUILD abiword-plugins-2.6.4.ebuild 2635 RMD160 a21ae51c775167e892ce87c32ab4afb1778fb451 SHA1 2db62fe98ef0981f0950a0e9188ce0ffa85d850c SHA256 faa2ee9319fc9d70a698f3cbef463c286b4f8583836ce0baf29dfddb0d22c855
+EBUILD abiword-plugins-2.6.5.ebuild 2617 RMD160 84d3a042ebdeab749beb2d1cdfde3c3c9b8772ff SHA1 800ba58f21c28bd7ec5c4a6787f67d5157e473a4 SHA256 42619a203f3bcdc9af02673291ffa2db92eb4139cfdf83c1c6557a83675633b5
+EBUILD abiword-plugins-2.6.6.ebuild 2617 RMD160 f3a99b9fdca1b32e5c7b59d67de7795b36d35a0a SHA1 8e3cda1d454c2255359bc73c7c124093f3d21351 SHA256 ff808b7004051994e7bda170d178417105ed2ce743559103e89f890861f0e520
+EBUILD abiword-plugins-2.6.8.ebuild 2635 RMD160 24ba767bb638ff11c6ff2d4e8645d02d0a9e664e SHA1 54f8bbe392b5ff41ae81260c87718e9e3a23fb4e SHA256 5f63699840e39f590963c29ac34d52dc823d8f2534b8af0e8087bbc3e61c09aa
+MISC ChangeLog 10051 RMD160 b17b59b90a421bc77b589f0c54985d9d39b8f73a SHA1 2f794b3db583b884ee2e9f798fb8090a9e956284 SHA256 1495b03656c439a1110b143156729016e756b67c102272b70ada0755ea4bb8dc
MISC metadata.xml 667 RMD160 5ddb96b51ca4f4490c86f6377ffd1bae83c796e7 SHA1 14e83da66c08985504d15e55fa6fccfa98955825 SHA256 42ae42a31fd0e94c3e46f42d75f9fce15d30f0a5f1e426de393d0194ff3d4b03
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm8U0MACgkQ1fmVwcYIWAayPwCgmkFmhp3men0kNnR565NdKtf3
-LeUAoJdaryCuucxfjOJAn3cr3IZksGYA
-=wfzj
------END PGP SIGNATURE-----
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"
}