summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-12-23 23:13:07 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-12-23 23:13:07 +0000
commit076116fc2a4406600082f5b6f8396cf4518be705 (patch)
treeba042270616c597ac25ca18e51a334ce09a03100 /x11-libs
parentVersion bump. Major ebuild update, see bug #452162. (diff)
downloadgentoo-2-076116fc2a4406600082f5b6f8396cf4518be705.tar.gz
gentoo-2-076116fc2a4406600082f5b6f8396cf4518be705.tar.bz2
gentoo-2-076116fc2a4406600082f5b6f8396cf4518be705.zip
Version bump for Gnome 3.10. Clean up old revision.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/pango/ChangeLog8
-rw-r--r--x11-libs/pango/metadata.xml8
-rw-r--r--x11-libs/pango/pango-1.36.1.ebuild (renamed from x11-libs/pango/pango-1.34.0.ebuild)30
3 files changed, 29 insertions, 17 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index b5f5fdd6cf4c..972db22c6e76 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/pango
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.382 2013/12/22 15:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.383 2013/12/23 23:13:07 eva Exp $
+
+*pango-1.36.1 (23 Dec 2013)
+
+ 23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> -pango-1.34.0.ebuild,
+ +pango-1.36.1.ebuild, metadata.xml:
+ Version bump for Gnome 3.10. Clean up old revision.
22 Dec 2013; Jeroen Roovers <jer@gentoo.org> pango-1.34.1.ebuild:
Stable for HPPA (bug #478252).
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index 1ebecbbd0df7..e6cd55339ff7 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
-<upstream>
- <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
-</upstream>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.34.0.ebuild b/x11-libs/pango/pango-1.36.1.ebuild
index f3c5112f347b..05c95b0aad75 100644
--- a/x11-libs/pango/pango-1.34.0.ebuild
+++ b/x11-libs/pango/pango-1.36.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.34.0.ebuild,v 1.3 2013/06/06 14:24:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.1.ebuild,v 1.1 2013/12/23 23:13:07 eva Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -22,32 +22,38 @@ RDEPEND="
>=dev-libs/glib-2.33.12:2
>=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
- 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