Remove KDE3 support.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 15 insertions, 24 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index e07d47c5ddce..47882ece0000 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.45 2009/10/15 16:30:11 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.46 2009/10/25 00:29:13 ssuominen Exp $
+
+  25 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  compiz-0.8.2-r3.ebuild, compiz-0.8.4.ebuild, metadata.xml:
+  Remove KDE3 support.
 
 *compiz-0.8.4 (15 Oct 2009)
 
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3d7194e86459..443255a8bd8c 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -7,7 +7,7 @@ AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SH
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
 DIST compiz-0.8.2.tar.gz 1751448 RMD160 e8bd6e6acd61d585451f1ecfc9fb9658e3faccec SHA1 e3e8022f488ab039d7a0d42400b67ebad063c1b9 SHA256 8ef19e2282c4df048f80a4c0cf61dcd2e92b17b2e2436f77372ccc13745dd5c7
 DIST compiz-0.8.4.tar.gz 1755741 RMD160 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63 SHA1 244ac823818209e44944d74df42d8986ec31d9dd SHA256 22b1f06a458f8eefc9ef511f78a55887fcd456e0fe5bb7574eefcf624146ecf6
-EBUILD compiz-0.8.2-r3.ebuild 3558 RMD160 4bdf0e1aad78e59b0d21188a1ac7c6c10cc64645 SHA1 b76b612ad9ca5a2861da7621aa8fbb60226f1fed SHA256 230f4425c493499607f305f12de205ebdf6e40d5df8c2714a306457c6ec72b3f
-EBUILD compiz-0.8.4.ebuild 3596 RMD160 7b70902c870cad9fb16dd9ec1d5086a02d673c2c SHA1 d8d50d1da6f622c1ab9ffa35ebf6ecad06c14880 SHA256 d0c0dc230f7b350c627aeaa8bd0c56de66e2b88fe88e6b6a3371890499cc4c83
-MISC ChangeLog 8191 RMD160 2db1209448077a9644a3852ea7ff657cc6e07acf SHA1 808f7aa891f0df7ab75931337eccdb609799b700 SHA256 14cc6de74198bbaa75b1e898dfb37be7d6ebd8ef607e9676d9ffc628d21ceb0a
-MISC metadata.xml 502 RMD160 47964a1d3a920c089bfcf53140e4d6b432a6f040 SHA1 6ff05c98cd83c51b7912202b6c6f22541887f2ad SHA256 71c24630bf257ef8a7a0afe406963c43908aa8aeebb19046991927275289bdf6
+EBUILD compiz-0.8.2-r3.ebuild 3457 RMD160 e2345f504475821f96abbb7ed583c30104509605 SHA1 f1d4288bce663fd9d8106df62d93dfe854c23018 SHA256 b50612279919c119454e9014244ed4998d664215e238f6dee012516c55e8047a
+EBUILD compiz-0.8.4.ebuild 3495 RMD160 fc23273fc67cf19f91659f6d67f0c30d59d58b00 SHA1 ed4bbdb48f8852bf88ddf80d83e1b6bb9356ec1c SHA256 550e26f937b73a00564fe25426bab76fee43ef184a6305c8d917eb9f1eb1f8d0
+MISC ChangeLog 8332 RMD160 a8c0031873b092bb78958977ba40b23aa450cd9f SHA1 96083469704b6835828157edd44a4128a4e0ee6c SHA256 c717be5bd6b044387dd13657ee3fb89d3cbd8baeb3dd4ef5308abde6f46d51bc
+MISC metadata.xml 417 RMD160 321a21e2a068ad32b4a745d8e7fa7cc5b66b7c97 SHA1 47c7d29e48ccc0b9a4df2e33a1daad25dd7b20ad SHA256 2b61799ce14880f39c0f4ef065a412c02f760c67e2f831f18990f34bdcf731e6
diff --git a/x11-wm/compiz/compiz-0.8.2-r3.ebuild b/x11-wm/compiz/compiz-0.8.2-r3.ebuild
index 8d64182381d8..96087b5ebaca 100644
--- a/x11-wm/compiz/compiz-0.8.2-r3.ebuild
+++ b/x11-wm/compiz/compiz-0.8.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r3.ebuild,v 1.1 2009/08/29 12:28:11 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r3.ebuild,v 1.2 2009/10/25 00:29:13 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gtk kde kde3 +svg"
+IUSE="+cairo dbus fuse gnome gtk kde +svg"
 
 DEPEND="
 	dev-libs/glib:2
@@ -53,12 +53,6 @@ DEPEND="
 			kde-base/kwin:live
 		)
 	)
-	kde3? (
-		|| ( kde-base/kwin:3.5
-			kde-base/kdebase:3.5
-		)
-		dev-libs/dbus-qt3-old
-	)
 	svg? (
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
@@ -101,7 +95,7 @@ src_configure() {
 		$(use_enable gnome metacity) \
 		$(use_enable gtk) \
 		$(use_enable kde kde4) \
-		$(use_enable kde3 kde)
+		--disable-kde
 }
 
 src_install() {
diff --git a/x11-wm/compiz/compiz-0.8.4.ebuild b/x11-wm/compiz/compiz-0.8.4.ebuild
index 4fee4e87f024..32a2c061338c 100644
--- a/x11-wm/compiz/compiz-0.8.4.ebuild
+++ b/x11-wm/compiz/compiz-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4.ebuild,v 1.1 2009/10/15 16:30:11 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4.ebuild,v 1.2 2009/10/25 00:29:13 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gtk kde kde3 +svg"
+IUSE="+cairo dbus fuse gnome gtk kde +svg"
 
 DEPEND="
 	dev-libs/glib:2
@@ -53,12 +53,6 @@ DEPEND="
 			kde-base/kwin:live
 		)
 	)
-	kde3? (
-		|| ( kde-base/kwin:3.5
-			kde-base/kdebase:3.5
-		)
-		dev-libs/dbus-qt3-old
-	)
 	svg? (
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
@@ -102,7 +96,7 @@ src_configure() {
 		$(use_enable gnome metacity) \
 		$(use_enable gtk) \
 		$(use_enable kde kde4) \
-		$(use_enable kde3 kde)
+		--disable-kde
 }
 
 src_install() {
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
index 093c470babae..7c340e5056be 100644
--- a/x11-wm/compiz/metadata.xml
+++ b/x11-wm/compiz/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <use>
 	<flag name="fuse">Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.</flag>
-	<flag name="kde3">Compile the kde3 window decorator and add support for KDE3</flag>
 </use>
 <herd>desktop-effects</herd>
 <longdescription>