* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.1.ebuild ChangeLog
@ 2013-01-11 21:24 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-11 21:24 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/01/11 21:24:53
Modified: libreoffice-9999-r2.ebuild
libreoffice-4.0.9999.ebuild ChangeLog
Added: libreoffice-4.0.0.1.ebuild
Log:
Bump to 4.0rc1 for testing, unmasked as already a lot of regression testing was done.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.148 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.147&r2=1.148
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- libreoffice-9999-r2.ebuild 10 Jan 2013 10:13:21 -0000 1.147
+++ libreoffice-9999-r2.ebuild 11 Jan 2013 21:24:53 -0000 1.148
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.147 2013/01/10 10:13:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.148 2013/01/11 21:24:53 scarabeus Exp $
EAPI=5
@@ -9,7 +9,7 @@
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -43,7 +43,11 @@
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
done
unset mod
done
@@ -234,8 +238,6 @@
nsplugin? ( gtk )
"
-S="${WORKDIR}/${PN}-core-${PV}"
-
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
@@ -276,21 +278,13 @@
local mod mod2 dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- if use branding; then
- unpack "${BRANDING}"
- fi
+ use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
unpack "${PN}-${mod}-${PV}.tar.xz"
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
done
else
for mod in ${MODULES}; do
@@ -405,6 +399,11 @@
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
+ # System python 2.7 enablement:
+ export PYTHON="${PYTHON}"
+ export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
+ export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
1.10 app-office/libreoffice/libreoffice-4.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.9&r2=1.10
Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libreoffice-4.0.9999.ebuild 1 Jan 2013 10:56:53 -0000 1.9
+++ libreoffice-4.0.9999.ebuild 11 Jan 2013 21:24:53 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.9 2013/01/01 10:56:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.10 2013/01/11 21:24:53 scarabeus Exp $
EAPI=5
@@ -9,7 +9,7 @@
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -35,15 +35,20 @@
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-# Split modules following git/tarballs
-# Core MUST be first!
# Help is used for the image generator
+# We can also build translations and others if needed.
+# Core must be first
MODULES="core help"
# 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.xz"
+ if [[ ${mod} == core ]]; then
+ # core is now packed without it in the name, git reponame stay
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
done
unset mod
done
@@ -234,8 +239,6 @@
nsplugin? ( gtk )
"
-S="${WORKDIR}/${PN}-core-${PV}"
-
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
@@ -276,21 +279,13 @@
local mod mod2 dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- if use branding; then
- unpack "${BRANDING}"
- fi
+ use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
unpack "${PN}-${mod}-${PV}.tar.xz"
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
done
else
for mod in ${MODULES}; do
@@ -405,6 +400,11 @@
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
+ # System python 2.7 enablement:
+ export PYTHON="${PYTHON}"
+ export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
+ export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
@@ -441,6 +441,7 @@
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
+ --enable-hardlink-deliver \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
1.428 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.428&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.428&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.427&r2=1.428
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- ChangeLog 10 Jan 2013 10:14:24 -0000 1.427
+++ ChangeLog 11 Jan 2013 21:24:53 -0000 1.428
@@ -1,6 +1,13 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.427 2013/01/10 10:14:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.428 2013/01/11 21:24:53 scarabeus Exp $
+
+*libreoffice-4.0.0.1 (11 Jan 2013)
+
+ 11 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.0.0.1.ebuild,
+ libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+ Bump to 4.0rc1 for testing, unmasked as already a lot of regression testing
+ was done.
10 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
Drop unused desc.
1.1 app-office/libreoffice/libreoffice-4.0.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.1&content-type=text/plain
Index: libreoffice-4.0.0.1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.1 2013/01/11 21:24:53 scarabeus Exp $
EAPI=5
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_COMPAT=( python2_7 python3_3 )
PYTHON_REQ_USE="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/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.7.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Help is used for the image generator
# We can also build translations and others if needed.
# Core must be first
MODULES="core help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
if [[ ${mod} == core ]]; then
# core is now packed without it in the name, git reponame stay
SRC_URI+=" ${i}/${P}.tar.xz"
else
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
fi
done
unset mod
done
unset i
fi
unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
SRC_URI+=" ${ADDONS_SRC}"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
telepathy test +vba +webdav"
LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
# report-builder: missing java packages
for lo_xt in ${LO_EXTS}; do
IUSE+=" libreoffice_extensions_${lo_xt}"
done
unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
app-text/liblangtag
app-text/libmspub
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.3
dev-db/unixODBC
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1
>=dev-libs/liborcus-0.3
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
media-libs/lcms:2
>=media-libs/libpng-1.4
>=media-libs/libcdr-0.0.5
media-libs/libvisio
>=net-misc/curl-7.21.4
net-misc/npapi-sdk
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
bluetooth? ( net-wireless/bluez )
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
gnome? ( gnome-base/gconf:2 )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
gtk3? ( >=x11-libs/gtk+-3.2:3 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
libreoffice_extensions_wiki-publisher? (
dev-java/commons-codec:0
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
opengl? (
virtual/glu
virtual/opengl
)
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
>=net-libs/telepathy-glib-0.18.0
)
webdav? ( net-libs/neon )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
=app-office/libreoffice-l10n-3.6*
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds
virtual/pkgconfig
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
>=sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
x11-libs/libXt
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
)
odk? ( app-doc/doxygen )
test? ( dev-util/cppunit )
"
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
"${FILESDIR}/${PN}-3.7-separate-checks.patch"
)
REQUIRED_USE="
bluetooth? ( dbus )
gnome? ( gtk )
eds? ( gnome )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
nsplugin? ( gtk )
"
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
local pgslot
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
; then
eerror "Compilation with gcc older than 4.6 is not supported"
die "Too old gcc found."
fi
fi
# ensure pg version
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
}
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python-single-r1_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
src_unpack() {
local mod mod2 dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
unpack "${P}.tar.xz"
for mod in ${MODULES}; do
[[ ${mod} == core ]] && continue
unpack "${PN}-${mod}-${PV}.tar.xz"
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} != core ]]; then
mod2=${mod}
# mapping does not match on help
[[ ${mod} == help ]] && mod2="helpcontent2"
mkdir -p "${S}/${mod2}/" || die
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
# optimization flags
export ARCH_FLAGS="${CXXFLAGS}"
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
export GMAKE_OPTIONS="${MAKEOPTS}"
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
EPATCH_SUFFIX="patch" \
epatch
fi
base_src_prepare
AT_M4DIR="m4"
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
sed \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
-i pyuno/source/module/uno.py \
-i scripting/source/pyprov/officehelper.py || die
}
src_configure() {
local java_opts
local internal_libs
local lo_ext
local ext_opts
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"
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
# it is serious pain in the ass for packaging
# should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
"
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
else
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
fi
done
if use java; then
# hsqldb: system one is too new
java_opts="
--without-junit
--without-system-hsqldb
--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)/"
"
use libreoffice_extensions_scripting-beanshell && \
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
if use libreoffice_extensions_wiki-publisher; then
java_opts+="
--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
# System python 2.7 enablement:
export PYTHON="${PYTHON}"
export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --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-mozilla: mozilla internal is for contact integration, never
# worked on linux
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-systray: quickstarter does not actually work at all so do not
# promote it
# --disable-zenity: disable build icon
# --enable-extension-integration: enable any extension integration support
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --without-stlport: disable deprecated extensions framework
# --disable-ext-report-builder: too much java packages pulled in
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-dicts \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
--enable-mergelibs \
--enable-python=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
--enable-hardlink-deliver \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
--disable-gstreamer-0-10 \
--disable-ext-report-builder \
--disable-kdeab \
--disable-kde \
--disable-mozilla \
--disable-online-update \
--disable-pch \
--disable-rpath \
--disable-systray \
--disable-zenity \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-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="" \
--with-parallelism=${jbs} \
--with-system-ucpp \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \
--without-fonts \
--without-myspell-dicts \
--without-stlport \
--without-system-mozilla \
--without-help \
--with-helppack-integration \
--without-sun-templates \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable cups) \
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
$(use_enable gtk) \
$(use_enable gtk3) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mysql-connector) \
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable webdav neon) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
${internal_libs} \
${java_opts} \
${ext_opts}
}
src_compile() {
# hack for offlinehelp, this needs fixing upstream at some point
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
source "${T}/config_host.mk" 2&> /dev/null
local path="${SOLARVER}/${INPATH}/res/img"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
)
# this is not a proper make script
make build || die
}
src_test() {
make unitcheck || die
make slowcheck || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
# symlink the nsplugin to proper location
use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
# Hack for offlinehelp, this needs fixing upstream at some point.
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
rm -rf "${ED}"/usr/share/mimelnk/
}
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
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.1.ebuild ChangeLog
@ 2013-01-12 10:52 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-12 10:52 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/01/12 10:52:05
Modified: libreoffice-9999-r2.ebuild
libreoffice-4.0.9999.ebuild
libreoffice-4.0.0.1.ebuild ChangeLog
Log:
As pdfimport was turned to internal code it was decided to have it non optional :/ Fixes bug#451508.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.149 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.148&r2=1.149
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- libreoffice-9999-r2.ebuild 11 Jan 2013 21:24:53 -0000 1.148
+++ libreoffice-9999-r2.ebuild 12 Jan 2013 10:52:05 -0000 1.149
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.148 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.149 2013/01/12 10:52:05 scarabeus Exp $
EAPI=5
@@ -72,8 +72,8 @@
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -104,6 +104,7 @@
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
+ >=app-text/poppler-0.16[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.3
dev-db/unixODBC
@@ -161,7 +162,6 @@
virtual/glu
virtual/opengl
)
- pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
@@ -487,7 +487,6 @@
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
- $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
1.11 app-office/libreoffice/libreoffice-4.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.10&r2=1.11
Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libreoffice-4.0.9999.ebuild 11 Jan 2013 21:24:53 -0000 1.10
+++ libreoffice-4.0.9999.ebuild 12 Jan 2013 10:52:05 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.10 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.11 2013/01/12 10:52:05 scarabeus Exp $
EAPI=5
@@ -73,8 +73,8 @@
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -105,6 +105,7 @@
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
+ >=app-text/poppler-0.16[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.3
dev-db/unixODBC
@@ -162,7 +163,6 @@
virtual/glu
virtual/opengl
)
- pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
@@ -494,7 +494,6 @@
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
- $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
1.2 app-office/libreoffice/libreoffice-4.0.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?r1=1.1&r2=1.2
Index: libreoffice-4.0.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-4.0.0.1.ebuild 11 Jan 2013 21:24:53 -0000 1.1
+++ libreoffice-4.0.0.1.ebuild 12 Jan 2013 10:52:05 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.1 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.2 2013/01/12 10:52:05 scarabeus Exp $
EAPI=5
@@ -73,8 +73,8 @@
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
-telepathy test +vba +webdav"
+gtk3 jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba
++webdav"
LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -105,6 +105,7 @@
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
+ >=app-text/poppler-0.16[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.3
dev-db/unixODBC
@@ -162,7 +163,6 @@
virtual/glu
virtual/opengl
)
- pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
@@ -494,7 +494,6 @@
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
- $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
1.429 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.428&r2=1.429
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- ChangeLog 11 Jan 2013 21:24:53 -0000 1.428
+++ ChangeLog 12 Jan 2013 10:52:05 -0000 1.429
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.428 2013/01/11 21:24:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.429 2013/01/12 10:52:05 scarabeus Exp $
+
+ 12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.1.ebuild,
+ libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+ As pdfimport was turned to internal code it was decided to have it non
+ optional :/ Fixes bug#451508.
*libreoffice-4.0.0.1 (11 Jan 2013)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.1.ebuild ChangeLog
@ 2013-01-15 15:45 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-15 15:45 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/01/15 15:45:50
Modified: libreoffice-9999-r2.ebuild
libreoffice-4.0.9999.ebuild
libreoffice-4.0.0.1.ebuild ChangeLog
Log:
Fix nsplugins calls. Fixes bug#452368.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.153 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.152&r2=1.153
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- libreoffice-9999-r2.ebuild 14 Jan 2013 13:24:37 -0000 1.152
+++ libreoffice-9999-r2.ebuild 15 Jan 2013 15:45:50 -0000 1.153
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.152 2013/01/14 13:24:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.153 2013/01/15 15:45:50 scarabeus Exp $
EAPI=5
@@ -27,7 +27,7 @@
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
1.15 app-office/libreoffice/libreoffice-4.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.14&r2=1.15
Index: libreoffice-4.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libreoffice-4.0.9999.ebuild 14 Jan 2013 13:24:37 -0000 1.14
+++ libreoffice-4.0.9999.ebuild 15 Jan 2013 15:45:50 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.14 2013/01/14 13:24:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.15 2013/01/15 15:45:50 scarabeus Exp $
EAPI=5
@@ -27,7 +27,7 @@
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
1.3 app-office/libreoffice/libreoffice-4.0.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild?r1=1.2&r2=1.3
Index: libreoffice-4.0.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-4.0.0.1.ebuild 12 Jan 2013 10:52:05 -0000 1.2
+++ libreoffice-4.0.0.1.ebuild 15 Jan 2013 15:45:50 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.2 2013/01/12 10:52:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.3 2013/01/15 15:45:50 scarabeus Exp $
EAPI=5
@@ -27,7 +27,7 @@
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
1.434 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.434&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.434&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.433&r2=1.434
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- ChangeLog 14 Jan 2013 13:24:37 -0000 1.433
+++ ChangeLog 15 Jan 2013 15:45:50 -0000 1.434
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.433 2013/01/14 13:24:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.434 2013/01/15 15:45:50 scarabeus Exp $
+
+ 15 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.0.1.ebuild,
+ libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+ Fix nsplugins calls. Fixes bug#452368.
14 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild,
libreoffice-9999-r2.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-15 15:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-11 21:24 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.1.ebuild ChangeLog Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2013-01-12 10:52 Tomas Chvatal (scarabeus)
2013-01-15 15:45 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