3.5 branch uses just system-sane without the header stuff

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0c6678214fa70b8fdf49129dbda0cfdfe4e319f6..3796c4c0b26fbb7a744832ada3ffa69eaa7178ff 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
 # 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.109 2011/08/14 18:48:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.110 2011/08/15 17:52:07 scarabeus Exp $
+
+  15 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999.ebuild:
+  3.5 branch uses just system-sane without the header stuff
 
   14 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9397a1a973ee4163662d627051ccdd0585a9f39f..a83a0797d0917beab578a9e0d34ca28cc02dba9e 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,13 +173,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 f8b13e0c4a6169860dd6e0a65c772839dc5310c2 SHA1 2766a7119a63a41bb912eef7437193059ee8a0fd SHA256 9cc4172de1437c0e1b239c4f6630424f556ce8346c891694a53fc984eb6d12d6
 EBUILD libreoffice-3.4.2.3.ebuild 19612 RMD160 55f0032ee178656d381556cfa5f2862c665dda73 SHA1 2187a57ddfdd83b66152f624498ff35d6bc1b274 SHA256 0e4ec8c6bbb0a9553c68fc457d8f03bf3ae3fcabf96e733c6cc29cfe9df819b3
 EBUILD libreoffice-3.4.9999.ebuild 19539 RMD160 1057b772313a1680460e227dad070c1e71fce82e SHA1 860e7779e96f1ab8aefd9f6489dfea0926435f24 SHA256 709d53d16c7925f10367395be7659944c56bd078d9cf83721967b474ddf0bc0a
-EBUILD libreoffice-9999.ebuild 18916 RMD160 cdeb1d21f4499135cf2ef2a6c877826b66cf87bc SHA1 f65c778ff6ca60fa543fc0834fa45b38dcc75c42 SHA256 0a7d40d0e9aff09980df28eda0177ebc970e8aa527caff793aba9d729832eef0
-MISC ChangeLog 21271 RMD160 ea2d13c74b4d716acd413fddbccaa2df3faf0003 SHA1 d56b597e1b5db6e3bd864c9ef68f3ced1e129f61 SHA256 f00290e90f1934899fd9fcfffb2d5815f12e51eb09a476d26d0fa4674e043d55
+EBUILD libreoffice-9999.ebuild 18909 RMD160 d9018d6e485990d789194187e850bfdc1638ca4e SHA1 890809b99597332c8223da972548f4f408a94221 SHA256 2df60fcb9bf9330ea54a6aab21d1c8ab73dc5de4d2b8a92370ce8612b2beb0f6
+MISC ChangeLog 21412 RMD160 91ba9a6b057ec76fc052e974ed995e9ac6752bde SHA1 bbffee2c642a7a6612d3236967068b70d7496c8e SHA256 d7d85121eb3a728b52551963d314a434331591db648072fd43c166a547402c6f
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5IGJ8ACgkQHB6c3gNBRYeyBgCeLEDt0wNZEi2RJBj51zpNJQPY
-pa4AnjN9DFz+LpObnOuGmqjIHUOp9Knw
-=PYqh
+iEYEARECAAYFAk5JXM0ACgkQHB6c3gNBRYf9MQCgswPOGaTqCNzBxwKhKbKorqWV
+xKYAniradv3n+HBM6gh8CFvA+WdFOP4Y
+=/0uQ
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e029aafb44e1522d725df4fe5894ce82f6ad6e53..d5e34199919e3df85144dc30f46b99f577f102df 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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-9999.ebuild,v 1.15 2011/08/14 18:48:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.16 2011/08/15 17:52:07 scarabeus Exp $
 
 EAPI=3
 
@@ -400,7 +400,7 @@ src_configure() {
        internal_libs+="
                --without-system-hsqldb
                --without-system-cppunit
-               --without-system-sane-header
+               --without-system-sane
        "
 
        # When building without java some things needs to be done