From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RpPUP-0003IR-BB for garchives@archives.gentoo.org; Mon, 23 Jan 2012 19:23:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 532BFE0B44; Mon, 23 Jan 2012 19:23:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13A3BE0B44 for ; Mon, 23 Jan 2012 19:23:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EADD1B4021 for ; Mon, 23 Jan 2012 19:23:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 95DD080044 for ; Mon, 23 Jan 2012 19:23:23 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <4cab925d5b90de356fd5d0a0ffdad80395899e08.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/gtk+-3.3.10.ebuild x11-libs/gtk+/gtk+-3.3.8.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 4cab925d5b90de356fd5d0a0ffdad80395899e08 Date: Mon, 23 Jan 2012 19:23:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 18ef347b-bcb0-49ae-aab9-cb470971064b X-Archives-Hash: 9d297b04b17470dbdc0cf1e8412f060f commit: 4cab925d5b90de356fd5d0a0ffdad80395899e08 Author: Priit Laes plaes org> AuthorDate: Mon Jan 23 19:19:42 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Mon Jan 23 19:19:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4cab925d x11-libs/gtk+: 3.3.8 =E2=86=92 3.3.10 --- .../gtk+/{gtk+-3.3.8.ebuild =3D> gtk+-3.3.10.ebuild} | 17 ++++++++++++= +---- x11-libs/gtk+/gtk+-9999.ebuild | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x11-libs/gtk+/gtk+-3.3.8.ebuild b/x11-libs/gtk+/gtk+-3.3.10.= ebuild similarity index 91% rename from x11-libs/gtk+/gtk+-3.3.8.ebuild rename to x11-libs/gtk+/gtk+-3.3.10.ebuild index 31423aa..00240b1 100644 --- a/x11-libs/gtk+/gtk+-3.3.8.ebuild +++ b/x11-libs/gtk+/gtk+-3.3.10.ebuild @@ -5,6 +5,9 @@ EAPI=3D"4" =20 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi =20 DESCRIPTION=3D"Gimp ToolKit +" HOMEPAGE=3D"http://www.gtk.org/" @@ -17,7 +20,11 @@ SLOT=3D"3" # I tried this and got it all compiling, but the end result is unusable = as it # horribly mixes up the backends -- grobian IUSE=3D"aqua colord cups debug doc examples +introspection packagekit te= st vim-syntax xinerama" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc = ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-mac= os ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +if [[ ${PV} =3D 9999 ]]; then + KEYWORDS=3D"" +else + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc= ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-ma= cos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi =20 # FIXME: introspection data is built against system installation of gtk+= :3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautor= econf) @@ -42,7 +49,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.10 + >=3Ddev-libs/glib-2.31.11 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2 @@ -109,14 +116,16 @@ src_prepare() { if ! use test; then # don't waste time building tests strip_builddir SRC_SUBDIRS tests Makefile.am - strip_builddir SRC_SUBDIRS tests Makefile.in + [[ ${PV} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in fi =20 if ! use examples; then # don't waste time building demos strip_builddir SRC_SUBDIRS demos Makefile.am - strip_builddir SRC_SUBDIRS demos Makefile.in + [[ ${PV} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in fi + + gnome2_src_prepare } =20 src_configure() { diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index 5e7c7bc..00240b1 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -49,7 +49,7 @@ COMMON_DEPEND=3D"!aqua? ( >=3Dx11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) - >=3Ddev-libs/glib-2.31.10 + >=3Ddev-libs/glib-2.31.11 >=3Dx11-libs/pango-1.29.0[introspection?] >=3Ddev-libs/atk-2.1.5[introspection?] >=3Dx11-libs/gtk+-2.24:2