[gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog

[Tomas Chvatal (scarabeus)]

scarabeus    11/07/26 18:20:01

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman for this.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

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

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 16:20:59 -0000	1.15
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 18:20:01 -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.2.ebuild,v 1.15 2011/07/26 16:20:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.16 2011/07/26 18:20:01 scarabeus Exp $
 
 EAPI=3
 
@@ -10,14 +10,15 @@
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads,xml"
 
+DEV_URI="http://download.documentfoundation.org/libreoffice/src"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
 inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
-DEV_URI="http://download.documentfoundation.org/libreoffice/src"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-SRC_URI="odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${PN}-branding-gentoo-0.1.tar.xz )"
 
 # Shiny split sources with so many packages...
 MODULES="artwork base calc components extensions extras filters help
@@ -96,8 +97,9 @@
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter cups custom-cflags dbus debug eds gnome gstreamer gtk kde ldap
-mysql nsplugin odk offlinehelp opengl python templates test +vba webdav"
+IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome gstreamer gtk
+kde ldap mysql nsplugin odk offlinehelp opengl python templates test +vba
+webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -281,6 +283,10 @@
 src_unpack() {
 	local mod dest tmplfile tmplname
 
+	if use branding; then
+		unpack "${PN}-branding-gentoo-0.1.tar.xz"
+	fi
+
 	#first the bootstrap files
 	unpack "${PN}-bootstrap-${PV}.tar.bz2"
 
@@ -355,9 +361,8 @@
 		--enable-ext-presenter-minimizer
 	"
 
-	# Things that do not have gentoo packages
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
-	# we should use in-system dmake: so far fails
+	# dmake: not worth of splitting out
 	internal_libs+="
 		--without-system-hsqldb
 	"
@@ -389,9 +394,12 @@
 		fi
 	fi
 
-	# TODO: create gentoo branding on the about/intro screens
-	# --with-about-bitmap="${FILESDIR}/gentoo-about.png"
-	# --with-intro-bitmap="${FILESDIR}/gentoo-intro.png"
+	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).
@@ -491,7 +499,8 @@
 		$(use_with offlinehelp helppack-integration) \
 		$(use_with templates sun-templates) \
 		${internal_libs} \
-		${java_opts}
+		${java_opts} \
+		${extensions}
 }
 
 src_compile() {
@@ -501,6 +510,11 @@
 src_install() {
 	# This is not Makefile so no buildserver
 	make DESTDIR="${D}" distro-pack-install || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc || die
+	fi
 }
 
 pkg_preinst() {



1.57                 app-office/libreoffice/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog	26 Jul 2011 17:05:34 -0000	1.56
+++ ChangeLog	26 Jul 2011 18:20:01 -0000	1.57
@@ -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.56 2011/07/26 17:05:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.57 2011/07/26 18:20:01 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@g.o>
+  libreoffice-3.4.2.2.ebuild:
+  Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman
+  for this.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@g.o>
   files/libreoffice-fix-sandbox-install.patch: