* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2012-06-07 7:22 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2012-06-07 7:22 UTC (permalink / raw
To: gentoo-commits
commit: ada11ebcd8cbff63de58047cbacd7ca372910ff9
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 07:22:08 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jun 7 07:22:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ada11ebc
x11-libs/pango: sync with gx86
---
x11-libs/pango/pango-9999.ebuild | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 044c187..d2744f3 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,13 +19,15 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~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
IUSE="X doc +introspection test"
-# Use glib-2.29.5 for g_atomic_int_add
-RDEPEND=">=dev-libs/glib-2.29.5:2
+# Upstream bug #643802
+REQUIRED_USE="doc? ( X )"
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
>=media-libs/fontconfig-2.5.0:1.0
media-libs/freetype:2
>=x11-libs/cairo-1.7.6[X?]
@@ -63,8 +65,6 @@ pkg_setup() {
}
src_prepare() {
- gnome2_src_prepare
-
# make config file location host specific so that a 32bit and 64bit pango
# wont fight with each other on a multilib system. Fix building for
# emul-linux-x86-gtklibs
@@ -73,7 +73,7 @@ src_prepare() {
eautoreconf
fi
- elibtoolize # for Darwin bundles
+ gnome2_src_prepare
}
pkg_postinst() {
@@ -83,7 +83,21 @@ pkg_postinst() {
multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
mkdir -p "${PANGO_CONFDIR}"
- pango-querymodules \
+ local pango_conf="${PANGO_CONFDIR}/pango.modules"
+ local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
+
+ # be atomic!
+ if pango-querymodules --system \
"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
- > "${PANGO_CONFDIR}"/pango.modules
+ > "${tmp_file}"; then
+ cat "${tmp_file}" > "${pango_conf}" || {
+ rm "${tmp_file}"; die; }
+ else
+ ewarn "Cannot update pango.modules, file generation failed"
+ fi
+ rm "${tmp_file}"
+
+ elog "In >=${PN}-1.30.1, default configuration file locations moved from"
+ elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
+ elog "~/.config/pango/pangox.aliases"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2012-10-29 22:06 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-29 22:06 UTC (permalink / raw
To: gentoo-commits
commit: cf4ce9e4ec82b16679c3949a9fe6dab64657bc57
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 22:05:25 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 22:05:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf4ce9e4
x11-libs/pango: fix a few ebuild issues
Pango not having a modules file was pretty embarrassing.
---
x11-libs/pango/pango-1.32.1.ebuild | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
index bb4bb93..4b800bb 100644
--- a/x11-libs/pango/pango-1.32.1.ebuild
+++ b/x11-libs/pango/pango-1.32.1.ebuild
@@ -56,19 +56,25 @@ src_prepare() {
gnome2_src_prepare
}
+src_install() {
+ gnome2_src_install
+
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+ dodir "${PANGO_CONFDIR}"
+ keepdir "${PANGO_CONFDIR}"
+}
+
pkg_postinst() {
- einfo "Generating modules listing..."
+ gnome2_pkg_postinst
+ einfo "Generating modules listing..."
local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
local pango_conf="${PANGO_CONFDIR}/pango.modules"
local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-
# be atomic!
if pango-querymodules --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \
+ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
> "${tmp_file}"; then
cat "${tmp_file}" > "${pango_conf}" || {
rm "${tmp_file}"; die; }
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2012-11-04 7:57 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-04 7:57 UTC (permalink / raw
To: gentoo-commits
commit: a1a5838acbd932bb36dbd14c3a90c5b5850800b4
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 4 07:54:47 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Nov 4 07:55:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a1a5838a
x11-libs/pango: add deprecated USE flag to pull in pangox-compat
Otherwise, pangox-compat is not very discoverable.
---
x11-libs/pango/pango-1.32.1.ebuild | 3 ++-
x11-libs/pango/pango-9999.ebuild | 19 +++++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
index 4b800bb..4bfcd7c 100644
--- a/x11-libs/pango/pango-1.32.1.ebuild
+++ b/x11-libs/pango/pango-1.32.1.ebuild
@@ -22,7 +22,7 @@ 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
-IUSE="X +introspection"
+IUSE="X deprecated +introspection"
RDEPEND="
>=media-libs/harfbuzz-0.9.3
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
X? ( x11-proto/xproto )
!<=sys-devel/autoconf-2.63:2.5"
+PDEPEND="deprecated? ( x11-libs/pangox-compat )"
src_prepare() {
tc-export CXX
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index bb4bb93..4bfcd7c 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -22,7 +22,7 @@ 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
-IUSE="X +introspection"
+IUSE="X deprecated +introspection"
RDEPEND="
>=media-libs/harfbuzz-0.9.3
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
X? ( x11-proto/xproto )
!<=sys-devel/autoconf-2.63:2.5"
+PDEPEND="deprecated? ( x11-libs/pangox-compat )"
src_prepare() {
tc-export CXX
@@ -56,19 +57,25 @@ src_prepare() {
gnome2_src_prepare
}
+src_install() {
+ gnome2_src_install
+
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+ dodir "${PANGO_CONFDIR}"
+ keepdir "${PANGO_CONFDIR}"
+}
+
pkg_postinst() {
- einfo "Generating modules listing..."
+ gnome2_pkg_postinst
+ einfo "Generating modules listing..."
local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
local pango_conf="${PANGO_CONFDIR}/pango.modules"
local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-
# be atomic!
if pango-querymodules --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \
+ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
> "${tmp_file}"; then
cat "${tmp_file}" > "${pango_conf}" || {
rm "${tmp_file}"; die; }
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2012-11-20 8:10 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-20 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 4728412e619ce18ffe7d28730ea4efa2b9aa9aea
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 07:40:17 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 07:40:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4728412e
x11-libs/pango: 1.32.1 → 1.32.2
---
x11-libs/pango/metadata.xml | 9 +++++++++
.../{pango-1.32.1.ebuild => pango-1.32.2.ebuild} | 0
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
new file mode 100644
index 0000000..f3e5efc
--- /dev/null
+++ b/x11-libs/pango/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+ introspection</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.2.ebuild
similarity index 100%
rename from x11-libs/pango/pango-1.32.1.ebuild
rename to x11-libs/pango/pango-1.32.2.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2012-12-19 18:15 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-19 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 6b201150b890b1dc353da38338ebfa36c5b0dc50
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 18:12:00 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 18:12:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b201150
x11-libs/pango: moved to gx86
Sync live ebuild with gx86. Remove "deprecated" flag (since
pangox-compat is in gx86, we can directly add it as a dependency to the
ebuilds that need it). Move introspection to RDEPEND like in all other
ebuilds, and switch to global introspection flag.
---
x11-libs/pango/metadata.xml | 4 --
x11-libs/pango/pango-1.32.2.ebuild | 90 ------------------------------------
x11-libs/pango/pango-9999.ebuild | 27 ++++++-----
3 files changed, 14 insertions(+), 107 deletions(-)
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index f3e5efc..6e0e2ec 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -2,8 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome</herd>
- <use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
- introspection</flag>
- </use>
</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.32.2.ebuild b/x11-libs/pango/pango-1.32.2.ebuild
deleted file mode 100644
index 4bfcd7c..0000000
--- a/x11-libs/pango/pango-1.32.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-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
-
-IUSE="X deprecated +introspection"
-
-RDEPEND="
- >=media-libs/harfbuzz-0.9.3
- >=dev-libs/glib-2.33.12:2
- >=media-libs/fontconfig-2.5.0:1.0
- media-libs/freetype:2
- >=x11-libs/cairo-1.7.6[X?]
- X? (
- x11-libs/libXrender
- x11-libs/libX11
- >=x11-libs/libXft-2.0.0 )"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.13
- virtual/pkgconfig
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- X? ( x11-proto/xproto )
- !<=sys-devel/autoconf-2.63:2.5"
-PDEPEND="deprecated? ( x11-libs/pangox-compat )"
-
-src_prepare() {
- tc-export CXX
- DOCS="AUTHORS ChangeLog* NEWS README THANKS"
- G2CONF="${G2CONF}
- $(use_enable introspection)
- $(use_with X xft)
- $(use X && echo --x-includes=${EPREFIX}/usr/include)
- $(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
-
- epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- einfo "Generating modules listing..."
- local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
- local pango_conf="${PANGO_CONFDIR}/pango.modules"
- local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
-
- # be atomic!
- if pango-querymodules --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
- > "${tmp_file}"; then
- cat "${tmp_file}" > "${pango_conf}" || {
- rm "${tmp_file}"; die; }
- else
- ewarn "Cannot update pango.modules, file generation failed"
- fi
- rm "${tmp_file}"
-
- elog "In >=${PN}-1.30.1, default configuration file locations moved from"
- elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
- elog "~/.config/pango/pangox.aliases"
-}
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 4bfcd7c..e47ce31 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
@@ -22,14 +22,15 @@ 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
-IUSE="X deprecated +introspection"
+IUSE="X +introspection"
RDEPEND="
- >=media-libs/harfbuzz-0.9.3
+ >=media-libs/harfbuzz-0.9.9:=
>=dev-libs/glib-2.33.12:2
- >=media-libs/fontconfig-2.5.0:1.0
- media-libs/freetype:2
- >=x11-libs/cairo-1.7.6[X?]
+ >=media-libs/fontconfig-2.5.0:1.0=
+ media-libs/freetype:2=
+ >=x11-libs/cairo-1.7.6:=[X?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
X? (
x11-libs/libXrender
x11-libs/libX11
@@ -37,10 +38,8 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.13
virtual/pkgconfig
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
X? ( x11-proto/xproto )
!<=sys-devel/autoconf-2.63:2.5"
-PDEPEND="deprecated? ( x11-libs/pangox-compat )"
src_prepare() {
tc-export CXX
@@ -48,8 +47,8 @@ src_prepare() {
G2CONF="${G2CONF}
$(use_enable introspection)
$(use_with X xft)
- $(use X && echo --x-includes=${EPREFIX}/usr/include)
- $(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")"
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")
epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
eautoreconf
@@ -84,7 +83,9 @@ pkg_postinst() {
fi
rm "${tmp_file}"
- elog "In >=${PN}-1.30.1, default configuration file locations moved from"
- elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
- elog "~/.config/pango/pangox.aliases"
+ if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
+ elog "In >=${PN}-1.30.1, default configuration file locations moved from"
+ elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
+ elog "~/.config/pango/pangox.aliases"
+ fi
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2013-12-12 23:20 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 23:20 UTC (permalink / raw
To: gentoo-commits
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}"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2013-12-24 16:57 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-24 16:57 UTC (permalink / raw
To: gentoo-commits
commit: e614efb3fa77b2c1b13e25760ace987d23ccb7c3
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 23:15:53 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 23:15:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e614efb3
x11-libs/pango: moved to gentoo-x86
---
x11-libs/pango/pango-1.36.1.ebuild | 89 --------------------------------------
1 file changed, 89 deletions(-)
diff --git a/x11-libs/pango/pango-1.36.1.ebuild b/x11-libs/pango/pango-1.36.1.ebuild
deleted file mode 100644
index dbe41c6..0000000
--- a/x11-libs/pango/pango-1.36.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-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:=[glib(+),truetype(+)]
- >=dev-libs/glib-2.33.12:2
- >=media-libs/fontconfig-2.10.91:1.0=
- media-libs/freetype:2=
- >=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 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.15
- virtual/pkgconfig
- X? ( x11-proto/xproto )
- !<=sys-devel/autoconf-2.63:2.5
-"
-
-src_prepare() {
- 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="/etc/pango/${CHOST}"
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- einfo "Generating modules listing..."
- local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
- local pango_conf="${PANGO_CONFDIR}/pango.modules"
- local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
-
- # be atomic!
- if pango-querymodules --system \
- "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
- > "${tmp_file}"; then
- cat "${tmp_file}" > "${pango_conf}" || {
- rm "${tmp_file}"; die; }
- else
- ewarn "Cannot update pango.modules, file generation failed"
- fi
- rm "${tmp_file}"
-
- if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
- elog "In >=${PN}-1.30.1, default configuration file locations moved from"
- elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
- elog "~/.config/pango/pangox.aliases"
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2014-02-12 23:48 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2014-02-12 23:48 UTC (permalink / raw
To: gentoo-commits
commit: fc3d54f98b2e4df61e049cad4123a86d5776c355
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:37:07 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:37:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fc3d54f9
x11-libs/pango: sync with gentoo-x86
---
x11-libs/pango/pango-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 3058c25..63be07c 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,7 +19,7 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- 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"
+ 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="X +introspection"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
@ 2015-10-11 20:46 Ole Reifschneider
0 siblings, 0 replies; 9+ messages in thread
From: Ole Reifschneider @ 2015-10-11 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 10f3d972dd7588611e4b5589c56fa22e58b323d6
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 12:48:03 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:46:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=10f3d972
x11-libs/pango: Bump version to 1.37.5
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
x11-libs/pango/pango-1.37.5.ebuild | 66 ++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/x11-libs/pango/pango-1.37.5.ebuild b/x11-libs/pango/pango-1.37.5.ebuild
new file mode 100644
index 0000000..5421c79
--- /dev/null
+++ b/x11-libs/pango/pango-1.37.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ virtual/pkgconfig
+ X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+ tc-export CXX
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --with-cairo \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-10-11 20:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-07 7:22 [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-10-29 22:06 Gilles Dartiguelongue
2012-11-04 7:57 Alexandre Rostovtsev
2012-11-20 8:10 Gilles Dartiguelongue
2012-12-19 18:15 Alexandre Rostovtsev
2013-12-12 23:20 Gilles Dartiguelongue
2013-12-24 16:57 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2015-10-11 20:46 Ole Reifschneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox