diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-12-03 18:53:16 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-12-03 18:53:16 +0000 |
| commit | fb60f50fdad6532ff3268b9ec65c67b3f8bea074 (patch) | |
| tree | 3fce6cb684f9a8498e53d8b79c3507fc7a351b0f /app-office | |
| parent | Fixing useflag mistake (diff) | |
| download | gentoo-2-fb60f50fdad6532ff3268b9ec65c67b3f8bea074.tar.gz gentoo-2-fb60f50fdad6532ff3268b9ec65c67b3f8bea074.tar.bz2 gentoo-2-fb60f50fdad6532ff3268b9ec65c67b3f8bea074.zip | |
Some cleanups to the ebuild
(Portage version: 2.0.53)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.0.ebuild | 13 |
2 files changed, 10 insertions, 9 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/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 } |