* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-07-30 15:16 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-30 15:16 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/07/30 15:16:28
Modified: ChangeLog libreoffice-3.4.2.3.ebuild
Added: libreoffice-3.4.9999.ebuild
Log:
Add support for live ebuilds. Add live ebuild from 3.4 branch. Master branch needs A LOT more work so it won't appear soon.
(Portage version: 2.2.0_alpha49/cvs/Linux x86_64)
Revision Changes Path
1.76 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 29 Jul 2011 18:56:50 -0000 1.75
+++ ChangeLog 30 Jul 2011 15:16:28 -0000 1.76
@@ -1,6 +1,13 @@
# 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.75 2011/07/29 18:56:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.76 2011/07/30 15:16:28 scarabeus Exp $
+
+*libreoffice-3.4.9999 (30 Jul 2011)
+
+ 30 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, +libreoffice-3.4.9999.ebuild:
+ Add support for live ebuilds. Add live ebuild from 3.4 branch. Master branch
+ needs A LOT more work so it won't appear soon.
29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild,
1.12 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.11&r2=1.12
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libreoffice-3.4.2.3.ebuild 29 Jul 2011 18:56:50 -0000 1.11
+++ libreoffice-3.4.2.3.ebuild 30 Jul 2011 15:16:28 -0000 1.12
@@ -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-3.4.2.3.ebuild,v 1.11 2011/07/29 18:56:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.12 2011/07/30 15:16:28 scarabeus Exp $
EAPI=3
@@ -23,25 +23,29 @@
BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
# Shiny split sources with so many packages...
-MODULES="artwork base calc components extensions extras filters help
+# Bootstrap MUST be first!
+MODULES="bootstrap artwork base calc components extensions extras filters help
impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
ure writer translations"
-for i in ${DEV_URI}; do
- # split out as bootstrap is required to be done first
- SRC_URI+=" ${i}/${PN}-bootstrap-${PV}.tar.bz2"
- for mod in ${MODULES}; do
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
+ done
+ unset mod
done
- unset mod
-done
-unset i
+ unset i
+fi
unset DEV_URI
# addons
@@ -112,7 +116,7 @@
test +vba webdav"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
# translations
LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
@@ -295,25 +299,36 @@
}
src_unpack() {
- local mod dest tmplfile tmplname
+ local mod dest tmplfile tmplname mypv
if use branding; then
unpack "${BRANDING}"
fi
- #first the bootstrap files
- unpack "${PN}-bootstrap-${PV}.tar.bz2"
-
- # and then all the separate modules
- for mod in ${MODULES}; do
- unpack "${PN}-${mod}-${PV}.tar.bz2"
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
- # punt the empty dirs; it is annoying during debuging :)
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- done
-
- # don't forget the wrapper...
- cp "${FILESDIR}"/wrapper.in "${T}"
+ if [[ ${PV} != *9999* ]]; then
+ for mod in ${MODULES}; do
+ unpack "${PN}-${mod}-${PV}.tar.bz2"
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_PROJECT="${PN}/${mod}"
+ EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ EGIT_NOUNPACK="true"
+ git-2_src_unpack
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+ fi
# copy extension templates; o what fun ...
if use templates; then
1.1 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.1&content-type=text/plain
Index: libreoffice-3.4.9999.ebuild
===================================================================
# 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-3.4.9999.ebuild,v 1.1 2011/07/30 15:16:28 scarabeus Exp $
EAPI=3
KDE_REQUIRED="optional"
CMAKE_REQUIRED="never"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="threads,xml"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src
http://download.documentfoundation.org/libreoffice/old/src
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
# Shiny split sources with so many packages...
# Bootstrap MUST be first!
MODULES="bootstrap artwork base calc components extensions extras filters help
impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
ure writer translations"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
done
unset mod
done
unset i
fi
unset DEV_URI
# addons
# FIXME: actually review which one of these are used
ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
SRC_URI+=" ${ADDONS_SRC}"
# intersection of available linguas and app-dicts/myspell-* dictionaries
SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb
nl nn pl pt ru sk sl sv tn zu"
for X in ${SPELL_DIRS} ; do
SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
done
unset X
TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
SRC_URI+=" templates? ( ${TDEPEND} )"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite
gstreamer gtk kde ldap mysql nsplugin odk offlinehelp opengl python templates
test +vba webdav"
LICENSE="LGPL-3"
SLOT="0"
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
# translations
LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
for X in ${LANGUAGES} ; do
IUSE+=" linguas_${X}"
done
unset X
COMMON_DEPEND="
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.1.4-r1
app-text/mythes
app-text/libwpd:0.9[tools]
>=app-text/libwps-0.2.2
>=app-text/poppler-0.12.3-r3[xpdf-headers]
dev-db/unixODBC
dev-libs/expat
>=dev-libs/glib-2.18
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.0
>=dev-lang/perl-5.0
>=dev-libs/openssl-0.9.8g
dev-libs/redland[ssl]
media-libs/freetype:2
>=media-libs/fontconfig-2.3.0
>=media-libs/vigra-1.4
media-libs/libpng
media-libs/libwpg:0.2
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
>=x11-libs/cairo-1.0.2
x11-libs/libXaw
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.71 )
eds? ( >=gnome-extra/evolution-data-server-1.2 )
gnome? (
>=x11-libs/gtk+-2.10:2
gnome-base/gconf:2
)
gtk? ( >=x11-libs/gtk+-2.10:2 )
graphite? ( media-gfx/graphite2 )
gstreamer? (
>=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10
)
java? (
>=dev-java/bsh-2.0_beta4
dev-java/lucene:2.9
dev-java/lucene-analyzers:2.3
dev-java/saxon:0
)
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c++ )
nsplugin? (
net-libs/xulrunner:1.9
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1
)
opengl? ( virtual/opengl )
webdav? ( net-libs/neon )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/openoffice-bin
!app-office/openoffice
java? ( >=virtual/jre-1.5 )
${SPELL_DIRS_DEPEND}
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.36
>=dev-libs/libxml2-2.0
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds
dev-util/pkgconfig
media-gfx/sane-backends
>=net-misc/curl-7.12
>=sys-apps/findutils-4.1.20-r1
sys-devel/bison
sys-apps/coreutils
sys-devel/flex
sys-libs/zlib
x11-libs/libXtst
x11-proto/randrproto
x11-proto/xextproto
x11-proto/xineramaproto
x11-proto/xproto
java? (
=virtual/jdk-1.6*
>=dev-java/ant-core-1.7
test? ( dev-java/junit:4 )
)
"
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"
"${FILESDIR}/${PN}-svx.patch"
"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
"${FILESDIR}/${PN}-solenv-build-crash.patch"
"${FILESDIR}/${PN}-as-needed-gtk.patch"
"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
"${FILESDIR}/${PN}-installed-files-permissions.patch"
)
# Uncoment me when updating to eapi4
# REQUIRED_USE="
# || ( gtk gnome kde )
# gnome? ( gtk )
# nsplugin? ( gtk )
#"
S="${WORKDIR}/${PN}-bootstrap-${PV}"
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python_set_active_version 2
python_pkg_setup
if [[ $(gcc-major-version) -lt 4 ]]; then
eerror "Compilation with gcc older than 4.0 is not supported"
die "Too old gcc found."
fi
if use custom-cflags; then
ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
ewarn "all sorts of build and runtime errors."
ewarn
ewarn "Before reporting a bug, please make sure you rebuild and try with"
ewarn "basic CFLAGS, otherwise the bug will not be accepted."
ewarn
fi
if ! use java; then
ewarn "You are building with java-support disabled, this results in some"
ewarn "of the LibreOffice functionality being disabled."
ewarn "If something you need does not work for you, rebuild with"
ewarn "java in your USE-flags."
ewarn
ewarn "Some java libraries will be provided internally by libreoffice"
ewarn "during the build. You should really reconsider enabling java"
ewarn "use flag."
ewarn
fi
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."
ewarn
fi
ewarn "Libreoffice compilation often fails on parallel issues"
ewarn "but the slowdown by enforcing MAKEOPTS=-j1 is too huge."
ewarn "If you encounter errors try yourself to disable parallel build."
# Check if we have enough RAM and free diskspace to build this beast
CHECKREQS_MEMORY="1024"
use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216"
check_reqs
}
src_unpack() {
local mod dest tmplfile tmplname mypv
if use branding; then
unpack "${BRANDING}"
fi
if [[ ${PV} != *9999* ]]; then
for mod in ${MODULES}; do
unpack "${PN}-${mod}-${PV}.tar.bz2"
if [[ ${mod} != bootstrap ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
else
for mod in ${MODULES}; do
mypv=${PV/.9999}
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
EGIT_PROJECT="${PN}/${mod}"
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
EGIT_NOUNPACK="true"
git-2_src_unpack
if [[ ${mod} != bootstrap ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
fi
# copy extension templates; o what fun ...
if use templates; then
dest="${S}/extras/source/extensions"
mkdir -p "${dest}"
for template in ${TDEPEND}; do
if [[ ${template} == *.oxt ]]; then
tmplfile="${DISTDIR}/$(basename ${template})"
tmplname="$(echo "${template}" | \
cut -f 2- -s -d - | cut -f 1 -d _)"
echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
fi
fi
done
fi
}
src_prepare() {
eprefixify "${T}"/wrapper.in
strip-linguas ${LANGUAGES}
LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
# Now for our optimization flags ...
export ARCH_FLAGS="${CXXFLAGS}"
use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
# compiler flags
use custom-cflags || strip-flags
use debug || filter-flags "-g*"
# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
filter-flags "-O*"
base_src_prepare
eautoreconf
}
src_configure() {
local java_opts
local internal_libs
local extensions
local themes="crystal"
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
# expand themes we are going to build based on DE useflags
use gnome && themes+=" tango"
use kde && themes+=" oxygen"
# list the extensions we are going to build by default
extensions="
--enable-ext-pdfimport
--enable-ext-presenter-console
--enable-ext-presenter-minimizer
"
# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
# dmake: not worth of splitting out
internal_libs+="
--without-system-hsqldb
"
# When building without java some things needs to be done
# as internal libraries.
if ! use java; then
internal_libs+="
--without-system-beanshell
--without-system-lucene
--without-system-saxon
--without-junit
"
else
java_opts="
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
"
if use test; then
java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
else
java_opts+=" --without-junit"
fi
fi
if use branding; then
extensions+="
--with-about-bitmap="${WORKDIR}/branding-about.png"
--with-intro-bitmap="${WORKDIR}/branding-intro.png"
"
fi
# system headers/libs/...: enforce using system packages
# only expections are mozilla and odbc/sane/xrender-header(s).
# for jars the exception is db.jar controlled by --with-system-db
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --disable-broffice: do not use brazillian brand just be uniform
# --enable-cairo: ensure that cairo is always required
# --enable-*-link: link to the library rather than just dlopen on runtime
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-gnome-vfs: old gnome virtual fs support
# --disable-kdeab: kde3 adressbook
# --disable-kde: kde3 support
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-static-gtk: ensure that gtk is linked dynamically
# --disable-zenity: disable build icon
# --with-extension-integration: enable any extension integration support
# --with-{max-jobs,num-cpus}: ensuring parallel building
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --without-stlport: disable deprecated extensions framework
econf \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-db \
--with-system-dicts \
--enable-cairo \
--enable-fontconfig \
--enable-largefile \
--enable-randr \
--enable-randr-link \
--enable-unix-qstart-libpng \
--enable-Xaw \
--enable-xrender-link \
--disable-broffice \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
--disable-kdeab \
--disable-kde \
--disable-online-update \
--disable-pch \
--disable-rpath \
--disable-static-gtk \
--disable-strip-solver \
--disable-zenity \
--with-alloc=system \
--with-build-version="Gentoo official package" \
--with-extension-integration \
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
--with-max-jobs=${jbs} \
--with-num-cpus=1 \
--with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \
--without-fonts \
--without-myspell-dicts \
--without-ppds \
--without-stlport \
$(use_enable binfilter) \
$(use_enable cups) \
$(use_enable dbus) \
$(use_enable debug crashdump) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
$(use_enable graphite) \
$(use_enable gstreamer) \
$(use_enable gtk) \
$(use_enable gtk systray) \
$(use_enable java ext-scripting-beanshell) \
$(use_enable kde kde4) \
$(use_enable ldap) \
$(use_enable mysql ext-mysql-connector) \
$(use_enable nsplugin mozilla) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable python) \
$(use_enable python ext-scripting-python) \
$(use_enable vba) \
$(use_enable vba activex-component) \
$(use_enable webdav neon) \
$(use_with java) \
$(use_with ldap openldap) \
$(use_with mysql system-mysql-cppconn) \
$(use_with nsplugin system-mozilla libxul) \
$(use_with offlinehelp helppack-integration) \
$(use_with templates sun-templates) \
${internal_libs} \
${java_opts} \
${extensions}
}
src_compile() {
# this is not a proper make script and the jobs are passed during configure
make || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
# symlink the plugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
fi
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc || die
fi
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
}
pkg_postrm() {
kde4-base_pkg_postrm
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-07-30 17:03 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-30 17:03 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/07/30 17:03:07
Modified: libreoffice-3.4.9999.ebuild ChangeLog
libreoffice-3.4.2.3.ebuild
Log:
Drop one more place where wrapper.in was used.
(Portage version: 2.2.0_alpha49/cvs/Linux x86_64)
Revision Changes Path
1.2 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.1&r2=1.2
Index: libreoffice-3.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-3.4.9999.ebuild 30 Jul 2011 15:16:28 -0000 1.1
+++ libreoffice-3.4.9999.ebuild 30 Jul 2011 17:03:07 -0000 1.2
@@ -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-3.4.9999.ebuild,v 1.1 2011/07/30 15:16:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.2 2011/07/30 17:03:07 scarabeus Exp $
EAPI=3
@@ -349,8 +349,6 @@
}
src_prepare() {
- eprefixify "${T}"/wrapper.in
-
strip-linguas ${LANGUAGES}
LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
1.77 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 30 Jul 2011 15:16:28 -0000 1.76
+++ ChangeLog 30 Jul 2011 17:03:07 -0000 1.77
@@ -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.76 2011/07/30 15:16:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.77 2011/07/30 17:03:07 scarabeus Exp $
+
+ 30 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild:
+ Drop one more place where wrapper.in was used.
*libreoffice-3.4.9999 (30 Jul 2011)
1.13 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.12&r2=1.13
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libreoffice-3.4.2.3.ebuild 30 Jul 2011 15:16:28 -0000 1.12
+++ libreoffice-3.4.2.3.ebuild 30 Jul 2011 17:03:07 -0000 1.13
@@ -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-3.4.2.3.ebuild,v 1.12 2011/07/30 15:16:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.13 2011/07/30 17:03:07 scarabeus Exp $
EAPI=3
@@ -350,8 +350,6 @@
}
src_prepare() {
- eprefixify "${T}"/wrapper.in
-
strip-linguas ${LANGUAGES}
LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-08-03 17:23 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-08-03 17:23 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/08/03 17:23:04
Modified: libreoffice-3.4.9999.ebuild ChangeLog
libreoffice-3.4.2.3.ebuild
Log:
Fix finding qt libraries on 32b platform. Fixes bug #377377.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Revision Changes Path
1.4 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.3&r2=1.4
Index: libreoffice-3.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-3.4.9999.ebuild 31 Jul 2011 16:03:50 -0000 1.3
+++ libreoffice-3.4.9999.ebuild 3 Aug 2011 17:23:04 -0000 1.4
@@ -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-3.4.9999.ebuild,v 1.3 2011/07/31 16:03:50 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.4 2011/08/03 17:23:04 scarabeus Exp $
EAPI=3
@@ -235,6 +235,7 @@
"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
"${FILESDIR}/${PN}-installed-files-permissions.patch"
+ "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
)
# Uncoment me when updating to eapi4
1.81 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 1 Aug 2011 15:51:36 -0000 1.80
+++ ChangeLog 3 Aug 2011 17:23:04 -0000 1.81
@@ -1,6 +1,11 @@
# 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.80 2011/08/01 15:51:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.81 2011/08/03 17:23:04 scarabeus Exp $
+
+ 03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,
+ +files/libreoffice-32b-qt4-libdir.patch:
+ Fix finding qt libraries on 32b platform. Fixes bug #377377.
01 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild, +files/libreoffice-append-no-avx.patch:
1.16 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.15&r2=1.16
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libreoffice-3.4.2.3.ebuild 1 Aug 2011 15:51:36 -0000 1.15
+++ libreoffice-3.4.2.3.ebuild 3 Aug 2011 17:23:04 -0000 1.16
@@ -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-3.4.2.3.ebuild,v 1.15 2011/08/01 15:51:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.16 2011/08/03 17:23:04 scarabeus Exp $
EAPI=3
@@ -237,6 +237,7 @@
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
"${FILESDIR}/${PN}-installed-files-permissions.patch"
"${FILESDIR}/${PN}-append-no-avx.patch"
+ "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
)
# Uncoment me when updating to eapi4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-08-04 16:31 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-08-04 16:31 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/08/04 16:31:41
Modified: libreoffice-3.4.9999.ebuild ChangeLog
libreoffice-3.4.2.3.ebuild
Log:
media-libs/libwpg to app-text/libwpg
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Revision Changes Path
1.5 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.4&r2=1.5
Index: libreoffice-3.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreoffice-3.4.9999.ebuild 3 Aug 2011 17:23:04 -0000 1.4
+++ libreoffice-3.4.9999.ebuild 4 Aug 2011 16:31:40 -0000 1.5
@@ -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-3.4.9999.ebuild,v 1.4 2011/08/03 17:23:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.5 2011/08/04 16:31:40 scarabeus Exp $
EAPI=3
@@ -147,7 +147,7 @@
>=media-libs/fontconfig-2.3.0
>=media-libs/vigra-1.4
media-libs/libpng
- media-libs/libwpg:0.2
+ app-text/libwpg:0.2
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
1.84 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.83&r2=1.84
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog 4 Aug 2011 16:18:37 -0000 1.83
+++ ChangeLog 4 Aug 2011 16:31:40 -0000 1.84
@@ -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.83 2011/08/04 16:18:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.84 2011/08/04 16:31:40 scarabeus Exp $
+
+ 04 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild:
+ media-libs/libwpg to app-text/libwpg
04 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild, +files/libreoffice-check-for-avx.patch,
1.18 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.17&r2=1.18
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libreoffice-3.4.2.3.ebuild 4 Aug 2011 16:18:37 -0000 1.17
+++ libreoffice-3.4.2.3.ebuild 4 Aug 2011 16:31:40 -0000 1.18
@@ -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-3.4.2.3.ebuild,v 1.17 2011/08/04 16:18:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.18 2011/08/04 16:31:40 scarabeus Exp $
EAPI=3
@@ -147,7 +147,7 @@
>=media-libs/fontconfig-2.3.0
>=media-libs/vigra-1.4
media-libs/libpng
- media-libs/libwpg:0.2
+ app-text/libwpg:0.2
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-08-06 8:49 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-08-06 8:49 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/08/06 08:49:09
Modified: libreoffice-3.4.9999.ebuild ChangeLog
libreoffice-3.4.2.3.ebuild
Log:
Update branding to version 0.3. Fixes bug #377899. Sync the live and release ebuilds.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Revision Changes Path
1.6 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.5&r2=1.6
Index: libreoffice-3.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libreoffice-3.4.9999.ebuild 4 Aug 2011 16:31:40 -0000 1.5
+++ libreoffice-3.4.9999.ebuild 6 Aug 2011 08:49:09 -0000 1.6
@@ -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-3.4.9999.ebuild,v 1.5 2011/08/04 16:31:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.6 2011/08/06 08:49:09 scarabeus Exp $
EAPI=3
@@ -21,7 +21,7 @@
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
-BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
@@ -235,7 +235,10 @@
"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
"${FILESDIR}/${PN}-installed-files-permissions.patch"
+ "${FILESDIR}/${PN}-check-for-avx.patch"
+ "${FILESDIR}/${PN}-append-no-avx.patch"
"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
+ "${FILESDIR}/${PN}-binfilter-as-needed.patch"
)
# Uncoment me when updating to eapi4
@@ -349,7 +352,19 @@
src_prepare() {
strip-linguas ${LANGUAGES}
- LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
+
+ # HACK: linguas needs special parsing until fixed upstream
+ if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then
+ # if empty or just english we want empty
+ LO_LANGUAGES=
+ elif [[ ${LINGUAS} =~ en( |$) ]]; then
+ # otherwise if more then one language and english we
+ # replace en to en-US
+ LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})"
+ else
+ # and finally if no en is set we add en-US
+ LO_LANGUAGES="en-US ${LINGUAS//_/-}"
+ fi
# Now for our optimization flags ...
export ARCH_FLAGS="${CXXFLAGS}"
1.87 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.86&r2=1.87
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog 5 Aug 2011 07:41:11 -0000 1.86
+++ ChangeLog 6 Aug 2011 08:49:09 -0000 1.87
@@ -1,6 +1,11 @@
# 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.86 2011/08/05 07:41:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.87 2011/08/06 08:49:09 scarabeus Exp $
+
+ 06 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild:
+ Update branding to version 0.3. Fixes bug #377899. Sync the live and release
+ ebuilds.
05 Aug 2011; Michał Górny <mgorny@gentoo.org>
files/libreoffice-check-for-avx.patch:
1.20 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.19&r2=1.20
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libreoffice-3.4.2.3.ebuild 4 Aug 2011 17:56:40 -0000 1.19
+++ libreoffice-3.4.2.3.ebuild 6 Aug 2011 08:49:09 -0000 1.20
@@ -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-3.4.2.3.ebuild,v 1.19 2011/08/04 17:56:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.20 2011/08/06 08:49:09 scarabeus Exp $
EAPI=3
@@ -21,7 +21,7 @@
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
-BRANDING="${PN}-branding-gentoo-0.2.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild
@ 2011-08-06 16:48 Matt Turner (mattst88)
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner (mattst88) @ 2011-08-06 16:48 UTC (permalink / raw
To: gentoo-commits
mattst88 11/08/06 16:48:01
Modified: libreoffice-3.4.9999.ebuild ChangeLog
libreoffice-3.4.2.3.ebuild
Log:
Replace LINGUAS_OOO with LO_LANGUAGES, bug 378007.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.7 app-office/libreoffice/libreoffice-3.4.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.6&r2=1.7
Index: libreoffice-3.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-3.4.9999.ebuild 6 Aug 2011 08:49:09 -0000 1.6
+++ libreoffice-3.4.9999.ebuild 6 Aug 2011 16:48:01 -0000 1.7
@@ -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-3.4.9999.ebuild,v 1.6 2011/08/06 08:49:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.7 2011/08/06 16:48:01 mattst88 Exp $
EAPI=3
@@ -495,7 +495,7 @@
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
- --with-lang="${LINGUAS_OOO}" \
+ --with-lang="${LO_LANGUAGES}" \
--with-max-jobs=${jbs} \
--with-num-cpus=1 \
--with-theme="${themes}" \
1.88 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.87&r2=1.88
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog 6 Aug 2011 08:49:09 -0000 1.87
+++ ChangeLog 6 Aug 2011 16:48:01 -0000 1.88
@@ -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.87 2011/08/06 08:49:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.88 2011/08/06 16:48:01 mattst88 Exp $
+
+ 06 Aug 2011; Matt Turner <mattst88@gentoo.org> libreoffice-3.4.2.3.ebuild,
+ libreoffice-3.4.9999.ebuild:
+ Replace LINGUAS_OOO with LO_LANGUAGES, bug 378007.
06 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild:
1.21 app-office/libreoffice/libreoffice-3.4.2.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild?r1=1.20&r2=1.21
Index: libreoffice-3.4.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libreoffice-3.4.2.3.ebuild 6 Aug 2011 08:49:09 -0000 1.20
+++ libreoffice-3.4.2.3.ebuild 6 Aug 2011 16:48:01 -0000 1.21
@@ -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-3.4.2.3.ebuild,v 1.20 2011/08/06 08:49:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.21 2011/08/06 16:48:01 mattst88 Exp $
EAPI=3
@@ -496,7 +496,7 @@
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
- --with-lang="${LINGUAS_OOO}" \
+ --with-lang="${LO_LANGUAGES}" \
--with-max-jobs=${jbs} \
--with-num-cpus=1 \
--with-theme="${themes}" \
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-06 16:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-06 16:48 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.9999.ebuild ChangeLog libreoffice-3.4.2.3.ebuild Matt Turner (mattst88)
-- strict thread matches above, loose matches on Subject: below --
2011-08-06 8:49 Tomas Chvatal (scarabeus)
2011-08-04 16:31 Tomas Chvatal (scarabeus)
2011-08-03 17:23 Tomas Chvatal (scarabeus)
2011-07-30 17:03 Tomas Chvatal (scarabeus)
2011-07-30 15:16 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox