commit: 1da6a81ec0d4851f2619608621baba1044872753 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Thu Oct 9 22:39:25 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 22:39:25 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1da6a81e
x11-wm/metacity: 2.34.13 → 3.14.0 Patch included in this release. --- .../files/metacity-2.28.1-wif_macros.patch | 16 -------- ...metacity-9999.ebuild => metacity-3.14.0.ebuild} | 44 ++++++---------------- x11-wm/metacity/metacity-9999.ebuild | 27 +++++-------- 3 files changed, 22 insertions(+), 65 deletions(-) diff --git a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch b/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch deleted file mode 100644 index 4ce382e..0000000 --- a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - ---- metacity-2.28.1/src/core/delete.c.old 2010-03-15 07:46:52.000000000 +0100 -+++ metacity-2.28.1/src/core/delete.c 2010-03-15 07:47:12.000000000 +0100 -@@ -32,6 +32,7 @@ - #include "workspace.h" - - #include <sys/types.h> -+#include <sys/wait.h> /* WIF* macros */ - #include <signal.h> - #include <unistd.h> - #include <errno.h> diff --git a/x11-wm/metacity/metacity-9999.ebuild b/x11-wm/metacity/metacity-3.14.0.ebuild similarity index 61% copy from x11-wm/metacity/metacity-9999.ebuild copy to x11-wm/metacity/metacity-3.14.0.ebuild index 6cfa917..1ba0edd 100644 --- a/x11-wm/metacity/metacity-9999.ebuild +++ b/x11-wm/metacity/metacity-3.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,25 +7,19 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit gnome2 DESCRIPTION="GNOME default window manager" HOMEPAGE="http://blogs.gnome.org/metacity/"; LICENSE="GPL-2" SLOT="0" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -fi +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.24:2 +RDEPEND=" + >=x11-libs/gtk+-3.8:3 >=x11-libs/pango-1.2[X] >=dev-libs/glib-2.25.10:2 >=gnome-base/gsettings-desktop-schemas-3.3 @@ -40,11 +34,12 @@ RDEPEND=">=x11-libs/gtk+-2.24:2 x11-libs/libXrandr x11-libs/libSM x11-libs/libICE - media-libs/libcanberra[gtk] - gnome-base/libgtop + media-libs/libcanberra[gtk3] + gnome-base/libgtop:2= gnome-extra/zenity xinerama? ( x11-libs/libXinerama ) - !x11-misc/expocity" + !x11-misc/expocity +" DEPEND="${RDEPEND} sys-devel/gettext >=dev-util/intltool-0.35 @@ -52,25 +47,10 @@ DEPEND="${RDEPEND} test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto - x11-proto/xproto" - -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" - - gnome2_src_prepare -} + x11-proto/xproto +" src_configure() { - local myconf="" - - if [[ ${PV} != 9999 ]]; then - myconf="${myconf} ITSTOOL=$(type -P true)" - fi - DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" gnome2_src_configure \ --disable-static \ @@ -83,5 +63,5 @@ src_configure() { --enable-xsync \ --enable-themes-documentation \ $(use_enable xinerama) \ - ${myconf} + ITSTOOL=$(type -P true) } \ No newline at end of file diff --git a/x11-wm/metacity/metacity-9999.ebuild b/x11-wm/metacity/metacity-9999.ebuild index 6cfa917..df2b6b6 100644 --- a/x11-wm/metacity/metacity-9999.ebuild +++ b/x11-wm/metacity/metacity-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,7 +7,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 +inherit gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -25,7 +25,8 @@ fi IUSE="test xinerama" # XXX: libgtop is automagic, hard-enabled instead -RDEPEND=">=x11-libs/gtk+-2.24:2 +RDEPEND=" + >=x11-libs/gtk+-3.8:3 >=x11-libs/pango-1.2[X] >=dev-libs/glib-2.25.10:2 >=gnome-base/gsettings-desktop-schemas-3.3 @@ -40,11 +41,12 @@ RDEPEND=">=x11-libs/gtk+-2.24:2 x11-libs/libXrandr x11-libs/libSM x11-libs/libICE - media-libs/libcanberra[gtk] - gnome-base/libgtop + media-libs/libcanberra[gtk3] + gnome-base/libgtop:2= gnome-extra/zenity xinerama? ( x11-libs/libXinerama ) - !x11-misc/expocity" + !x11-misc/expocity +" DEPEND="${RDEPEND} sys-devel/gettext >=dev-util/intltool-0.35 @@ -52,17 +54,8 @@ DEPEND="${RDEPEND} test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto - x11-proto/xproto" - -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" - - gnome2_src_prepare -} + x11-proto/xproto +" src_configure() { local myconf=""
