public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-bin: ChangeLog libreoffice-bin-3.3.1.ebuild
@ 2011-02-23 14:34 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-02-23 14:34 UTC (permalink / raw
  To: gentoo-commits

suka        11/02/23 14:34:12

  Modified:             ChangeLog
  Added:                libreoffice-bin-3.3.1.ebuild
  Log:
  Bump to LibreOffice 3.3.1
  
  (Portage version: 2.1.9.41/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 app-office/libreoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	10 Feb 2011 21:20:22 -0000	1.9
+++ ChangeLog	23 Feb 2011 14:34:12 -0000	1.10
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.9 2011/02/10 21:20:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.10 2011/02/23 14:34:12 suka Exp $
+
+*libreoffice-bin-3.3.1 (23 Feb 2011)
+
+  23 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
+  +libreoffice-bin-3.3.1.ebuild:
+  Bump to LibreOffice 3.3.1
 
   10 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
   libreoffice-bin-3.3.0-r1.ebuild:



1.1                  app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild?rev=1.1&content-type=text/plain

Index: libreoffice-bin-3.3.1.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-bin/libreoffice-bin-3.3.1.ebuild,v 1.1 2011/02/23 14:34:12 suka Exp $

EAPI="3"

inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib

IUSE="gnome java offlinehelp"

MY_PV="${PV/_/-}"
MY_PV2="${PV}rc2"
BVER="3.3.1-8"
BVER2="3.3-8"
UREVER="1.7.0-8"
BASIS="libobasis3.3"
FILEPATH="http://download.documentfoundation.org/libreoffice/stable/${PV}/rpm/"

if [ "${ARCH}" = "amd64" ] ; then
	LOARCH="x86_64"
	LOARCH2="x86-64"
else
	LOARCH="i586"
	LOARCH2="x86"
fi

S="${WORKDIR}/en-US/RPMS"
UP="LibO_${MY_PV2}_Linux_${LOARCH2}_install-rpm_en-US/RPMS"
DESCRIPTION="LibreOffice productivity suite."

SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz
		offlinehelp? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_en-US.tar.gz ) )
	x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz
		offlinehelp? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_helppack-rpm_en-US.tar.gz ) )"

LANGS="af ar as ast be_BY 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 ko kok ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa_IN pl pt pt_BR ro ru rw sa_IN sat sd sh si 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 ${LANGS} ; do
	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
		amd64? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz
			offlinehelp? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_${X/_/-}.tar.gz ) )
		x86? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz
			offlinehelp? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_helppack-rpm_${X/_/-}.tar.gz ) ) )"
	IUSE="${IUSE} linguas_${X}"
done

HOMEPAGE="http://www.documentfoundation.org"

LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

RDEPEND="!app-office/libreoffice
	!app-office/openoffice
	!app-office/openoffice-bin
	x11-libs/libXaw
	!prefix? ( sys-libs/glibc )
	>=dev-lang/perl-5.0
	app-arch/zip
	app-arch/unzip
	x11-libs/libXinerama
	>=media-libs/freetype-2.1.10-r2"

DEPEND="${RDEPEND}
	sys-apps/findutils"

PDEPEND="java? ( >=virtual/jre-1.5 )"

PROVIDE="virtual/ooo"
RESTRICT="strip binchecks"

