Bugs 96117, 95813, and 95552 should be covered by this change in deps and bump

Package-Manager: portage-2.0.51.22-r1

6 files changed, 18 insertions, 43 deletions

diff --git a/dev-perl/gnome2-wnck/ChangeLog b/dev-perl/gnome2-wnck/ChangeLog
index e1b4247bcdc0..d38d48c4a8d7 100644
--- a/dev-perl/gnome2-wnck/ChangeLog
+++ b/dev-perl/gnome2-wnck/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/gnome2-wnck
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/ChangeLog,v 1.11 2005/06/09 21:56:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/ChangeLog,v 1.12 2005/06/15 10:36:31 mcummings Exp $
+
+  15 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  gnome2-wnck-0.04-r1.ebuild, -gnome2-wnck-0.04.ebuild,
+  gnome2-wnck-0.10.ebuild:
+  Bugs 96117, 95813, and 95552 should be covered by this change in deps and bump
 
   09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome2-wnck-0.10.ebuild:
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index 95429ed75f5f..68ee0b4d025a 100644
--- a/dev-perl/gnome2-wnck/Manifest
+++ b/dev-perl/gnome2-wnck/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe3522ef39be2507c626bdc8eb9ace12 gnome2-wnck-0.04-r1.ebuild 868
-MD5 43d2873b43698a9e088b1956b3b9465c gnome2-wnck-0.04.ebuild 758
-MD5 f6f6209bec197b6c79c3957605d0a362 gnome2-wnck-0.10.ebuild 874
-MD5 0cff661d2a3fc97cb2e88a038c4e1edb ChangeLog 1744
+MD5 030e5a7c4244443d312419008d29f65e ChangeLog 1965
+MD5 df64e68e2ffb22231dfdce900792b22c gnome2-wnck-0.04-r1.ebuild 873
+MD5 fd2eef773ba7fac01d48d35f97c6c523 gnome2-wnck-0.10.ebuild 874
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 df16ecdd4f7f9ec07c6a5b2dbfc7295b files/digest-gnome2-wnck-0.04 67
+MD5 df16ecdd4f7f9ec07c6a5b2dbfc7295b files/digest-gnome2-wnck-0.04-r1 67
 MD5 7a1c36cf9892603a54849ddef2d48c57 files/digest-gnome2-wnck-0.10 67
 MD5 bbf0dd5120c2b7645abecf57d81dcb48 files/window_close_patch 465
-MD5 df16ecdd4f7f9ec07c6a5b2dbfc7295b files/digest-gnome2-wnck-0.04-r1 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCqLsyKRy60XGEcJIRAowAAJ448CM0ko37vI63H523uoJlxee+rACbB9qx
-60vOMBdI8uQna6qzL88TuV8=
-=hYRF
+iD8DBQFCsATBtG5z4I8BtQoRAvpPAJ4mHJ9X6nQbPulyc7/x8PTZ/LgMawCghPFK
+TGkNw0pQr8K2tkTIoNRlcaE=
+=adeu
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/gnome2-wnck/files/digest-gnome2-wnck-0.04 b/dev-perl/gnome2-wnck/files/digest-gnome2-wnck-0.04
deleted file mode 100644
index 292135f0a80f..000000000000
--- a/dev-perl/gnome2-wnck/files/digest-gnome2-wnck-0.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4192184fe9f0954a5550920eac9770a4 Gnome2-Wnck-0.04.tar.gz 22345
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild
index 381da78e7df0..3e4d569a033b 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild,v 1.7 2005/05/05 23:56:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.04-r1.ebuild,v 1.8 2005/06/15 10:36:31 mcummings Exp $
 
 IUSE=""
 inherit perl-module eutils
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc amd64"
 
 DEPEND=">=dev-perl/glib-perl-1.042
 	>=dev-perl/gtk2-perl-1.042
-	>=x11-libs/libwnck-2
+	<x11-libs/libwnck-2.10.0
 	dev-perl/extutils-pkgconfig
 	>=dev-perl/extutils-depends-0.2"
 
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.04.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.04.ebuild
deleted file mode 100644
index 4a89c03d4b00..000000000000
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.04.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.04.ebuild,v 1.7 2005/05/05 23:56:10 swegener Exp $
-
-IUSE=""
-inherit perl-module eutils
-
-MY_P=Gnome2-Wnck-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-SRC_URI="mirror://sourceforge/gtk2-perl/${MY_P}.tar.gz"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc"
-
-DEPEND=">=dev-perl/glib-perl-1.042
-	>=dev-perl/gtk2-perl-1.042
-	>=x11-libs/libwnck-2
-	dev-perl/extutils-pkgconfig
-	>=dev-perl/extutils-depends-0.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-window-close.patch
-}
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild
index 4f7eb0ee2867..995902dea2dd 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild,v 1.4 2005/06/09 21:56:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.10.ebuild,v 1.5 2005/06/15 10:36:31 mcummings Exp $
 
 IUSE=""
 inherit perl-module eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gtk2-perl/${MY_P}.tar.gz"
 HOMEPAGE="http://gtk2-perl.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 sparc"
+KEYWORDS="x86 ~ppc ~amd64 sparc"
 
 DEPEND=">=dev-perl/glib-perl-1.042
 	>=dev-perl/gtk2-perl-1.042