Modernize ebuilds. Update license. Drop useless doc USE flag. Switch to global introspection USE flag. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 41 insertions, 170 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index f1e7119b159e..0c78de618607 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.295 2012/11/21 23:06:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.296 2012/12/16 07:01:38 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libwnck-2.30.7.ebuild, libwnck-2.31.0.ebuild, libwnck-3.2.1.ebuild,
+  -libwnck-3.4.3.ebuild, libwnck-3.4.4.ebuild, metadata.xml:
+  Modernize ebuilds. Update license. Drop useless doc USE flag. Switch to
+  global introspection USE flag. Drop old.
 
 *libwnck-3.4.4 (21 Nov 2012)
 
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index e7b3c4b34f76..87556839effe 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libwnck-2.30.7.tar.bz2 726965 SHA256 8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c SHA512 ea283be7c9203d0cfbf166c2f4c56af6800d8f003d7d4efe46856f1f652663ce6bc80646db298aed1bf2d7fa87c534f2a9aa9d5c6d29ff44dcc90288a405f6d6 WHIRLPOOL aca47b07ac903cf73c12fcf7972721607c8280014992659ec5dc5f3bd860d90b3910599923684a93e5ccfe9193805cf7506efe786b2ca7688ae381382652175f
 DIST libwnck-2.31.0.tar.xz 630792 SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 WHIRLPOOL 369c0ce1f412a0874d2f3a09e387405632726259427fff013adc4d619f4f9f80b57e376252746bdc7fe54f27749e51127ccc0870a80629cb98afb45dc420f941
 DIST libwnck-3.2.1.tar.xz 648836 SHA256 eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da SHA512 4b6fd93c68095a3da5af3cab26fe909585ab5dc295976972dbfeb175ff1626fbc8fc6a88cac703bd56d09cd013dbd9f68e9ea00c5728fc893f41e7a795399567 WHIRLPOOL 56e464755ac09282b33e86ec1dea5c3bd5c6b1648b67b1b81377b3769393e39709b5b62b64cec5e9f39b77c9f7439e08d45dc36519ba17397491e1ba72d4dbe7
-DIST libwnck-3.4.3.tar.xz 651716 SHA256 e468118927d50231df250d1f00106b32139aaad1ee9249a4ef316e5526d17d1d SHA512 774e199cc678fde86d79a73349e29f17fab667219c2cf7eb04cb51112db9d9a5b107362bc467314b7bb96bf366390f17ce6fa843e7bc3212563e4cfac9895c84 WHIRLPOOL 5fc54439d361ff2cc13be550058d7ce850f07f4fcc48a6cb57b8850d1730df3efe96cfe7030cb696c8757dfb538d5fdcbac33bc067c8ff0644e1fd621d377c4f
 DIST libwnck-3.4.4.tar.xz 655928 SHA256 a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130 SHA512 c512e5e9d2097f593dde36b891653084ca186686edf06dd2c2f76711fcdca4827b4b5f2fb46161ff15be497354d43f0564dd8912c6d4a2ac050d89eab72da702 WHIRLPOOL 3a9fb73e194aace675864bf566d3c8db1d66f973d186df39258e0fb6992fa0c964caffb6d0d00c63c5a5a3b83b4b5a6483bc64c837200fdd241cc1fd13f43df7
