Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman for this.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

3 files changed, 39 insertions, 19 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 46ab220b8ed8..a6bb502d3e4a 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -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@gentoo.org>
+  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@gentoo.org>
   files/libreoffice-fix-sandbox-install.patch:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8119727e289a..85b17eac243a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -116,6 +116,7 @@ DIST libreoffice-bootstrap-3.3.2.2.tar.bz2 2751299 RMD160 b8279525a1c7ef789a5c03
 DIST libreoffice-bootstrap-3.3.3.1.tar.bz2 2751295 RMD160 a4cc2f74ff3faa93a4006eadde355aacb1ca0973 SHA1 b12bbb7558086cd49b2f52ee20932f2d0a7e8811 SHA256 f51f0cef73b5657b5a0bb49c67da402e1a96e061da20a1ede35dcf41b3d7461f
 DIST libreoffice-bootstrap-3.4.1.3.tar.bz2 2707154 RMD160 6b8ec5816abd6c970edd6dd113d406ad229004e5 SHA1 18b62e4692d2f0cd7791e0e7d4cc8e8ab81f1f8a SHA256 476c15b88200121892c26a724bf8717e151a54e9c36d34a474b7cd2f947f169d
 DIST libreoffice-bootstrap-3.4.2.2.tar.bz2 2712979 RMD160 4012b440095321bb6fe12addb4b624bb9226ca26 SHA1 543f1ec7cbf49cbfa4df46cf2fe62e6e626117d4 SHA256 1cab94a57f3688e778323a536f446ab31d33e7fa411bc7106bc067f8a853b612
+DIST libreoffice-branding-gentoo-0.1.tar.xz 134224 RMD160 9d98c546c27b889ca8e14cafb67a664ec494067f SHA1 8227f7bafe62e27589ba3cd9cdba446524039727 SHA256 f267e80f95522b1f89f2996006f09120b6a9d5c3b720041289783f77d0475c32
 DIST libreoffice-build-3.3.1.2.tar.gz 14364811 RMD160 b7e0889a2207cbec388557b02a7e49593a8a8821 SHA1 85c0feaf94f6fb5fe453d289aca4c21d19e04840 SHA256 d0e41398b90edf40125597c0b743c9824b976fabcbd5d578c886ae8e69393cea
 DIST libreoffice-build-3.3.2.2.tar.gz 14466234 RMD160 c41a7af4da7d1cb680a7eb0197846ae2ccfe15d1 SHA1 aaa0d1cc4bb79cc70a6c7fb083706411bf510e78 SHA256 be754033eacb59dd79234ac60b3c3a0a9c08eac510daa0fb16ed16abe2cf5e3e
 DIST libreoffice-build-3.3.3.1.tar.gz 14608755 RMD160 bdda006de40a39ca257ddc1149d47714d5df58b6 SHA1 846dc655a294e3d382dabd47786d2f414feb4d24 SHA256 2b7b35e461697aa3379bf53181dc05ecc00bfc9b83d366e2f81837ca8d464f13
@@ -209,13 +210,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 17848 RMD160 cc231a858683274f7d561327605c82cfbedeadc0 SHA1 b815df069d670c65db0a499242cea468b2b1973a SHA256 0ed6ab4dcce2abc6943ce4272ce1ed70aeee38332fda4f2199e642c8de825334
-MISC ChangeLog 11775 RMD160 ae9a17d92a49d9a6ebe1a4f9760405d46a990b6a SHA1 62bfdcdf16f3d4b3b61194342f284cabc4def3ac SHA256 fc4591713ffa041bbed8234c4c545530dfefdb11e759e1b968dbe2d051b57b79
+EBUILD libreoffice-3.4.2.2.ebuild 18023 RMD160 94ff90a2e4fd14dc8550bea7f62be524a9aaac48 SHA1 4dfe6d99eb53bfbea428959033f4f6d07db83bd0 SHA256 f4a1cc2bc24509b6148a207c7bc5ed00ddab0ee8f7c55ae4fd8b015633707592
+MISC ChangeLog 11952 RMD160 facc21102e93dc270ad03f88f9217ac58d4506ca SHA1 afbe9d1af6c6b62a9f076d3c5b21cc3dd5bba930 SHA256 3422d75ba37475be759bbbca15b2d775732e75b63a9f00f0c0e9b5ed00e37ce3
 MISC metadata.xml 968 RMD160 4c276f754c1e2f9e2ca31d8afc848c7104405071 SHA1 ffd8cf3e1260eceeca576d417138f2d8584bf0fd SHA256 8dc930d20711f541b049eefa6e2b77fe5904c26ca4a08ea40553acb787c94908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4u85wACgkQHB6c3gNBRYdorACgl5g71UVAk3VJGlZQb76kAq6R
-XN4An3+2KhK7JLpg+N7HHFgx4siIquMu
-=fLvG
+iEYEARECAAYFAk4vBQYACgkQHB6c3gNBRYfW1ACfeFczupJEnnbwHChRZ4WOJfnI
+p9UAn3YlM/flNp1nw5POe2GlmmoGNGbl
+=8y6o
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index b258ef60480c..1091dbe2ba06 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -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 @@ CMAKE_REQUIRED="never"
 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 ADDONS_URI
 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 @@ pkg_setup() {
 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 @@ src_configure() {
 		--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 @@ src_configure() {
 		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 @@ src_configure() {
 		$(use_with offlinehelp helppack-integration) \
 		$(use_with templates sun-templates) \
 		${internal_libs} \
-		${java_opts}
+		${java_opts} \
+		${extensions}
 }
 
 src_compile() {
@@ -501,6 +510,11 @@ src_compile() {
 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() {