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

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 29 insertions, 158 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/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>