Branding: The Return of Larry!

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

4 files changed, 31 insertions, 28 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 52fd19cb29a4..1d0a39c65434 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.340 2012/06/21 15:34:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.341 2012/06/24 21:50:55 dilfridge Exp $
+
+  24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Branding: The Return of Larry!
 
   21 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 77aacd32310d..1e343f190a2a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX generate_libreoffice_package.sh 3540 RMD160 4dcfd53e87b4b0cbd96752a8b994bcfca8bfcab6 SHA1 7b9444e6ed8ee80c6b5dff795d7aaad4cee52885 SHA256 96f5597156d2f2d8952ebfcd58ca2c4206639e027388f0e09661a30859cfc102
 AUX libreoffice-3.5-doublebuild.patch 887 RMD160 dd38de91af9b513e3b66bfa53a5d74635fdc16e2 SHA1 5cae5b8aedd7f18d526e61c465f944d46e06de4d SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8
@@ -19,28 +19,29 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
 DIST libreoffice-binfilter-3.5.4.2.tar.xz 5978820 RMD160 272f7467b82eb99ca3a81fdea5692ae6da59aedf SHA1 89a156c9603aac1f70dc1b4108fa3cb335ffe1fa SHA256 7c1a471358c4028ef8aa542c50ce0852ba2960be9dfb2ebbf0103ad59389d07a
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 RMD160 e8d475d184fdfd75f348772edac6a6eb76613341 SHA1 83da8ba0db288a827e805780e01edeccd2f51ccc SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63
+DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 RMD160 3172544421b3b0793b41d16ce9ee36b48184ef60 SHA1 51430da827b059209f3f13b9252e3a523223b7ae SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9
 DIST libreoffice-core-3.5.4.2.tar.xz 103422460 RMD160 e118cfa44ba198fa3d3fe8fc21bd1e3940270868 SHA1 a01d77612c9678d52a75fb160590bb76d670d7f6 SHA256 3eeb89d05fa423c446767defd54ff89456b2ead8fc4628c3403043d4c1845faa
 DIST libreoffice-help-3.5.4.2.tar.xz 1857756 RMD160 ce00c1893e0315fa7cee156707553fdcebb552d2 SHA1 0d417affc2b91ef345cb010f3a2d11a6417b7f44 SHA256 61e93d4ad9c1ad1308fe85f8416bf9dfafd875ba9cdb2050890b7b0e1abf4869
 EBUILD libreoffice-3.5.4.2-r1.ebuild 15721 RMD160 2a77b887a62e59f0be16ab94f3e84e3410e81658 SHA1 1bbc6565bfd33e57795e634eee83dd03df1211a7 SHA256 aa13df25bceb94d15abc4cdaa6709c9e4ec95503a95e81a5c9e5bbb2e70cb1c3
 EBUILD libreoffice-3.5.9999.ebuild 15653 RMD160 1de472abdc3a2b5e729beffa738071d5fe447d6e SHA1 a88557d823e20fa56f1d41a85f7ab2ddae065c8e SHA256 f287eefa78b0180c7a24396ff3889a8fcd7e4cca6efa245f4a3068ae81c2f214
-EBUILD libreoffice-3.6.9999.ebuild 17209 RMD160 4ebfa4a06a727ca7bf994a1e0cfe42dcc57e64fa SHA1 c0b79868debad3ebb3bec8bbbe4f437740754c86 SHA256 3ab8c1f7478c062e49edfb8ee1659b7088a99a466212d5550c059c891dc5ef51
-EBUILD libreoffice-9999-r2.ebuild 17270 RMD160 50b8ba4343d8908a40af6ec35bc17f690d404607 SHA1 8851a205bd9560c13b89abcf8419fdde1ed84041 SHA256 75ee12628561e6ff58673391e3eae6f2978ca92d400386465a99e25e64537df4
-MISC ChangeLog 62662 RMD160 edef629d50bc901d48c0f9dbfb92c519433dbf3f SHA1 3ca3a203689d278a0d97fb3b9481b7a3ab511919 SHA256 41f40e276cb05e6d6a50e428fd425ec4f88e292931ba63509cefc5b66d1ef86a
+EBUILD libreoffice-3.6.9999.ebuild 17232 RMD160 e282d40a5f7a7266e6d1cb611da1e6a6c20a609a SHA1 042ebb222e250a2cc0d49536db4814d934a91767 SHA256 365dc985842963f5b74e66f05110b184a76d586fc4ad164c5439810b055049b6
+EBUILD libreoffice-9999-r2.ebuild 17293 RMD160 d57c915033744a8bab92d4bd462c9dcde7a8d486 SHA1 527356991dd92130e70d49c33952ff45d89ae2cc SHA256 1d27de4049a6c60c8087ec8ced6b8a4b0971f31ae456894dd6a7b134c1d6ac79
+MISC ChangeLog 62812 RMD160 4bd4f4fd0c823b4e8c6221c10d27fcdfef8f6bca SHA1 2598f594a0527d00aff3b837754af449df9a31e4 SHA256 9d63e67b57284f032a43cd309f2f888866f5c7b648c8b75879ac7a93121f7df8
 MISC metadata.xml 1534 RMD160 24433486738eb58853e959332201611cf24fd5c6 SHA1 05d71c3efc820312fcf61f0fee4cb8d6e91a7c52 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP4z8DAAoJEOSiRoyO7jvoE98QAIzYQVby97gpArU593cxxTdT
-GweBItSxx8OyzdBP1AiS8cBgR1atMtioAqDjyO59RETyObS4VKwi42R+Qoo9KVMK
-Gczl3v2qjKn/lXtayt/+nuT2NO9Ssv8YpWCizk3Gakx7PCDXPaLUFAo11HCUSsWm
-1lvAx4Csdtqcw8afkiWVNjD9JHqvCV4hnAoFK/1xsFB+CByKB/FZ4ZX+gxC/BOi1
-8MmrtrD3xa0xW8Gyp6LKZriQgYlGRCCwJfwxcOr1GiV1kNqcUrUDq0PWepgvNJpj
-5JL5SzWX+riEwiUafQSHh+B00JNIwKg11h5jn7Vp7JvCgmGUutpbayzkg7gBa+G1
-OcwdEcBWkxoQdqei8yhtZoj0q5QYfSAJSeNNtdvwwV68otzUdsxGgfzKI+v83KUU
-RzTUu3e7NsfbeNeJSFlM4lzKHosaNrwV+7JGnW7QBFCA2ADZig5yOLOyrpJR5rQM
-V9PhIbwkXTUiA3sMM8+j5rpTUQf/7KEG04XVBKNIMeXFESncZoxD/HVynQv7TFql
-laKD13KLhaJeGiB9bLjqDwUJKTAdMKv+AR3cr2/Si7wBVFUsq0Zn/JJL16gyR2Mj
-VxKgevxGLZly85/4ky7vVEdtHMZtjQxvpBc00GVDKRK0kCBu31CVAsn3L9b4huvd
-CCzzS3B2UtJ9H1QK8F2w
-=o6nT
+iQIcBAEBCgAGBQJP54wNAAoJENwGBM22xffeAs8P/0eaDsOnAvu4H8a7VLpMtGo8
+s6XUSDy7erHrrF0QS/oPXEUhDMUcjy4dD1GgQqLeDyCeG7Lquvl5C/VDakA047di
+cI+LoQZjn+iIvHIBOW2pHfvJBaU7Dc9GfVt+9ebraLSqWoNMjygs78xb05kdWj2G
+84+dadVFvYAtz2sMeKfMNrB02lF0tZPwlUqnhD9qrkyq+KgOqrAfXV1gHgKK70qE
+tFm3fCJCOlqfWl+xju6uFpdGRoKpbnyOnAVI2LTeL0rPi0H2dM+ovFM7Pqapi3X2
+hV6Ou+TlCIDPKCO5gqcTIVMeGAHwJo1QBYfu7eNSKRfX1me8vTYtLT3zhuHZGxZV
+cZPpzRRfxltSOpI8uqJKcu3b94Wt0CIpRTfiZbBXdlcyhTatCg2D4VZlvQYQh2My
+LyQ1qhnQ6/ST76VTi1oXJBOjE2AVVNG8Ei7YsPG/CPCbGUTuQOkHzzzOyvJOaErW
+WIjWV99dbuv329h8OIz1u5Fws4C1JXJkBZ0hn13Y9McaTQzY/DtYNm2UdJdEU8+G
+VQVHWBVyUjzrMP+Sy1a5lln/UKmNs+Ltj9FECKyZuAkNITDJ6HXJrR15bu3o5PSk
+nttoDPTPSCzodqxfTkJXntcjXu46YjAhxMd5BInuP0wlQHDgbONgdfuDR9pRWC8U
+dEBN7h5TeNIO+y02DBrQ
+=A0Pg
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 38cd8340d376..7d55353ae0a1 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.8 2012/06/21 15:34:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.9 2012/06/24 21:50:55 dilfridge Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
-BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
@@ -402,9 +402,8 @@ src_configure() {
 	fi
 
 	if use branding; then
-		internal_libs+="
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
 	fi
 
 	# it's not entirely clear to me where the failure is, boost libreoffice gcc come to my mind
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 75c69207da9f..d6c05cb2ade4 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.88 2012/06/21 15:34:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.89 2012/06/24 21:50:55 dilfridge Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
-BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
@@ -404,9 +404,8 @@ src_configure() {
 	fi
 
 	if use branding; then
-		internal_libs+="
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
 	fi
 
 	# it's not entirely clear to me where the failure is, boost libreoffice gcc come to my mind