Remove patches accepted in the master branch. declare kde-scm to git so we never...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0317da1a2a6d77a2b3868af95b510f7e3031c982..c68cc2cd418a1b9c81acef0307a22af2a8281fd8 100644 (file)
--- 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.92 2011/08/07 19:02:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.93 2011/08/08 09:27:15 scarabeus Exp $
+
+  08 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.9999.ebuild, libreoffice-9999.ebuild:
+  Remove patches accepted in the master branch. declare kde-scm to git so we
+  never depend on subversion.
 
   07 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.9999.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b0c0b9a9379695be686daf1d59d00a20d518b1a5..40282451daa1d7c4f111dca65c7f1a2679738630 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -171,14 +171,14 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.2.3.ebuild 19258 RMD160 98feedaa6e9f65d571ee7599f8da3afef748cac3 SHA1 3c8d81230332dd40654373231c36e15f8d38f08f SHA256 77fd3a15d8151762dd4b154b76ce2ffe103a797e50f331e8c525c41af29f8b03
-EBUILD libreoffice-3.4.9999.ebuild 19169 RMD160 b87fa823be8c7eb3f6c203155e7e67e340c2f354 SHA1 f484db4cfe1ad73e48535f61a0b3743c958baa9f SHA256 565301503778919aa0856057b122dc65b2f3b89c429afeae62dbbfc1305de139
-EBUILD libreoffice-9999.ebuild 18890 RMD160 32ce87d9c338f67e3e037bd507e5673a7d349731 SHA1 f59eed0422b2d48b1efeab3df63841f7c5f20309 SHA256 62e01b9b969c0b94b00cab6746a463f940f2fa178596f4e7e863982e5f8555a1
-MISC ChangeLog 18314 RMD160 e0ab8e602af550e02fdf25c9bc6064932941787a SHA1 e82a761ca7a43661e2eb75373d6603715480a5e9 SHA256 49ff0cc9390b7338940e54cc936ede4185857cccedf99768907d0c72fa1180d0
+EBUILD libreoffice-3.4.9999.ebuild 19183 RMD160 b29a219e83802a608a0cc0b8117db8c17782e529 SHA1 4889b01a357abe49f3489f7f7ec5d5648672d36b SHA256 261c78a93d427cd8a4682480e116db417cc2382d8d8af512eb72c91fb180f84c
+EBUILD libreoffice-9999.ebuild 18730 RMD160 50ff5afb5fe66168a0e85da22c409d7e35fb0004 SHA1 c4598e66099b99edd73e5ba4451ddcf704285853 SHA256 e8b25498f3089a4bac2ccc13d4bfbd2b27ff23332039c7fee40523292eeee89d
+MISC ChangeLog 18533 RMD160 3400710f9ab92bbbfaa9a9e478a05da165f6fa0a SHA1 b7eb3fd3eaa06abff0fe8e9c4d6912ceb26efc02 SHA256 567ef605e34c8b98162754d3d10a47a3ba3ad72b3d96d3e42884ca9d375e7b38
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4+4TsACgkQHB6c3gNBRYdMGQCfRNVYwsQFSD9Q05EELL7CDEHM
-TVwAoIVIsLXu57rkNcpZaby6DwW/Ppij
-=dALH
+iEYEARECAAYFAk4/q/kACgkQHB6c3gNBRYecCACcCUJdpo20crdDyCY9OzMqCwzg
+VtIAoJID13hRHxKFoqZB5ns8AG57EMBV
+=YUmd
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index e129170d3370dc17664a75979f4992568ce932c1..ac78606a423454aee8118ae70ec811ac6b2cfae6 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
@@ -1,10 +1,11 @@
 # 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.9999.ebuild,v 1.12 2011/08/07 19:02:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.13 2011/08/08 09:27:15 scarabeus Exp $
 
 EAPI=3
 
 KDE_REQUIRED="optional"
+KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
 PYTHON_DEPEND="2"

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b67137337bd2bbd51a9d101817f2ef660efa4e0a..4ec06c277c7d9a8185b891a06cc5c0e2f0503b94 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,10 +1,11 @@
 # 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.2 2011/08/07 14:37:55 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.3 2011/08/08 09:27:15 scarabeus Exp $
 
 EAPI=3
 
 KDE_REQUIRED="optional"
+KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
 PYTHON_DEPEND="2"
@@ -228,12 +229,8 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
-       "${FILESDIR}/${PN}-libdb5-fix-check.diff"
-       "${FILESDIR}/${PN}-3.4.1-salfix.diff"
        "${FILESDIR}/sdext-presenter.diff"
        "${FILESDIR}/${PN}-svx.patch"
-       "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
-       "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
        "${FILESDIR}/${PN}-installed-files-permissions.patch"
        "${FILESDIR}/${PN}-binfilter-as-needed.patch"
 )