diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-19 20:22:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-19 20:22:04 +0000 |
| commit | c194d784148e7622b9e2517dd03f0fd108d5c0fb (patch) | |
| tree | 051edd7eb91172196ae411fb84e5cfd129cecfbd /app-office/libreoffice | |
| parent | Migrate to distutils-r1. Remove the patch, USE-deps supersede it. (diff) | |
| download | gentoo-2-c194d784148e7622b9e2517dd03f0fd108d5c0fb.tar.gz gentoo-2-c194d784148e7622b9e2517dd03f0fd108d5c0fb.tar.bz2 gentoo-2-c194d784148e7622b9e2517dd03f0fd108d5c0fb.zip | |
Do not use the mysql hack as it tends to break, just wait for my proper fix to propagate. Fixes bug#447818.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.6.4.3.ebuild | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.6.9999.ebuild | 7 |
3 files changed, 8 insertions, 13 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index ff9c46fdda6f..0dc9e72fbe49 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.423 2012/12/18 21:52:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.424 2012/12/19 20:22:04 scarabeus Exp $ + + 19 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.4.3.ebuild, + libreoffice-3.6.9999.ebuild: + Do not use the mysql hack as it tends to break, just wait for my proper fix to + propagate. Fixes bug#447818. 18 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild index 9b69601dcebd..aa93206aea7e 100644 --- a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild +++ b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.5 2012/12/18 15:28:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.6 2012/12/19 20:22:04 scarabeus Exp $ EAPI=4 @@ -334,11 +334,6 @@ src_prepare() { # hack in the autogen.sh touch autogen.lastrun - # mysql dmake build is MESSY at minimal - sed -i \ - -e "s:/usr/lib/:${EPREFIX}/usr/$(get_libdir):g" \ - mysqlc/source/makefile.mk || die - # system pyuno mess sed \ -e "s:%eprefix%:${EPREFIX}:g" \ diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild index 6e093ed819cb..2d54174cb16d 100644 --- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.37 2012/12/18 15:20:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.38 2012/12/19 20:22:04 scarabeus Exp $ EAPI=4 @@ -334,11 +334,6 @@ src_prepare() { # hack in the autogen.sh touch autogen.lastrun - # mysql dmake build is MESSY at minimal - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir):g" \ - mysqlc/source/makefile.mk || die - # system pyuno mess sed \ -e "s:%eprefix%:${EPREFIX}:g" \ |