diff options
| author |   Flammie Pirinen <flammie@gentoo.org> | 2008-03-28 06:45:50 +0000 |
|---|---|---|
| committer | Flammie Pirinen <flammie@gentoo.org> | 2008-03-28 06:45:50 +0000 |
| commit | 9ea07f4a246433838cdb6141f74ed2a5e4d1b220 (patch) | |
| tree | 6a58b70ab56494d930709c548785fd14d585cb1a | |
| parent | Fixed rpm dependencies, thanks to Jussi Saarinen (diff) | |
| download | finnish-9ea07f4a246433838cdb6141f74ed2a5e4d1b220.tar.gz finnish-9ea07f4a246433838cdb6141f74ed2a5e4d1b220.tar.bz2 finnish-9ea07f4a246433838cdb6141f74ed2a5e4d1b220.zip | |
Version bump with updated
svn path=/; revision=43
| -rw-r--r-- | trunk/app-office/openoffice-voikko/ChangeLog | 8 | ||||
| -rw-r--r-- | trunk/app-office/openoffice-voikko/Manifest | 4 | ||||
| -rw-r--r-- | trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild | 25 |
3 files changed, 26 insertions, 11 deletions
diff --git a/trunk/app-office/openoffice-voikko/ChangeLog b/trunk/app-office/openoffice-voikko/ChangeLog index c57404b..cfa3fec 100644 --- a/trunk/app-office/openoffice-voikko/ChangeLog +++ b/trunk/app-office/openoffice-voikko/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for app-office/openoffice-voikko -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openoffice-voikko-2.2 (28 Mar 2008) + + 28 Mar 2008; Flammie Pirinen <flammie@gentoo.org> + +openoffice-voikko-2.2.ebuild: + Version bump + *openoffice-voikko-2.1 (28 Aug 2007) 28 Aug 2007; Flammie Pirinen <flammie@gentoo.org> diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest index cf85eab..3f314f9 100644 --- a/trunk/app-office/openoffice-voikko/Manifest +++ b/trunk/app-office/openoffice-voikko/Manifest @@ -8,7 +8,7 @@ EBUILD openoffice-voikko-1.2.ebuild 4504 RMD160 fd940e2b82c87702d1f7cb35481b4751 EBUILD openoffice-voikko-2.0.1.ebuild 4097 RMD160 6269fd1b198fc5a90502853c53c3b7755ec85bed SHA1 c52a23f0e94ff75cc19ac40a192e50ddfbb2aa0e SHA256 2a7433195b44dc1d0cac129737b99a13be1a8e09defe5dc739449702ca82084a EBUILD openoffice-voikko-2.0.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a SHA1 6b8abc8c5cf2c375d24cfcbeeafd3e255a0d50db SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39 EBUILD openoffice-voikko-2.1.ebuild 4252 RMD160 f2408cacf43048c4c7e5ac1cd690c819d9c028c7 SHA1 cc3e795762972d5b1d43041fb917b060ea408c8a SHA256 4cb9fec1b4a7ad2a03485b25ee3d2b5eef314f7a5073f903947ebdbf7419b6e6 -EBUILD openoffice-voikko-2.2.ebuild 4220 RMD160 1703b5205b846788f17ee98dfe2a1e910f5107b9 SHA1 a185a8d8adeb070880322d0c0c883adfeec03222 SHA256 0916730d6a2e411a9164012445b4ff67d7ec3609ffcbef2c8b919bfb50aed233 +EBUILD openoffice-voikko-2.2.ebuild 4550 RMD160 7a79ae4a339d69f67b423be6c6f9ac03a5298c14 SHA1 5e1c45342af469107bd863567a99adeca277f54e SHA256 e721899ead21c8f66c5ff4d0475480bc3d59a64070fd1da588768995a7448305 EBUILD openoffice-voikko-9999.ebuild 4666 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f SHA1 0faec1eef70651d28ad7c6ef57d7100ea7b5f216 SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6 -MISC ChangeLog 1007 RMD160 9782b48e68d86d79c21adbcba867864b0529e406 SHA1 a673c39d126c0fa75c6cb31e72e5d9460100e0dd SHA256 673f9b4b4194c419b7ae9cbd158f3b5432d87494ed16f93af3392fdd513f1679 +MISC ChangeLog 1146 RMD160 e77ef336cf0d2619e25232816f9483bc6de0bdbd SHA1 521883727184bdd64924bcd4fdb7264ff76d2e30 SHA256 80a6bc509feec68bb88b6a12b31c87176b5fa71d3c59d6412bfa39898fd06f14 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild index 2c63284..8c1de45 100644 --- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild +++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://voikko.sf.net/" SRC_URI="mirror://sourceforge/voikko/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-x86 -amd64" # This’s broken till SDK is fixed and whatnot +KEYWORDS="~x86 ~amd64" # This’s broken till SDK is fixed and whatnot #DEPEND="|| ( >=app-office/openoffice-2 ( # >=app-office/openoffice-bin-2 app-office/openoffice-sdk @@ -36,12 +36,16 @@ pkg_setup() { fi # We need OpenOffice SDK initialisation sh script executable # If we could trust openoffice use +odk work, this was unnecessary: - if [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" ]] ; then + + if [[ -f "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then + export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" + elif [[ -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" ]] ; then + eerror "setsdkenv_unix found without non-interactive .sh, running..." + export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" + else die "Couldn’t find open office SDK settings from \ - ${ROOT}/usr/lib/openoffice/program/setsdkenv_unix \ + ${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh \ see bug #194053 and forums for further info" - else - export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" fi if [[ ! -x "${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg" ]] ; then die "Couldn’t find unopkg binary" @@ -61,11 +65,16 @@ pkg_setup() { einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}" } +src_compile() { + emake oxt || die "make failed" +} + src_install() { dodoc README ChangeLog || die "docs missing" - dodir /usr/share/${P} - insinto /usr/share/${P} + emake DESTDIR="${D}/usr/$(get_libdir)/${P}" install-unpacked + insinto /usr/$(get_libdir)/${P} doins build/voikko.oxt + } # FIXME: installation of an unopkg is troublesome, move to src_install when @@ -79,7 +88,7 @@ pkg_postinst() { tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2" # select component - COMPONENT="${ROOT}/usr/share/${P}/voikko.oxt" + COMPONENT="${ROOT}/usr/$(get_libdir)/${P}/voikko.oxt" PKG=$(basename "${COMPONENT}") # Global scope in install-oo2-voikko |