x11-libs/libwnck: moved to gx86; update live ebuild

3 files changed, 13 insertions, 71 deletions

diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 062ba1f6..5be243f5 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,3 +1 @@
-DIST libwnck-3.4.0.tar.xz 653220 RMD160 3f539e6fdd0c4d5cc1eca336ba67c32b5ec95004 SHA1 d3b34ab8719a8415eae6c16c91835f4afb757d8c SHA256 34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad
-EBUILD libwnck-3.4.0.ebuild 1664 RMD160 3a9a93bf52a27ec74f753dcd920c682e6e00c635 SHA1 d129c26c3edb0b752a93c70ce2df91dfe0da403e SHA256 a3585d5bdf3652791c070b5e88a43f6fbe0ab2db1b9a53c1cd2a0effdc474efc
-EBUILD libwnck-9999.ebuild 1763 RMD160 da7fa4cc08cde231084a3913368b964f3e0bd650 SHA1 fe5841dbbf1d9d14cbcc2f46d0bf36e682b81469 SHA256 cdeb0db8cf4cd28596f8a4aa1aea8f730434696b0399bf6c159b6cb346afdc80
+EBUILD libwnck-9999.ebuild 1921 RMD160 4132090da54bdf7ccbbab31ccdb097d926cc3a6f SHA1 8bce58acfcb774d02391a1eb400e6318dd585037 SHA256 03cefb142361797bec52b8e08fb7bf14a39aab13b39e11185cc949578deca11e
diff --git a/x11-libs/libwnck/libwnck-3.4.0.ebuild b/x11-libs/libwnck/libwnck-3.4.0.ebuild
deleted file mode 100644
index 361f2221..00000000
--- a/x11-libs/libwnck/libwnck-3.4.0.ebuild
+++ /dev/null
@@ -1,62 +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.2.1.ebuild,v 1.1 2011/10/28 22:31:42 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-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"
-
-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 )
-	x86-interix? ( sys-libs/itx-bind )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-# 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 a1e18913..bec6a9ed 100644
--- a/x11-libs/libwnck/libwnck-9999.ebuild
+++ b/x11-libs/libwnck/libwnck-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
 
@@ -19,10 +19,10 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="doc +introspection startup-notification"
+IUSE="doc +introspection startup-notification tools"
 
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	>=dev-libs/glib-2.16:2
@@ -33,8 +33,8 @@ RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	x86-interix? ( sys-libs/itx-bind )"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
-	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # eautoreconf needs
@@ -47,11 +47,15 @@ pkg_setup() {
 		--disable-static
 		$(use_enable introspection)
 		$(use_enable startup-notification)
+		$(use_enable tools)
 		--program-suffix=-${SLOT}"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
 
 src_prepare() {
+	# Regenerate marashalers for <glib-2.31 compat
+	rm -v libwnck/wnck-marshal.{c,h} || die
+
 	gnome2_src_prepare
 
 	if use x86-interix; then
@@ -64,6 +68,8 @@ src_prepare() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	elog "wnckprop is now called wnckprop-${SLOT}"
-	elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}"
+	if use tools; then
+		elog "wnckprop is now called wnckprop-${SLOT}"
+		elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}"
+	fi
 }