summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-12-03 18:53:16 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-12-03 18:53:16 +0000
commitc2124a326bead4ad00a7c4da6b076bb794a53e95 (patch)
tree96255db0ea803cc68a62120f564aa791326fa007 /app-office
parentFixing useflag mistake (diff)
downloadhistorical-c2124a326bead4ad00a7c4da6b076bb794a53e95.tar.gz
historical-c2124a326bead4ad00a7c4da6b076bb794a53e95.tar.bz2
historical-c2124a326bead4ad00a7c4da6b076bb794a53e95.zip
Some cleanups to the ebuild
Package-Manager: portage-2.0.53
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/Manifest4
-rw-r--r--app-office/openoffice/openoffice-2.0.0.ebuild13
3 files changed, 12 insertions, 11 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index bed1e84e20ec..793e177c90d8 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.159 2005/12/03 11:30:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.160 2005/12/03 18:53:16 suka Exp $
+
+ 03 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.0.ebuild:
+ Some cleanups to the ebuild
03 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
-files/2.0.0/gentoo-2.0.0.diff, -files/2.0.0/buildfix-new-xslt.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 751fcd4db818..e7a4c7cebfb9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 7d43ac38e73576ed7321cc963769d11c ChangeLog 34779
+MD5 87c253a71ec725cd674dbee37cf9f6a7 ChangeLog 34890
MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
@@ -38,4 +38,4 @@ MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478
MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 e93dd766e83e476bc7d7c6077d11f030 openoffice-2.0.0.ebuild 7002
+MD5 efc84271190bae49c9785f068d0326ff openoffice-2.0.0.ebuild 6916
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 7edc1a2824d7..dbd04e97ce19 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.20 2005/12/03 11:30:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.21 2005/12/03 18:53:16 suka Exp $
inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
@@ -8,10 +8,9 @@ IUSE="curl eds gnome gtk java kde ldap mozilla nas zlib xml2"
MY_PV="${PV}.2"
PATCHLEVEL="OOO680"
-PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}"
SRC="OOO_2_0_0"
-S="${WORKDIR}/${SRC}"
-CONFFILE="${PATCHDIR}/distro-configs/Gentoo.conf.in"
+S="${WORKDIR}/ooo-build-${MY_PV}"
+CONFFILE="${S}/distro-configs/Gentoo.conf.in"
DESCRIPTION="OpenOffice.org, a full office productivity suite."
SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
@@ -118,7 +117,6 @@ pkg_setup() {
src_unpack() {
- cd ${WORKDIR}
unpack ooo-build-${MY_PV}.tar.gz
#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
@@ -157,7 +155,7 @@ src_compile() {
# Make sure gnome-users get gtk-support
export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
- cd ${PATCHDIR}
+ cd ${S}
autoconf || die
./configure ${MYCONF} \
--with-distro="${DISTRO}" \
@@ -200,12 +198,11 @@ src_compile() {
src_install() {
einfo "Preparing Installation"
- cd ${PATCHDIR}
make DESTDIR=${D} install || die "Installation failed!"
# Install corrected Symbol Font
insinto /usr/share/fonts/TTF/
- doins ${PATCHDIR}/fonts/*.ttf
+ doins fonts/*.ttf
}