Cleanup

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

3 files changed, 18 insertions, 88 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index a20d6773444f..c1d0667132cb 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.225 2011/06/02 21:57:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.226 2011/06/03 22:06:22 dilfridge Exp $
+
+  03 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.6.3.ebuild:
+  Cleanup
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.4.5.ebuild:
   Drop KDE-4.4
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 83a1d8ae5687..42edba5be04e 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -8,23 +8,22 @@ DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD kwin-4.6.2.ebuild 1725 RMD160 03751686095ce845456f014742795c9b7a7bdf55 SHA1 5011530ce1c85017feff2761e6df1eeda6fbf90d SHA256 bbd8bacac25bcdc3f9f397a49d7c41e4c7b7f504af66bf23af6825c6b86437cd
 EBUILD kwin-4.6.3-r1.ebuild 1780 RMD160 4c6d2dcc57a67224b58d9446558a80323bd37d2d SHA1 da9abdf71d9951be348e6d647b2aa3c2921c56ad SHA256 523b374e1e1691ae7763871ac4798f981e3120cf35aab73f68da010665c29b97
-EBUILD kwin-4.6.3.ebuild 1731 RMD160 431d8a3098d6b28ce065b18587b51e96bb63ca6e SHA1 1e2c19e823eb2b817e8500108aa388a7b4bbabc6 SHA256 dde48084706a76fa6df55c5ff840d2af3d41d0b4e782b6ba1f38fa9701592414
-MISC ChangeLog 27407 RMD160 9f761285b39b3313fd72d73e612e110ae057a8a4 SHA1 1f7f82bc856bcfb202b39163935cfe8270545056 SHA256 fa907a6952495bf858ec8e5f4e1f8f56a0cae3b3fd24d41b1f77954998a25aed
+MISC ChangeLog 27495 RMD160 fc45696a30b08576fe397f008ff97a29fac0689f SHA1 611fa954558362509586cda7a8b85d1c13eb4580 SHA256 35a816e5b67925fcd6911f6467f90d61fddf4aa2dab561da4fcd871d043682cd
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN6AesAAoJENwGBM22xffew+8P/2kPExIzv92rFYFljWV8P+cI
-WPnYA91AIVJ7h4GbPRlAzgr+fRguqTsckqF9CRTQ8Y4/b3wPQ8HKFuiFyV89t+Ni
-xv/anbYauBq6g5SV80VamiqfXBCrva2lRq8u+Xqf6fpUtv6/zyV6mjn+FULL4SeJ
-/3his68eTjwGHVP4QJTJrMBlGi0+q3mn7B7t/CNKLrR+e2akO0aZsgrLFdTROtQe
-O2COecSHsXpeFWMyk1i8AwNG4JRIKkNCasixtE1NVDfNCOEVDg7xrT/fMhdJDFui
-yqJVLl+N911ushbIDG7dLByR+vVs+8Q4zB1PxDyE63gVvfLmibYK0eeUswMqLq3K
-LEIFkikYJ/wQRdUAln52C/tE6XI4YJ0m1HYgzDYUwv4mGSM0Aa/jF/HByP5HJ2ss
-7+3PgbqZGP1abYz3wYeV9IqHtUxvsAlrHzE6/gwGWdG7VX6SE+QckCblqMMkLIqD
-z/k6+Dr3HKkIleuoZ0NbLlfYMUTRxExK0AcXlzQrIkGTFqoNH0v6gt0MhU3/PhSn
-/UOiBPpPbGg3O2QhWmPe5fNaLH+aaNyu7B7EffCS3cOutRMbw+pcueeShZCjSDB9
-iYsVp2T4KhtYWEOqAjZrSeQemj9CrI4NZl9BxG4tb//ufDEqPjymUm/N6txDeamB
-WhLuQ288r9e4c/+zD32g
-=/gJw
+iQIcBAEBCgAGBQJN6VrjAAoJENwGBM22xffe6aUP/3Ef3LwI6pJ/m8M+TyXcTkIS
+2850E285SuJPj0BTZM23f91/QOT+IzQh5N95pnmSNgTjXlMy6Ejw4rQCbOkeaXiA
+8Iy6G9U72cKxVy3PXfJ0Mh4LAF8Iu2rxQH+WWJXaTOVEoMoKxtU6rVS5B5dOQWoU
++6fa8ruBKmBxRVKqf3LLZtx/4Ign/rX+sqPNYyx+JVlLWE4m+mAAs9GU/JI9f2sy
+bEuMZfyNuKD2ZI6ryc+ivZGnWgYgDDPYQ7LAAYANIcC3xWuhLe2pBZxrq2T/6yXD
+k02lv93tKgltk6F/XZYXwDH5GNDOJ5grbSJva/vYsoBQWmmP+xR9t8qTZRKEvZtU
+5WqcBAZRFKLWA7n4tbmA7qKRnG6jal7It1p6bj1Q/ZY571/E6NMK8FTQfDYN34nC
+j3dx9Y8wVTXIOHbrbGIoiaT9Jp1ncwqJDpL3CKQpruGeVbz7PONm9ce3UJx8zqe8
+hAGDGg7Qq4xRh7zn207z1ixDeyzYnTTNojjInONJv0pSJBO7zi4Q60w6KvdgqQsC
+cqntdhMo5/UCb9JH3pWvcxS8zm3vGH1PIf/aZonLBrupbN+8kIXNuu483JfEgfNJ
+9CSMA0II0AZKesWC9xMLosor4Clf1gL4XddnfXBUyIWlUgp9ZNY0uPVfLwOx3Kpi
+u/Vl28IQ39nqpfyQV5+y
+=s30c
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/kwin-4.6.3.ebuild b/kde-base/kwin/kwin-4.6.3.ebuild
deleted file mode 100644
index c844be603910..000000000000
--- a/kde-base/kwin/kwin-4.6.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.3.ebuild,v 1.2 2011/05/09 10:05:21 scarabeus Exp $
-
-EAPI=4
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug xcomposite xinerama"
-
-# NOTE disabled for now: captury? ( media-libs/libcaptury )
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( virtual/opengl )
-	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-fix-opengl.patch"
-)
-
-src_prepare() {
-# NOTE uncomment when enabled again by upstream
-#	if ! use captury; then
-#		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
-#			-i kwin/effects/CMakeLists.txt || \
-#			die "Making captury optional failed."
-#	fi
-
-	kde4-meta_src_prepare
-}
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EKDEDIR}/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}