-EBUILD libwnck-2.30.7.ebuild 1446 SHA256 e6e16fef69a0241c4ec17befd6b94e70cb3003ed09482451319e6350f4078bba SHA512 997b9f7e4d05bbad0d94036d3eeaf929d725ebcc16cb223b1ad98f8c387faec7e72bb93c1fee1a8f6e6548705bd6f304d93ec6d13f195a2e4d960036ab73e904 WHIRLPOOL 9828d85167c8109ad1372c7715b516dbf8fbee04ca239bcb54853214d3559d82522ed3fe815fccf6f762dd591580072e67a701a6feafea597781b5d871002860
-EBUILD libwnck-2.31.0.ebuild 1580 SHA256 700a848b1646e3b3b54c01796eb8d5837314a004627014ee02a2dc95822bee67 SHA512 df617a9ebd35121849f301d8defa87842fc236c6d874a0f9d6262714dd276fce18dd45b8d66591886f24d9bc3be41a4395717af85220920911636c2653f1a912 WHIRLPOOL 96a1d1c1f99909da4faf0f19b5829eddc0ece0212ae183970cdd3c8995d33a4dd390a1c96447c6448eecf7c86ed81af12f6dd9c5d692c5ba63739012f5af9a58
-EBUILD libwnck-3.2.1.ebuild 1663 SHA256 73ca2eee92c308d9d4358bcd3ded594924786b39c31b5cf1a7766748dadf8de8 SHA512 17b229e20d6cf069795e7e69df1b1b46733d8c0645f6f3b7c9e97adef3cd4f2d029e25a51a60bb7fa0aa035ba92607faf7809747cc2f3722aa35eac2c9589807 WHIRLPOOL 402a730ad0b8e3af4822a471ae18ed98312ba0931d3509d45e1102869de08f1cddb1660fbccef13b6c3fa3200ba03d904111aa34c1061f92607c56bba4ce0719
-EBUILD libwnck-3.4.3.ebuild 1819 SHA256 5684ea956d8a54c8584b994cf29af2e726e68fcf13ef618c2bce8d0ad4851fb9 SHA512 db2bb42d8257d3e4e89a22d6dc559bdf9430e4da676ca2a53b822867e60de2dd97399a0bc4e07385f611b9a8a19eed228e39155bc2706f03e03908642ad33603 WHIRLPOOL 11e13c5b5649d05877d3c47e01925c19cfe3c6d755582ce6a0478192f5ebc650bb6b3054edd6df178ba8abb313695bf2d09236ab2571fba60029ec8d0f525aeb
-EBUILD libwnck-3.4.4.ebuild 1814 SHA256 02b45fcb17997f142e3d9a01e6f10eb1fe4dd6b1bfb23b840f7f5ddf83d04b17 SHA512 68806b21b260d3a8486b3b934c11a222a8de980340ab70e63b49e5dfd8553007833dcfd23928a4a17b79e56a7e1d80095afb34ef3a1dffc935c901b876176e0b WHIRLPOOL 41bfe04b542db8f6d5a24d832ca86f36b762efb5f13d75e13f2a339263d2c94bc50c11db7b7bed3203568ea15079451955e1eb2f8215ad069c110ad27ae06e72
-MISC ChangeLog 36385 SHA256 d875493ce116d903ebee45e8a445035dd77c44d1cb38d39f445c992083570a51 SHA512 1b0d94194b8d293debb0453a15c79ca4fd9f31e39b994e3ebcb0a15a246113126ac9e2032879f91e5133f8f5446c006a4b0fcae6fc7c4d1e39e6de9389133064 WHIRLPOOL 47057bf7f01e8091bcba5085e576dacedc66e04ffc4e207d694352179547fe100ac0204d31dba33de830ba6725593f21733d556082aea03b5ea4371d00bbe0ba
-MISC metadata.xml 373 SHA256 fe2f2ebacdf7b042ec57a981b08c3cc173ea1433a387c1b6fdf3d68c53ab6527 SHA512 359dbbdf09a74e52b92551520b2b974939f1048fe891dcfa0a01011e84c88ad33d6c6255640b6d6ab9464852764b07150ee998b08f1c74a406983eebc2ad3001 WHIRLPOOL 0a1adbe9a6b5d33491c5d7488f5c95e539595b5484ce42830af412f2a7da811d18a7bbd0bd5b5ed2851c0954b94803b2473f0406f9e80d0e682d1f12cc2148ca
+EBUILD libwnck-2.31.0.ebuild 1550 SHA256 5e4793aca842d4b9dfeccfad27c525e04cf14c4725afcc3a903de428ab90dc75 SHA512 030ec058c6330556430af46438798f8e05527ec5bb4838f8af364de8857e593ddf7d2e67e221efa6b786a9e2cebf569651aeb6dcdd730438a39dff0d5800177f WHIRLPOOL 7e76f84e285da42e792d5172b2f50bb4c42ad3cbc9fd6511400476348afec76057d44b4ce5de65e04854173301782f6b8af7fde719a319ea2f0039d5fa10be7d
+EBUILD libwnck-3.2.1.ebuild 1629 SHA256 192e291fc343b276e530d469dbf49e95e7e7377dcb2a71497c1d67626e10544a SHA512 f215f95a5e24f30727ddbac0533af43390190e2b3907cdce528a4c2e5a7627b9343197a98f2b8e9f4049e92c1874d1375c922f7bb34ad1de7627033477f66c15 WHIRLPOOL a501439ce6fcfd07832fb2777e793a3c617255cd84630a91faadd3c3ec1a1ded52ef2d75122f98b6f335e5161a9b0de2129665a31011392f4eaf0ee7a4498f93
+EBUILD libwnck-3.4.4.ebuild 1693 SHA256 67fdefa26696b58bdbf89d3f3478d5d6e76c67724eed735d48e8769d6afdb8a8 SHA512 097cbe5cce8ad4bb3ac411c3c4d20d41d97a9638b8784d390dc4d6dea0dd1002c31fb6ce163167c377c95a2316c433b1d19f2286393acb547342fe83bfe01fa9 WHIRLPOOL 9bb61e354af9ec99c8f1cc19287a2e73b99f0bc024e4cc5857d467d1f031d8b8ad59699b588f1e7e99c5aedef8322c3e93f02c3c9b8aede041b0cb3ba15aa01e
+MISC ChangeLog 36700 SHA256 c509f4d1270227c554a4a221dd5461051ce3691f352f0d204cceb6335fa2f357 SHA512 cf2855669380edd8b464934613860e9d530e0912ce2c465e3c78e9d50da70b071e509dfddb08d56f7ef851cbe86ec809405d96e9eff504f09a48bac08d075bc4 WHIRLPOOL cf9d68b462264dd629b34235a01d44b6a336d671dda08ba9f26da2bbfd01ae85fbc28607f92c2bb024b1f8437732cbb248e82e0ef62ac23513c959809a7267de
+MISC metadata.xml 270 SHA256 2ae55be45db83407f266aca79205d1602e012e91e325b9f33d7ba11c80aea16e SHA512 aef45e4937caeb214dc87a0189b6124af8c36faa26848ad5db01611cc9a5618b1aa157e0c204051cd3b3d3769f5b1e7515db50bae6e0f3722b4366335924cbad WHIRLPOOL 070ac03e8a8ff3ca430425cd57764cdecab3699db388218915c560abbc6e373ee4a0f06606f5c8b80b4b8b6dc6dc1bd2eb7422acfc0d54990f8eddad30d542ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCtXoQACgkQ1fmVwcYIWAb+PQCffnvvbEtqY90wrXIY0v3m3z5P
-o4UAnix0TSQl2EhkNlJBZELJKpc8eu7f
-=XiCj
+iQEcBAEBCAAGBQJQzXHTAAoJEJ0WA1zPCt1hh04H/3NEzXKj41FMLKnuiLAZVf1f
+VaKkYC+DLMk1cDaymSEx2BaA0ZsiwJvQqNS9koP8DOZJmkNOivGBI9eKVR2JzlhE
+sxw8SfVUumEcBG1B+rxvDheM1RvcaUYtJlB7OgxPfiGtmoeW2c1GQEOlg+1XJ0cq
+65Vg9ikGg/wFxrneK/K2ET6FycQNlwjpwR2m6SUX7OYdfyYDk0eYJFYQ47+Xr+7R
+xJKX7U/PrSpxylP3661qaDknlfnzwgUcrHh6IuCOmDxzrfBBsO/8CryAwOfuJ0dT
+xT3qyJPA54/Oieaaodb9uw9TtKc8LqnvrYvscUFLL7W/bFR46N2xHMc/t2mOCIc=
+=ScxU
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libwnck/libwnck-2.30.7.ebuild b/x11-libs/libwnck/libwnck-2.30.7.ebuild
deleted file mode 100644
index 143cfe0bb283..000000000000
--- a/x11-libs/libwnck/libwnck-2.30.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-2.30.7.ebuild,v 1.8 2012/05/05 03:52:25 jdhore Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips 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+-2.19.7:2[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
-	virtual/pkgconfig
-	>=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() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable startup-notification)"
-	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
-}
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 0f809d1f72d8..40082c3f33e7 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -1,17 +1,17 @@
 # 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-2.31.0.ebuild,v 1.9 2012/06/17 18:01:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.31.0.ebuild,v 1.10 2012/12/16 07:01:38 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
