summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-18 23:53:48 +0200
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-18 23:53:48 +0200
commitbbe71cbb74c9e01f36112636385462e61db76d7d (patch)
treecb02b44782dd6c86a375dbc58b6325266ab6d89d
parent[app-office/libreoffice-3.4.2.1] Add new version of lo for testing. (diff)
downloadscarabeus-bbe71cbb74c9e01f36112636385462e61db76d7d.tar.gz
scarabeus-bbe71cbb74c9e01f36112636385462e61db76d7d.tar.bz2
scarabeus-bbe71cbb74c9e01f36112636385462e61db76d7d.zip
[app-office/libreoffice] This damn patch does not need to be conditional.
-rw-r--r--app-office/libreoffice/Manifest2
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.1.ebuild4
2 files changed, 2 insertions, 4 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f144abb..f6e09fe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19147 RMD160 d89b0d0360a028f3a2b12ddb59453086c8f1f80b SHA1 44b8ecb3e6ca46b383d51a9c456bbe14f8243fb7 SHA256 232bc808918c8f3c204189ab7a93f56ce6b4f9360d496d96aeb5734e677d6be6
+EBUILD libreoffice-3.4.2.1.ebuild 19096 RMD160 d5842ce8728df020a4e746ab5869278b1b54377c SHA1 8de5ee0c068c685b4662c877c511e3f0dff320f8 SHA256 41f5efa4be7e97399ac6ea06ebcf00ddc4fdd6bbfd1345f54f0465fa7884d020
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index b4c1b1c..fa2d273 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -213,6 +213,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
"${FILESDIR}/${PN}-libdb5-fix-check.diff"
"${FILESDIR}/${PN}-3.4.1-salfix.diff"
+ "${FILESDIR}/sdext-presenter.diff"
)
# Uncoment me when updating to eapi4
@@ -313,10 +314,7 @@ src_prepare() {
export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
fi
- # Some fixes for our patchset
- use java && epatch "${FILESDIR}/sdext-presenter.diff"
base_src_prepare
-
eautoreconf
}