summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-9999-r1.ebuild4
2 files changed, 6 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ec45de857008..59b92eb4a959 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.132 2011/09/08 16:50:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.133 2011/09/16 08:51:58 scarabeus Exp $
+
+ 16 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-9999-r1.ebuild:
+ Drop patches that were merged upstream.
08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index c4c1a7822f70..f7dd9bbbf26a 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.8 2011/09/08 16:50:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.9 2011/09/16 08:51:58 scarabeus Exp $
EAPI=3
@@ -214,10 +214,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
"${FILESDIR}/sdext-presenter.diff"
"${FILESDIR}/${PN}-svx.patch"
- "${FILESDIR}/${PN}-installed-files-permissions.patch"
"${FILESDIR}/${PN}-binfilter-as-needed.patch"
"${FILESDIR}/${PN}-kill-cppunit.patch"
- "${FILESDIR}/${PN}-java.patch"
)
# Uncoment me when updating to eapi4