@@ -25,24 +25,21 @@ RDEPEND=">=x11-libs/gtk+-2.19.7:2[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.9
+	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=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() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable introspection)
 		$(use_enable startup-notification)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
 
-src_prepare() {
 	# Regenerate pregenerated marshalers for <glib-2.31 compatibility
 	rm -v libwnck/wnck-marshal.{c,h} || die "rm failed"
 
diff --git a/x11-libs/libwnck/libwnck-3.2.1.ebuild b/x11-libs/libwnck/libwnck-3.2.1.ebuild
index c65a1ab68e35..0ea7266626b3 100644
--- a/x11-libs/libwnck/libwnck-3.2.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.2.1.ebuild
@@ -1,21 +1,21 @@
 # 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.2.1.ebuild,v 1.9 2012/07/15 18:35:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-3.2.1.ebuild,v 1.10 2012/12/16 07:01:38 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="3"
 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"
 
-IUSE="doc +introspection startup-notification"
+IUSE="+introspection startup-notification"
 
 RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	>=dev-libs/glib-2.16:2
@@ -26,15 +26,14 @@ RDEPEND=">=x11-libs/gtk+-3.0:3[introspection?]
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	x86-interix? ( sys-libs/itx-bind )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
+	>=dev-util/gtk-doc-1.9
 	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	sys-devel/gettext
+	virtual/pkgconfig"
 # eautoreconf needs
-#	dev-util/gtk-doc-am
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
 	# Don't collide with SLOT=1
 	G2CONF="${G2CONF}
 		--disable-static
@@ -42,9 +41,7 @@ pkg_setup() {
 		$(use_enable startup-notification)
 		--program-suffix=-${SLOT}"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	if use x86-interix; then
diff --git a/x11-libs/libwnck/libwnck-3.4.3.ebuild b/x11-libs/libwnck/libwnck-3.4.3.ebuild
deleted file mode 100644
index c8196ac64a0f..000000000000
--- a/x11-libs/libwnck/libwnck-3.4.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.4.3.ebuild,v 1.1 2012/09/04 23:34:33 nirbheek 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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc +introspection startup-notification tools"
-
-RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
-	>=dev-libs/glib-2.32: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}
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	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)
-		$(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
-		# 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
-
-	if use tools; then
-		elog "wnckprop is now called wnckprop-${SLOT}"
-		elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}"
-	fi
-}
diff --git a/x11-libs/libwnck/libwnck-3.4.4.ebuild b/x11-libs/libwnck/libwnck-3.4.4.ebuild
index 9385516a317e..7915956185e4 100644
--- a/x11-libs/libwnck/libwnck-3.4.4.ebuild
+++ b/x11-libs/libwnck/libwnck-3.4.4.ebuild
@@ -1,21 +1,21 @@
 # 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.4.4.ebuild,v 1.1 2012/11/21 23:06:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-3.4.4.ebuild,v 1.2 2012/12/16 07:01:38 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit flag-o-matic gnome2
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="3"
 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"
 
-IUSE="doc +introspection startup-notification tools"
+IUSE="+introspection startup-notification tools"
 
 RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
 	>=dev-libs/glib-2.32:2
@@ -26,15 +26,14 @@ RDEPEND=">=x11-libs/gtk+-3.4:3[introspection?]
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	x86-interix? ( sys-libs/itx-bind )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.9
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	virtual/pkgconfig"
 # eautoreconf needs
-#	dev-util/gtk-doc-am
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
 	# Don't collide with SLOT=1
 	G2CONF="${G2CONF}
 		--disable-static
@@ -43,11 +42,6 @@ pkg_setup() {
 		$(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
 
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index 9efe18da97dc..8e1b6e57a01a 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3
 			command-line tools</flag>
 	</use>