Disable Active, bug 411021

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 31 insertions, 23 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 607e897faf3e..9709062030d3 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.31 2012/04/06 21:53:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.32 2012/04/08 09:45:31 dilfridge Exp $
+
+  08 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> calligra-2.4.0.ebuild,
+  calligra-2.4.9999.ebuild:
+  Disable Active, bug 411021
 
 *calligra-2.4.9999 (06 Apr 2012)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 87b8703f6eb7..61d7980e039d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,25 +4,25 @@ Hash: SHA512
 DIST calligra-2.3.92.tar.bz2 123533771 RMD160 c55140a0d4e719140e8aff0cb7f5fb68dc376cf0 SHA1 460d01bbb454140e851f7ea251d3ac8e143215e5 SHA256 8faefc34428deb2ce07856e2f1a58a4d7f842faf04dda46147644f07dbdfa7a9
 DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
 EBUILD calligra-2.3.92.ebuild 5836 RMD160 8327720c04b0c24fc685de3369c9e48ffe516818 SHA1 ff12bac1f651b812366a3da1e81b9fdfe84bdc32 SHA256 4c44b624f7d4d35eb2fd7e8d86dcb9471b8e0197cd279a642ac2710d525d7957
-EBUILD calligra-2.4.0.ebuild 5880 RMD160 7fdcb1d456fb3a83b868512e61fcba9683b0cde2 SHA1 555562b71a4dde00cb9a1efe89e4e46b9ade63b9 SHA256 68123e9fa19df21e264249c53682311b65053eae79d426eac590c19f6cc1ef89
-EBUILD calligra-2.4.9999.ebuild 5911 RMD160 73c851569de350aa3dde7f0a549ff18787996617 SHA1 53039182396a917b42b6cce3926d6dcc5ac56d11 SHA256 47b899a72352ac0fc5e0bf01e5dc1a82894e63e0d4cb8a2007e9e32b400e6b88
+EBUILD calligra-2.4.0.ebuild 6005 RMD160 3c4d8a6a495ceb25f53e366fba606b3dd68d8a3c SHA1 fa1f9a34d4e03559b88c43333a4f11aa02a5a725 SHA256 5ca1dab50f60d1e3740518319384eef29dc16cc7ca7c2c9ff5cfca986bf7ef39
+EBUILD calligra-2.4.9999.ebuild 6008 RMD160 d1c0fc0bf9cdaccf3392ab430751ff06880c5741 SHA1 c9e7b14e7b45872d80abff1a423015fa66e1e1ad SHA256 ef1ac74a07ce2240cfe16e8aa71e7be35df55683e34a82d1dad1fd8a08a12068
 EBUILD calligra-9999.ebuild 5880 RMD160 6ca04f3e949b2ff00b9cfe9a7699ac47a175e318 SHA1 c1fd52436900f02360a0eae395f2aca4ed7c3122 SHA256 39b19296d0326875bd7b96ba7271e212ce4e67f2444333850d4c3d8a2f13800a
