From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 56FC2138BF0 for ; Sun, 11 Oct 2015 20:47:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49B05E0845; Sun, 11 Oct 2015 20:47:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4DACE0839 for ; Sun, 11 Oct 2015 20:47:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F6BE33BF11 for ; Sun, 11 Oct 2015 20:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23986D10 for ; Sun, 11 Oct 2015 20:46:58 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1444596372.2bace6e4ddefc13c09b967e8f197be12f76f977f.tranquility@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.18.0.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 2bace6e4ddefc13c09b967e8f197be12f76f977f X-VCS-Branch: master Date: Sun, 11 Oct 2015 20:46:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 488ec1c7-8b27-4bf1-9319-35170be5eb5e X-Archives-Hash: 90fdd8f336cad1dbd562955f14d6cf96 commit: 2bace6e4ddefc13c09b967e8f197be12f76f977f Author: Ole Reifschneider gentoo org> AuthorDate: Sun Oct 4 10:41:44 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sun Oct 11 20:46:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bace6e4 x11-libs/gtk+: Bump version to 3.18.0 Package-Manager: portage-2.2.22 Manifest-Sign-Key: 7E8B4D42 .../gtk+/{gtk+-9999.ebuild => gtk+-3.18.0.ebuild} | 55 +++++++--------------- x11-libs/gtk+/gtk+-9999.ebuild | 10 ++-- 2 files changed, 22 insertions(+), 43 deletions(-) diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.18.0.ebuild similarity index 79% copy from x11-libs/gtk+/gtk+-9999.ebuild copy to x11-libs/gtk+/gtk+-3.18.0.ebuild index 13bc54c..b70ecdf 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-3.18.0.ebuild @@ -6,10 +6,7 @@ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/" @@ -22,23 +19,18 @@ REQUIRED_USE=" xinerama? ( X ) " -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # FIXME: introspection data is built against system installation of gtk+:3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) COMMON_DEPEND=" >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] x11-misc/shared-mime-info cloudprint? ( @@ -46,7 +38,7 @@ COMMON_DEPEND=" >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39 ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] media-libs/mesa[wayland,${MULTILIB_USEDEP}] @@ -85,18 +77,11 @@ DEPEND="${COMMON_DEPEND} test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) - examples? ( media-libs/libcanberra[gtk3] ) " - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.20 )" -fi - # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 # >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html +# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html RDEPEND="${COMMON_DEPEND} >=dev-util/gtk-update-icon-cache-3 !=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39 ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] media-libs/mesa[wayland,${MULTILIB_USEDEP}] @@ -85,7 +85,6 @@ DEPEND="${COMMON_DEPEND} test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) - examples? ( media-libs/libcanberra[gtk3] ) " if [[ ${PV} = 9999 ]]; then @@ -96,7 +95,7 @@ fi # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 # >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html +# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html RDEPEND="${COMMON_DEPEND} >=dev-util/gtk-update-icon-cache-3 !