x11-libs/libwnck: 3.2.1 moved to gx86 + update for gx86 changes

3 files changed, 4 insertions, 75 deletions

diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index ad580474..96d636ed 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,3 +1 @@
-DIST libwnck-3.2.1.tar.xz 648836 RMD160 940ec7f6734c3ff5f8342dd9f615a8ec788c76f9 SHA1 1c6f7a73e0ef85d91f42d20ff8ad7adbe16525b8 SHA256 eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da
-EBUILD libwnck-3.2.1.ebuild 1770 RMD160 3db497e1eee3302d641c365bbb6e1d68bfe87853 SHA1 490150ab16f668f2575187bce3bd93f8470f94f2 SHA256 f51fed29295b2ccb77d8c4ae6410587ab0df19cd38762c5bc1fb885f6d096b35
-EBUILD libwnck-9999.ebuild 1770 RMD160 3db497e1eee3302d641c365bbb6e1d68bfe87853 SHA1 490150ab16f668f2575187bce3bd93f8470f94f2 SHA256 f51fed29295b2ccb77d8c4ae6410587ab0df19cd38762c5bc1fb885f6d096b35
+EBUILD libwnck-9999.ebuild 1770 RMD160 86d89e266de3fcd7c80b21a057077b8d060418fc SHA1 56d0c14b27373e455c4bd47b3720df9a23288aa6 SHA256 28b35c77c46a3aad5ac4ea1c058c1812b88ca09107dfe4f7f585d860281decb5
diff --git a/x11-libs/libwnck/libwnck-3.2.1.ebuild b/x11-libs/libwnck/libwnck-3.2.1.ebuild
deleted file mode 100644
index ef8d79ba..00000000
--- a/x11-libs/libwnck/libwnck-3.2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-3.0.2.ebuild,v 1.1 2011/06/02 15:39:42 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="doc +introspection startup-notification"
-
-RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
-	>=dev-libs/glib-2.16:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	x86-interix? ( sys-libs/itx-bind )"
-# eautoreconf needs
-#	dev-util/gtk-doc-am
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	# Don't collide with SLOT=1
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable startup-notification)
-		--program-suffix=-${SLOT}"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "wnckprop is now called wnckprop-${SLOT}"
-	elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}"
-}
diff --git a/x11-libs/libwnck/libwnck-9999.ebuild b/x11-libs/libwnck/libwnck-9999.ebuild
index ef8d79ba..47cc5192 100644
--- a/x11-libs/libwnck/libwnck-9999.ebuild
+++ b/x11-libs/libwnck/libwnck-9999.ebuild
@@ -30,13 +30,13 @@ RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	x11-libs/libXres
 	x11-libs/libXext
 	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )
+	x86-interix? ( sys-libs/itx-bind )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	x86-interix? ( sys-libs/itx-bind )"
+	doc? ( >=dev-util/gtk-doc-1.9 )"
 # eautoreconf needs
 #	dev-util/gtk-doc-am
 #	gnome-base/gnome-common