commit: 2d3982ba406567ceb4c5a9438df99e8047932225
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 11:27:20 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 11:27:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3982ba
x11-libs/pango: Drop old
Package-Manager: portage-2.2.22
x11-libs/pango/Manifest | 3 -
x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 -----------
x11-libs/pango/metadata.xml | 8 +-
x11-libs/pango/pango-1.36.3.ebuild | 89 ----------------------
x11-libs/pango/pango-1.36.5.ebuild | 102 --------------------------
x11-libs/pango/pango-1.36.7.ebuild | 80 --------------------
6 files changed, 4 insertions(+), 322 deletions(-)
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9a0c7c4..95de130 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,4 +1 @@
-DIST pango-1.36.3.tar.xz 1021656 SHA256
ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512
74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2
WHIRLPOOL
c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560
-DIST pango-1.36.5.tar.xz 1023952 SHA256
be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8 SHA512
d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c
WHIRLPOOL
ac6ecb13dbba51527a629e1b216ed6affa9881ffffd5ed90d3f1d96772a17c7815ae0a3c2340444c473092a1c2ec8966110bb1f2c6df2b0af7358a1c9e8255de
-DIST pango-1.36.7.tar.xz 1033896 SHA256
1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a SHA512
a048888ffdcf7dd574da01598a86d936540d057d2226d122c73c024d401c281260fd93262e7a683d88b58b9a90e44e7e7597945a84a4d4f81094e1498a4247e3
WHIRLPOOL
d88a3fe0f9f6b9c403de1f6662db41c2e3f83e401d4413f9ab22a9e0525edd16eee7248c4b5555fc7c178dd167f06bbd66df5b3c1ee8a0b9febf244abf8256a8
DIST pango-1.36.8.tar.xz 1033528 SHA256
18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512
799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215
WHIRLPOOL
cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch
b/x11-libs/pango/files/pango-1.32.1-lib64.patch
deleted file mode 100644
index 0820c78..0000000
--- a/x11-libs/pango/files/pango-1.32.1-lib64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <e...@gentoo.org>
-Date: Sun, 28 Oct 2012 23:19:39 +0100
-Subject: [PATCH] Add multilib support
-
-pango.modules list modules specific to a host architecture.
-Add host triplet in path so that machine able to run multiple
-triplet have a proper file per pango library.
----
- pango/Makefile.am | 1 +
- pango/pango-utils.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pango/Makefile.am b/pango/Makefile.am
-index ab092c9..558108b 100644
---- a/pango/Makefile.am
-+++ b/pango/Makefile.am
-@@ -17,6 +17,7 @@ INCLUDES = \
- -DPANGO_ENABLE_BACKEND \
- -DPANGO_ENABLE_ENGINE \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
-+ -DHOST=\"$(host_triplet)\" \
- -DLIBDIR=\"$(libdir)\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-diff --git a/pango/pango-utils.c b/pango/pango-utils.c
-index 18ffa26..3b88f15 100644
---- a/pango/pango-utils.c
-+++ b/pango/pango-utils.c
-@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void)
- #else
- const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR");
- if (sysconfdir != NULL)
-- tmp_result = g_build_filename (sysconfdir, "pango", NULL);
-+ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL);
- else
-- tmp_result = SYSCONFDIR "/pango";
-+ tmp_result = SYSCONFDIR "/pango/" HOST;
- #endif
- g_once_init_leave((gsize*)&result, (gsize)tmp_result);
- }
---
-1.7.12.4
-
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index e6cd553..1ebecbb 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.36.3.ebuild
b/x11-libs/pango/pango-1.36.3.ebuild
deleted file mode 100644
index 87a9efa..0000000
--- a/x11-libs/pango/pango-1.36.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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.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
-}
diff --git a/x11-libs/pango/pango-1.36.5.ebuild
b/x11-libs/pango/pango-1.36.5.ebuild
deleted file mode 100644
index 23fbe59..0000000
--- a/x11-libs/pango/pango-1.36.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils 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 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_CHOST_TOOLS=(
- /usr/bin/pango-querymodules
-)
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
-
-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)" "")"
-}
-
-multilib_src_install() {
- gnome2_src_install
-
- local PANGO_CONFDIR="/etc/pango/${CHOST}"
- dodir "${PANGO_CONFDIR}"
- keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_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 "${CHOST}-pango-querymodules" --system \
-
"${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
- > "${tmp_file}"; then
- sed "s:^${ROOT}:/:" "${tmp_file}" > "${pango_conf}" || {
- rm "${tmp_file}"; die; }
- else
- ewarn "Cannot update pango.modules, file generation
failed"
- fi
- rm "${tmp_file}"
- }
- multilib_foreach_abi multilib_pkg_postinst
-
- 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
-}
diff --git a/x11-libs/pango/pango-1.36.7.ebuild
b/x11-libs/pango/pango-1.36.7.ebuild
deleted file mode 100644
index 8b5a85f..0000000
--- a/x11-libs/pango/pango-1.36.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 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 ~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_CHOST_TOOLS=(
- /usr/bin/pango-querymodules
-)
-
-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
-
- multilib_pkg_postinst() {
- einfo "Generating modules listing..."
- "${CHOST}-pango-querymodules" --update-cache
-
- # Remove old autogenerated file to prevent collisions with newer
- rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules"
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
