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 842AD138819 for ; Thu, 12 Dec 2013 23:21:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1071EE09C1; Thu, 12 Dec 2013 23:21:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38AFDE09C1 for ; Thu, 12 Dec 2013 23:21:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3730D33F266 for ; Thu, 12 Dec 2013 23:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DA6E619002F for ; Thu, 12 Dec 2013 23:20:58 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1386890446.f7bcd62f151807f66cdb339e4c1cec0880f7595a.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/pango/pango-1.36.1.ebuild x11-libs/pango/pango-9999.ebuild X-VCS-Directories: x11-libs/pango/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: f7bcd62f151807f66cdb339e4c1cec0880f7595a X-VCS-Branch: master Date: Thu, 12 Dec 2013 23:20: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: 6a1e9c8c-5363-40c9-a595-77c7299f20fe X-Archives-Hash: 1db9af6bded2cc8622826046860adcb8 commit: f7bcd62f151807f66cdb339e4c1cec0880f7595a Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Dec 12 22:32:02 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Dec 12 23:20:46 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7bcd62f x11-libs/pango: 1.34.1 → 1.36.1 --- .../{pango-9999.ebuild => pango-1.36.1.ebuild} | 46 +++++++++++----------- x11-libs/pango/pango-9999.ebuild | 39 ++++++++++-------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-1.36.1.ebuild similarity index 65% copy from x11-libs/pango/pango-9999.ebuild copy to x11-libs/pango/pango-1.36.1.ebuild index e47ce31..dbe41c6 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-1.36.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,59 +7,57 @@ GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit autotools eutils gnome2 multilib toolchain-funcs -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Internationalized text layout and rendering library" HOMEPAGE="http://www.pango.org/" LICENSE="LGPL-2+ FTL" SLOT="0" -if [[ ${PV} = 9999 ]]; then - 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="X +introspection" RDEPEND=" - >=media-libs/harfbuzz-0.9.9:= + >=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)] >=dev-libs/glib-2.33.12:2 - >=media-libs/fontconfig-2.5.0:1.0= + >=media-libs/fontconfig-2.10.91:1.0= media-libs/freetype:2= - >=x11-libs/cairo-1.7.6:=[X?] + >=x11-libs/cairo-1.12.10:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 - >=x11-libs/libXft-2.0.0 )" + >=x11-libs/libXft-2.0.0 ) +" DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.13 + >=dev-util/gtk-doc-am-1.15 virtual/pkgconfig X? ( x11-proto/xproto ) - !<=sys-devel/autoconf-2.63:2.5" + !<=sys-devel/autoconf-2.63:2.5 +" src_prepare() { - tc-export CXX - DOCS="AUTHORS ChangeLog* NEWS README THANKS" - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_with X xft) - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "") - epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" eautoreconf gnome2_src_prepare } +src_configure() { + tc-export CXX + + gnome2_src_configure \ + --with-cairo \ + $(use_enable introspection) \ + $(use_with X xft) \ + "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ + "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" +} + src_install() { gnome2_src_install - local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" + local PANGO_CONFDIR="/etc/pango/${CHOST}" dodir "${PANGO_CONFDIR}" keepdir "${PANGO_CONFDIR}" } diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild index e47ce31..3058c25 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -19,47 +19,52 @@ SLOT="0" if [[ ${PV} = 9999 ]]; then 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi IUSE="X +introspection" RDEPEND=" - >=media-libs/harfbuzz-0.9.9:= + >=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)] >=dev-libs/glib-2.33.12:2 - >=media-libs/fontconfig-2.5.0:1.0= + >=media-libs/fontconfig-2.10.91:1.0= media-libs/freetype:2= - >=x11-libs/cairo-1.7.6:=[X?] + >=x11-libs/cairo-1.12.10:=[X?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( x11-libs/libXrender x11-libs/libX11 - >=x11-libs/libXft-2.0.0 )" + >=x11-libs/libXft-2.0.0 ) +" DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.13 + >=dev-util/gtk-doc-am-1.15 virtual/pkgconfig X? ( x11-proto/xproto ) - !<=sys-devel/autoconf-2.63:2.5" + !<=sys-devel/autoconf-2.63:2.5 +" src_prepare() { - tc-export CXX - DOCS="AUTHORS ChangeLog* NEWS README THANKS" - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_with X xft) - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "") - epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" eautoreconf gnome2_src_prepare } +src_configure() { + tc-export CXX + + gnome2_src_configure \ + --with-cairo \ + $(use_enable introspection) \ + $(use_with X xft) \ + "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ + "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" +} + src_install() { gnome2_src_install - local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" + local PANGO_CONFDIR="/etc/pango/${CHOST}" dodir "${PANGO_CONFDIR}" keepdir "${PANGO_CONFDIR}" }