QA_EXECSTACK="usr/$(get_libdir)/libreoffice/basis3.3/program/*
	usr/$(get_libdir)/libreoffice/ure/lib/*"
QA_TEXTRELS="usr/$(get_libdir)/libreoffice/ure/lib/*"
QA_PRESTRIPPED="usr/$(get_libdir)/libreoffice/basis3.3/program/*
	usr/$(get_libdir)/libreoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/*
	usr/$(get_libdir)/libreoffice/program/*
	usr/$(get_libdir)/libreoffice/ure/bin/*
	usr/$(get_libdir)/libreoffice/ure/lib/*"

RESTRICT="mirror"

src_unpack() {

	unpack ${A}

	cp "${FILESDIR}"/{50-libreoffice-bin,wrapper.in} "${T}"
	eprefixify "${T}"/{50-libreoffice-bin,wrapper.in}

	for i in base binfilter calc core01 core02 core03 core04 core05 core06 \
		core07 draw graphicfilter images impress math ogltrans ooofonts \
		ooolinguistic pyuno testtool writer xsltfilter ; do
		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${LOARCH}.rpm"
	done

	rpm_unpack "./${UP}/libreoffice3-${BVER}.${LOARCH}.rpm"
	rpm_unpack "./${UP}/libreoffice3-ure-${UREVER}.${LOARCH}.rpm"

	for j in base calc draw impress math writer; do
		rpm_unpack "./${UP}/libreoffice3-${j}-${BVER}.${LOARCH}.rpm"
	done

	rpm_unpack "./${UP}/desktop-integration/libreoffice3.3-freedesktop-menus-${BVER2}.noarch.rpm"

	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${LOARCH}.rpm"
	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${LOARCH}.rpm"

	# Extensions
	for k in mediawiki-publisher nlpsolver pdf-import presentation-minimizer presenter-screen report-builder; do
		rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${LOARCH}.rpm"
	done

	# English support installed by default
	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${LOARCH}.rpm"
	rpm_unpack "./${UP}/libreoffice3-en-US-${BVER}.${LOARCH}.rpm"
	rpm_unpack "./${UP}/libreoffice3-dict-en-${BVER}.${LOARCH}.rpm"
	use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${LOARCH}.rpm"
	for s in base binfilter calc math res writer ; do
		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${LOARCH}.rpm"
	done

	# Lang files
	# TODO: Install dictionaries

	strip-linguas ${LANGS}

	for l in ${LINGUAS}; do
		m="${l/_/-}"
		if [[ ${m} != "en" ]] ; then
			LANGDIR="LibO_${MY_PV2}_Linux_${LOARCH2}_langpack-rpm_${m}/RPMS/"
			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${LOARCH}.rpm"
			rpm_unpack "./${LANGDIR}/libreoffice3-${m}-${BVER}.${LOARCH}.rpm"
			for n in base binfilter calc math res writer; do
				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${LOARCH}.rpm"
			done

			for DICT_FILE in `find "./${LANGDIR}" -name "libreoffice3-dict-*-${BVER}.${LOARCH}.rpm"`; do
				DICT_REGEX="s/libreoffice3-dict-(.*?)-${BVER}.${LOARCH}.rpm/\1/"
				DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/libreoffice/share/extensions/dict-${DICT_LOCALE}" ]] ; then
					rpm_unpack "${DICT_FILE}"
				fi
			done

			# Help files
			if use offlinehelp; then
				LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
				rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${LOARCH}.rpm"
			fi
		fi
	done
}

src_install () {

	INSTDIR="/usr/$(get_libdir)/libreoffice"

	einfo "Installing OpenOffice.org into build root..."
	dodir ${INSTDIR}
	mv "${WORKDIR}"/opt/libreoffice/* "${ED}${INSTDIR}" || die

	#Menu entries, icons and mime-types
	cd "${ED}${INSTDIR}/share/xdg/"

	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
		if [ "${desk}" = "javafilter" ] ; then
			use java || { rm javafilter.desktop; continue; }
		fi
		mv ${desk}.desktop libreoffice-${desk}.desktop
		domenu libreoffice-${desk}.desktop
	done
	insinto /usr/share
	doins -r "${WORKDIR}"/usr/share/icons
	doins -r "${WORKDIR}"/usr/share/mime

	# Install wrapper script
	newbin "${T}/wrapper.in" libreoffice
	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/libreoffice" || die

	# Component symlinks
	# Disabled, trouble with parallel installing openoffice
	for app in base calc draw impress math writer; do
		dosym ${INSTDIR}/program/s${app} /usr/bin/lo${app}
	done

	dosym ${INSTDIR}/program/spadmin /usr/bin/libreoffice-printeradmin
	dosym ${INSTDIR}/program/soffice /usr/bin/soffice

	rm -f "${ED}${INSTDIR}/basis-link" || die
	dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link

	# Non-java weirdness see bug #99366
	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"

	# prevent revdep-rebuild from attempting to rebuild all the time
	insinto /etc/revdep-rebuild && doins "${T}/50-libreoffice-bin"

}

pkg_preinst() {
	use gnome && gnome2_icon_savelist
}

pkg_postinst() {

	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
	use gnome && gnome2_icon_cache_update

	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin

}

pkg_postrm() {
	fdo-mime_desktop_database_update
	use gnome && gnome2_icon_cache_update
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-bin: ChangeLog libreoffice-bin-3.3.1.ebuild
@ 2011-03-20 13:05 Andreas Proschofsky (suka)
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-03-20 13:05 UTC (permalink / raw
  To: gentoo-commits

suka        11/03/20 13:05:37

  Modified:             ChangeLog libreoffice-bin-3.3.1.ebuild
  Log:
  Minor ebuild cleanups
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 app-office/libreoffice-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	19 Mar 2011 15:55:44 -0000	1.20
+++ ChangeLog	20 Mar 2011 13:05:37 -0000	1.21
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.20 2011/03/19 15:55:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.21 2011/03/20 13:05:37 suka Exp $
+
+  20 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  libreoffice-bin-3.3.1.ebuild:
+  Minor ebuild cleanups
 
   19 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   libreoffice-bin-3.3.1.ebuild:



1.11                 app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild?r1=1.10&r2=1.11

Index: libreoffice-bin-3.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libreoffice-bin-3.3.1.ebuild	19 Mar 2011 15:55:44 -0000	1.10
+++ libreoffice-bin-3.3.1.ebuild	20 Mar 2011 13:05:37 -0000	1.11
@@ -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-bin/libreoffice-bin-3.3.1.ebuild,v 1.10 2011/03/19 15:55:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.11 2011/03/20 13:05:37 suka Exp $
 
 EAPI="3"
 
@@ -20,7 +20,6 @@
 NM2="${NM1}3"
 NM3="${NM2}.3"
 FILEPATH="http://download.documentfoundation.org/${NM}/stable/${PV}/rpm/"
-
 if [ "${ARCH}" = "amd64" ] ; then
 	XARCH="x86_64"
 	PACKED="LibO_${MY_PV2}_Linux_x86-64"
@@ -28,10 +27,10 @@
 	XARCH="i586"
 	PACKED="LibO_${MY_PV2}_Linux_x86"
 fi
-
 UP="${PACKED}_install-rpm_en-US/RPMS"
-DESCRIPTION="LibreOffice productivity suite."
 
+DESCRIPTION="LibreOffice productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz
 		offlinehelp? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_en-US.tar.gz ) )
 	x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz
@@ -48,8 +47,6 @@
 	IUSE="${IUSE} linguas_${X}"
 done
 
-HOMEPAGE="http://www.libreoffice.org"
-
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
@@ -57,13 +54,13 @@
 RDEPEND="!app-office/libreoffice
 	!app-office/openoffice
 	!app-office/openoffice-bin
-	x11-libs/libXaw
 	!prefix? ( sys-libs/glibc )
-	>=dev-lang/perl-5.0
-	app-arch/zip
 	app-arch/unzip
-	x11-libs/libXinerama
-	>=media-libs/freetype-2.1.10-r2"
+	app-arch/zip
+	>=dev-lang/perl-5.0
+	>=media-libs/freetype-2.1.10-r2
+	x11-libs/libXaw
+	x11-libs/libXinerama"
 
 DEPEND="${RDEPEND}
 	sys-apps/findutils"






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-20 13:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 14:34 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-bin: ChangeLog libreoffice-bin-3.3.1.ebuild Andreas Proschofsky (suka)
  -- strict thread matches above, loose matches on Subject: below --
2011-03-20 13:05 Andreas Proschofsky (suka)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox