From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
Date: Thu, 12 Dec 2013 23:20:58 +0000 (UTC) [thread overview]
Message-ID: <1386890446.f7bcd62f151807f66cdb339e4c1cec0880f7595a.eva@gentoo> (raw)
commit: f7bcd62f151807f66cdb339e4c1cec0880f7595a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:32:02 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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}"
}
next reply other threads:[~2013-12-12 23:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 23:20 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-11 20:46 [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/ Ole Reifschneider
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-24 16:57 Gilles Dartiguelongue
2012-12-19 18:15 Alexandre Rostovtsev
2012-11-20 8:10 Gilles Dartiguelongue
2012-11-04 7:57 Alexandre Rostovtsev
2012-10-29 22:06 Gilles Dartiguelongue
2012-06-07 7:22 Alexandre Restovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386890446.f7bcd62f151807f66cdb339e4c1cec0880f7595a.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox