From 04b33af05a08cd54348f158c89c982f964974cf3 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 24 Jul 2011 13:37:23 +0000 Subject: [PATCH] Version bump. Fix a crasher bug, include freebsd fix, translation updates. Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64 --- x11-wm/metacity/ChangeLog | 7 ++- x11-wm/metacity/Manifest | 10 ++-- x11-wm/metacity/metacity-2.34.1.ebuild | 74 ++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 x11-wm/metacity/metacity-2.34.1.ebuild diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 338d3633be22..4df9704b2d27 100644 --- a/x11-wm/metacity/ChangeLog +++ b/x11-wm/metacity/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/metacity # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.270 2011/04/05 13:27:22 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.271 2011/07/24 13:37:23 eva Exp $ + +*metacity-2.34.1 (24 Jul 2011) + + 24 Jul 2011; Gilles Dartiguelongue +metacity-2.34.1.ebuild: + Version bump. Fix a crasher bug, include freebsd fix, translation updates. *metacity-2.34.0 (05 Apr 2011) diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 108c3d15bc4d..7b1629632145 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -6,14 +6,16 @@ AUX metacity-2.28.0-sys-wait-header.patch 480 RMD160 5f3cb891f1f1e5e122db1b4a20a AUX metacity-2.28.1-wif_macros.patch 500 RMD160 570a8b9e76e815cc5d207fddcf0278e193edbf77 SHA1 fa42355b0200d577eef767e28b8674eef5eb9e42 SHA256 94c1f3bd17c618a8b59585939987138bdbd590de8b3f6c16b89586e68c7c6cef DIST metacity-2.30.3.tar.bz2 2358537 RMD160 ce4a994c7b1e7b95e493fc67082a4cbb6458329f SHA1 32848d34473375ca27ef12be9f41e924d8af177d SHA256 08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd DIST metacity-2.34.0.tar.bz2 2382473 RMD160 e93072d921579cb2c5a7a0482cf1ba6150ff1859 SHA1 b25add2c1fb0c05babb341bd631c180fd82e7039 SHA256 e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698 +DIST metacity-2.34.1.tar.xz 1918056 RMD160 63161d297d6201a4fbcbc639f24e73aa20269b07 SHA1 c6f0f31e2691a79a52948d9d378e072d9cee289e SHA256 f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a EBUILD metacity-2.30.3.ebuild 2425 RMD160 37a0fa7b2fa8947399ebf9eb4faf72ac851e0b6a SHA1 d25c9724a75a5f11fb7705ee4a710dd89ba3f6cc SHA256 3c290bbb21edd469b4dda9dee71c04e46e97a399ab8cd57ebf97f762761f15ec EBUILD metacity-2.34.0.ebuild 2135 RMD160 84b0b5e463bab1ab15d09e6a19d5037ccecd5354 SHA1 19cd34b1bd1fbf6cf26da41598a5aa8fb1d62564 SHA256 1a12c7c7163a5b39ba4813a20a8cbc60560c41fd044d6d6c6231e337bf38384c -MISC ChangeLog 32807 RMD160 b0fe870b10a92254212c11afbca42660029814bd SHA1 458b0d5b3a90aa476d538fa6401b895127ec254b SHA256 b5e4f23a92ffdee96fb2633df42b75fb86472f378b1a6f8e727963614e951c00 +EBUILD metacity-2.34.1.ebuild 1914 RMD160 de32963bd5edc24bcae210c9ce8b2d98a486b09f SHA1 1b1113ffa08acf8af67595da22210ed85dd37cf7 SHA256 4d306e98f58f18aa641237604d608e4186612511c319f3a44188a5aaa986ad6a +MISC ChangeLog 32996 RMD160 1bbd038629cede8eca2f414e4118013bbf57ca58 SHA1 100abc42aaa8c2bad5dff9a1cf85ddd37a2d5faf SHA256 aa493b219d7714810e4e6f9ca0ce2b85d7a5ab721ea9bddb8ea84917cb3b9729 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2bGMAACgkQ1fmVwcYIWAbc4gCgoalBAO/AoO551vfMnyvqZdMS -ZDMAn2iAn5NxRkc8F5DnqwpLr9BMBl7X -=PZT4 +iEYEARECAAYFAk4sIBkACgkQ1fmVwcYIWAZWAACgthOhTGBb3iAcbX+CtUG7JBKB +tlwAoKtG8NflX6f7zM+K+pDhvJHwqoeR +=4sIF -----END PGP SIGNATURE----- diff --git a/x11-wm/metacity/metacity-2.34.1.ebuild b/x11-wm/metacity/metacity-2.34.1.ebuild new file mode 100644 index 000000000000..f6e511d77325 --- /dev/null +++ b/x11-wm/metacity/metacity-2.34.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.34.1.ebuild,v 1.1 2011/07/24 13:37:23 eva Exp $ + +EAPI="4" +# debug only changes CFLAGS +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="GNOME default window manager" +HOMEPAGE="http://blogs.gnome.org/metacity/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="test xinerama" + +# XXX: libgtop is automagic, hard-enabled instead +RDEPEND=">=x11-libs/gtk+-2.20:2 + >=x11-libs/pango-1.2[X] + >=gnome-base/gconf-2:2 + >=dev-libs/glib-2.6:2 + >=x11-libs/startup-notification-0.7 + >=x11-libs/libXcomposite-0.2 + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXdamage + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libSM + x11-libs/libICE + media-libs/libcanberra[gtk] + gnome-base/libgtop + gnome-extra/zenity + xinerama? ( x11-libs/libXinerama ) + !x11-misc/expocity" +DEPEND="${RDEPEND} + >=app-text/gnome-doc-utils-0.8 + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + test? ( app-text/docbook-xml-dtd:4.5 ) + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/xproto" + +pkg_setup() { + DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" + G2CONF="${G2CONF} + --disable-static + --enable-canberra + --enable-compositor + --enable-gconf + --enable-render + --enable-shape + --enable-sm + --enable-startup-notification + --enable-xsync + $(use_enable xinerama)" +} + +src_prepare() { + gnome2_src_prepare + + # WIFEXITED and friends are defined in sys/wait.h + # Fixes a build failure on BSD. + # https://bugs.gentoo.org/show_bug.cgi?id=309443 + # https://bugzilla.gnome.org/show_bug.cgi?id=605460 + epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch" +} -- 2.26.2