Version bump; tool installation is now optional.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 90 insertions, 12 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index d63db78d4161..e1dea40332ac 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.286 2012/05/20 09:43:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.287 2012/05/20 10:34:28 tetromino Exp $
+
+*libwnck-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libwnck-3.4.2.ebuild, metadata.xml:
+  Version bump; tool installation is now optional.
 
   20 May 2012; Agostino Sarubbo <ago@gentoo.org> libwnck-2.31.0.ebuild:
   Stable for amd64, wrt bug #416333
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 155b79e6427c..06d7bdca1fa5 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST libwnck-2.30.7.tar.bz2 726965 RMD160 292b75d7b2ed21a6a66af5c319b60d94c8852a68 SHA1 b5764fff5f5445405d93519cf1b449965a52083c SHA256 8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 DIST libwnck-2.31.0.tar.xz 630792 RMD160 f9e38a522df0d209cecb5c40d7e8a5ba2c27c520 SHA1 964861e1213fbd04cd7999f855064cfa4888f5bf SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e
 DIST libwnck-3.2.1.tar.xz 648836 RMD160 940ec7f6734c3ff5f8342dd9f615a8ec788c76f9 SHA1 1c6f7a73e0ef85d91f42d20ff8ad7adbe16525b8 SHA256 eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da
 DIST libwnck-3.4.0.tar.xz 653220 RMD160 3f539e6fdd0c4d5cc1eca336ba67c32b5ec95004 SHA1 d3b34ab8719a8415eae6c16c91835f4afb757d8c SHA256 34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad
+DIST libwnck-3.4.2.tar.xz 654492 RMD160 d724799b73df38fb5c38fb7baaf21c8712ef2dc5 SHA1 986f4da25c696f19e4b0d7159757d94ec5617c46 SHA256 1d055d0d7bd1069d97416985d11241eaea48aedb4311a22ff0d3404871707051
 EBUILD libwnck-2.30.7.ebuild 1446 RMD160 836c168c7fe7c5934d7d92d5d21cfa04579857a4 SHA1 db4bb282efce2df683943abee5a34b7ee4df0a21 SHA256 e6e16fef69a0241c4ec17befd6b94e70cb3003ed09482451319e6350f4078bba
 EBUILD libwnck-2.31.0.ebuild 1584 RMD160 e568eadb2665447c080b8a7281b543121caa4255 SHA1 5786f6ac7b4196e0b6157b145d91d69d4bc869c5 SHA256 c8111e2d8bbbad4c09a3c1375589b17f701a5ee5a0825be211484a7bd4a64ea9
 EBUILD libwnck-3.2.1.ebuild 1669 RMD160 c240c8b13fd36eaba7d391694b278d5ea83dc34d SHA1 a5425dcb1ef75f769a408046f6877debc4fa6308 SHA256 29a567877e9e91b67b84ef79b60151e38f9b6dd5d8670f4eafed782944270677
 EBUILD libwnck-3.4.0.ebuild 1765 RMD160 bc7d155efc9610e3e7f85e864ccb6f11a6d0f2de SHA1 9d11ba97cb91f4b7b1fc5f34036c43e3c77a0d2d SHA256 fec8f9116d43b55373df9a67de941201949e5a85a60d8a07af1abb54b999e224
-MISC ChangeLog 35248 RMD160 8f24c9edf43b3fc1c37187082c07817c72e875e7 SHA1 d8a63295681d1ae46ba85bea46bcbc6cdd8e3686 SHA256 ab7b1c7f0fa7e2aedce96788a5a2e4b8058ee443c73d5e57298cf34eb92cc3ed
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+EBUILD libwnck-3.4.2.ebuild 1820 RMD160 4d3e3a8f2ae3a5f9c1a41e48a9faac463344ac0d SHA1 aa56e09c671075acc5486c7e6e918dbbb084b6f5 SHA256 ff972fea8860f698777483733cfafc0c25ed337688a70f2b72e54b4b7ea07695
+MISC ChangeLog 35434 RMD160 58ea8b2cafa62769fdb20a8edc236f6926126559 SHA1 41261e3c1a1fec94f03febc5f68c4f8dd3a7a1f2 SHA256 88bfbcd68809bc0aef0cdd5f9431938800e127a76c4326bd005c01b74a4a7061
+MISC metadata.xml 373 RMD160 6de0363b0fc6969d408a3b81a23e54f1a8fecee3 SHA1 3a6a0ea391b04a9cdfdf5564d2d6ee58e97356ec SHA256 fe2f2ebacdf7b042ec57a981b08c3cc173ea1433a387c1b6fdf3d68c53ab6527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPuLzeAAoJEOTDgjZ80txdnucH/0YySTDdYW7ajdu6pf944/wo
-Y+hHj/TvyCqyp2nR2A4sy9RdstUWDf0ROpEPTe8peb9qcqZvaJY0L/Lm3FinKMYI
-i3SjvThoZb0aMIw8sdnfdwa2ZJmIRoeNXcLhhJL0upI/ajgPs5ONTkc498UPsdGG
-IdMjzU0ymq16yoo/jpPvVdRmpKCR+xyQwIjvkxb97tWyQ3c2bvl9j1Bew1jur2BA
-j5NGbYN9x6XcGRTZ0tB/AhaEMuBznTzD2ujAZi49pafUxVf9ycH0x/tD31Z1k3Cd
-Joc21zWGEc/5TrDMNC2U+q8Unef0sGLr1VW7rZDeeYgNOQLGy2Ec0kcNUQVCj0Q=
-=+zuo
+iQEcBAEBAgAGBQJPuMi5AAoJEJ0WA1zPCt1hKbcH/1bYYMoGwMIVRzQNlwcowxEp
+wmH+YZpaurucbVJ1c6dAzg+8HuldzcimrTdqnvN9C4F6sBOAblwS6IB9GGbDzUZT
+Z4c5UCKmlg3LxOsqouiyT2KKXNm+Xt07PsXVwIIfkeWn6ue40ELYBC3MIzX0tyRG
+qiif7RtdeFBQDa9Y4+gepqx432jUL7Tx9DtHza3b39W17QBBp7MW6s1UZNUPolyY
+PSYDqqv5wv8jMH7SosNHgx1y9fo67JQa7KdU259/CfXutCqtrV8RzCfXahzKSKna
+GptVmtkjXanPybs+yE84iknei5/AOF6at95UU0vB8A1ohTh7OYTkR3XHl/crYaE=
+=Wy+L
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libwnck/libwnck-3.4.2.ebuild b/x11-libs/libwnck/libwnck-3.4.2.ebuild
new file mode 100644
index 000000000000..f455c79b6245
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.4.2.ebuild
@@ -0,0 +1,68 @@
+# 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.2.ebuild,v 1.1 2012/05/20 10:34:28 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 ~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.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}
+	>=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/metadata.xml b/x11-libs/libwnck/metadata.xml
index 44825d13c084..9efe18da97dc 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/metadata.xml
@@ -5,5 +5,7 @@
 	<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>
 </pkgmetadata>