-MISC ChangeLog 5279 RMD160 e57aa6123f5fb621af4d2e40851ca07edac5ce02 SHA1 e60f01f40603ddc1fc40f1542625fe95400eb5b6 SHA256 b02c27b7640bd07fb3a3fe738747b9d7807d31bfa27245fbb81eb14e56c78d98
+MISC ChangeLog 5417 RMD160 52d9ef48ac6bfdc574b9953d842c4f8f2e5f1c68 SHA1 8e6f6af838ae546b6cb2dc0241c618c462f396a6 SHA256 563664d1d167d04e42c06f233be0ca7204a82ec269fed7fee6f4c5912647dc29
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPf2XmAAoJENwGBM22xffeV+wP/2b+Ne8+RLUGHgX7n9OHScsQ
-o+Z16WunIMNfYYq8Pm8cVEmjn5zZyvCV/amSxH98BsRwBUDmYEbitN+LP8k5+SbN
-lYLSPoAiGbMc/DlvKH0SGGmE0VvV55AwFJJlreTuaJAEOxHODEEQLwNQ8whxOci0
-QDLXrUf+s+iTaSCdlrg9bsUR59SNrn/J/FrDOJtKLTry5fa2JPBb9aSidVsPP7LI
-gBSnXP5K5agaBwKSOw+bp+jVyFuvpXmfoN+CKJk1lwrfH2wGjBK8r1/hxQyiimpn
-h0J48lTVTjX+ZmxAqWoodLL+HKIcGrrn9PogIKmBrS2HgI91OVpoqH7J/zXOy7NG
-lu4B3EhqZxF1jikIbAZzzTaW7Q+GIOrFrh67HouNV45LNkfcihiNlwXBw0xJPxFE
-+G41cs9A9Vop4Fx29o80nGX9HHTBph+OKdkLj7S+CziJ1bNZAp2ixKxDs9XJJ/G7
-lk6FRUERclq7ZfVy5mbeoqk5kpsNfA9mVqqYc16+RvSxIDfJILVmbQxdMMCxJCmq
-E3RyWyUFXHIzsSJx9pZfeMAmFnOYswS4JbBcszYymnXZKtBLnWjW+Qs1QLqtg9g9
-QfSf2ygTYeoV4vsDzcEP8DYVlf/NzMqCTpUyXksu00meB4zsyijnqbktP7EWM3GI
-kcSQHzLmh5+76jRSOHpu
-=+2fv
+iQIcBAEBCgAGBQJPgV5LAAoJENwGBM22xffe874P/i3x1KgvRlRKO6BCZOgF/O+/
+pzCA7fJ9nKL+SsiJ8uJ8+ZlJUwkyU5WNTZUiPnUe+0vWo32yXhD2lAMyhBK/p+sW
+T3bqSCj/0r19qoy8xejNKP/8S/Kefs4C79iYcT2Aa2pSOj4nKESou3kLDR3SViYu
+LEi5JUlOBswVWkLaYq7grxE5ZXYTn1kEGxHvKO7wuil1DFv0yWA4FYyvHIfdqCjQ
+1tQgm4qpm4rtocOsG1JEgnLajrjWxD/EQHT8rXL3jVjfxffcBgAiyMQgY+t1OjEh
+Ydkp2KBNZKRlDEwn5rN0qclZT2OT3YKp2wbdSJMoyXzRdMoo3pKJW78j10UZDF51
+mevWM6HWj0Imp3uhQsY9suYX1sIgpXm/LHax3zSkUN3C/LVsdFHWHi+9xW7ospl/
+DsEJnU4/hxWTa3KSbdl+Mqh5QMNY8Io2zqpsAoR/I22pVL+7D0eexy5Kp21ACgSf
+I0BEEpFGiLUaTlV4G1WwcIOAtbLsrPBGsOy+a1sfnpmKS2E1WEH3lInYlhbK0C5F
+ixVxILfaZpVaD6RZpo881r35q8uQfyQ3jLV4LvYKpueL/sC4WPh+wlJBAEj85uKI
+3hbB4t/TBOb/xZmV/ZUTISBgbex9LlcEV0CqC+72u3e2xUZ5sv+Qt64AXrFiq06A
+CzcJBeZQRk/1nmcp7Ny6
+=RjG8
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.0.ebuild b/app-office/calligra/calligra-2.4.0.ebuild
index e3aa4d0e2472..57a3a4f9e022 100644
--- a/app-office/calligra/calligra-2.4.0.ebuild
+++ b/app-office/calligra/calligra-2.4.0.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v 1.3 2012/04/06 21:53:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v 1.4 2012/04/08 09:45:31 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
 # krita/CMakeLists.txt
 
+EGIT_BRANCH="calligra/2.4"
+
 EAPI=4
 
 KDE_SCM=git
@@ -135,8 +137,9 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
diff --git a/app-office/calligra/calligra-2.4.9999.ebuild b/app-office/calligra/calligra-2.4.9999.ebuild
index 021b683d84c2..a07b86d7576e 100644
--- a/app-office/calligra/calligra-2.4.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.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/calligra/calligra-2.4.9999.ebuild,v 1.1 2012/04/06 21:53:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.2 2012/04/08 09:45:31 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -137,8 +137,9 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/