From 1d5f30f7e910947afcba82ecc142e48da601dee2 Mon Sep 17 00:00:00 2001 From: "John N. Laliberte" Date: Wed, 7 Jun 2006 14:09:47 +0000 Subject: [PATCH] move mkdir to pkg_postinst. fixes #135912 Package-Manager: portage-2.1_rc4-r2 --- x11-libs/pango/ChangeLog | 8 +++++++- x11-libs/pango/files/digest-pango-1.10.3 | 2 ++ x11-libs/pango/pango-1.10.2.ebuild | 8 ++------ x11-libs/pango/pango-1.10.3.ebuild | 8 ++------ x11-libs/pango/pango-1.10.4.ebuild | 8 ++------ x11-libs/pango/pango-1.12.2.ebuild | 6 ++---- x11-libs/pango/pango-1.4.1-r1.ebuild | 7 ++----- x11-libs/pango/pango-1.8.1-r1.ebuild | 8 ++------ 8 files changed, 21 insertions(+), 34 deletions(-) diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 90646c8380ae..b2c282145c18 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/pango # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.135 2006/04/30 21:10:03 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.136 2006/06/07 14:09:47 allanonjl Exp $ + + 07 Jun 2006; John N. Laliberte + pango-1.4.1-r1.ebuild, pango-1.8.1-r1.ebuild, pango-1.10.2.ebuild, + pango-1.10.3.ebuild, pango-1.10.4.ebuild, -pango-1.12.1.ebuild, + pango-1.12.2.ebuild: + move mkdir to pkg_postinst. fixes #135912 *pango-1.12.2 (30 Apr 2006) diff --git a/x11-libs/pango/files/digest-pango-1.10.3 b/x11-libs/pango/files/digest-pango-1.10.3 index 609a30efa09a..78839a985088 100644 --- a/x11-libs/pango/files/digest-pango-1.10.3 +++ b/x11-libs/pango/files/digest-pango-1.10.3 @@ -1 +1,3 @@ MD5 6fc5097f9c10d90ed386e074cb22cf6f pango-1.10.3.tar.bz2 1184884 +RMD160 e1f6697fd0b986519496c8db078bc5ee9f48b644 pango-1.10.3.tar.bz2 1184884 +SHA256 2e6ad481cf175e0bc3031e375786f792f923877b619dcdc09de6baec2b5d0c19 pango-1.10.3.tar.bz2 1184884 diff --git a/x11-libs/pango/pango-1.10.2.ebuild b/x11-libs/pango/pango-1.10.2.ebuild index d652c48977f6..4f4db3cdf791 100644 --- a/x11-libs/pango/pango-1.10.2.ebuild +++ b/x11-libs/pango/pango-1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.2.ebuild,v 1.10 2006/02/03 20:12:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.2.ebuild,v 1.11 2006/06/07 14:09:47 allanonjl Exp $ inherit eutils gnome2 @@ -32,8 +32,6 @@ DEPEND="${RDEPEND} ~app-text/docbook-xml-dtd-4.1.2 )" DOCS="AUTHORS ChangeLog* NEWS README TODO*" -USE_DESTDIR="1" - pkg_setup() { if ! built_with_use -a x11-libs/cairo png X; then @@ -65,9 +63,6 @@ src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} - } pkg_postinst() { @@ -77,6 +72,7 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > ${PANGO_CONFDIR}/pango.modules fi diff --git a/x11-libs/pango/pango-1.10.3.ebuild b/x11-libs/pango/pango-1.10.3.ebuild index a1832215a87a..9ed05dbcfc07 100644 --- a/x11-libs/pango/pango-1.10.3.ebuild +++ b/x11-libs/pango/pango-1.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.3.ebuild,v 1.10 2006/04/21 20:22:37 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.3.ebuild,v 1.11 2006/06/07 14:09:47 allanonjl Exp $ inherit eutils gnome2 @@ -32,8 +32,6 @@ DEPEND="${RDEPEND} ~app-text/docbook-xml-dtd-4.1.2 )" DOCS="AUTHORS ChangeLog* NEWS README TODO*" -USE_DESTDIR="1" - pkg_setup() { if ! built_with_use -a x11-libs/cairo png X; then @@ -65,9 +63,6 @@ src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} - } pkg_postinst() { @@ -77,6 +72,7 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > ${PANGO_CONFDIR}/pango.modules fi diff --git a/x11-libs/pango/pango-1.10.4.ebuild b/x11-libs/pango/pango-1.10.4.ebuild index eabc98f20fe4..c44473e99fbf 100644 --- a/x11-libs/pango/pango-1.10.4.ebuild +++ b/x11-libs/pango/pango-1.10.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.1 2006/03/05 05:20:52 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.2 2006/06/07 14:09:47 allanonjl Exp $ inherit eutils gnome2 @@ -32,8 +32,6 @@ DEPEND="${RDEPEND} ~app-text/docbook-xml-dtd-4.1.2 )" DOCS="AUTHORS ChangeLog* NEWS README TODO*" -USE_DESTDIR="1" - pkg_setup() { if ! built_with_use -a x11-libs/cairo png X; then @@ -66,9 +64,6 @@ src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} - } pkg_postinst() { @@ -78,6 +73,7 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > ${PANGO_CONFDIR}/pango.modules fi diff --git a/x11-libs/pango/pango-1.12.2.ebuild b/x11-libs/pango/pango-1.12.2.ebuild index 947a558fa908..30af201626af 100644 --- a/x11-libs/pango/pango-1.12.2.ebuild +++ b/x11-libs/pango/pango-1.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.2.ebuild,v 1.1 2006/04/30 21:10:03 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.2.ebuild,v 1.2 2006/06/07 14:09:47 allanonjl Exp $ inherit eutils gnome2 @@ -57,9 +57,6 @@ src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} - } pkg_postinst() { @@ -69,6 +66,7 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > ${PANGO_CONFDIR}/pango.modules fi diff --git a/x11-libs/pango/pango-1.4.1-r1.ebuild b/x11-libs/pango/pango-1.4.1-r1.ebuild index e716bfcb847e..c128511aed5b 100644 --- a/x11-libs/pango/pango-1.4.1-r1.ebuild +++ b/x11-libs/pango/pango-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.4.1-r1.ebuild,v 1.6 2006/02/06 22:27:30 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.4.1-r1.ebuild,v 1.7 2006/06/07 14:09:47 allanonjl Exp $ inherit gnome2 eutils @@ -50,8 +50,6 @@ DOCS="AUTHORS ChangeLog README INSTALL NEWS TODO*" src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} } pkg_postinst() { @@ -60,8 +58,7 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > /${PANGO_CONFDIR}/pango.modules fi } - -USE_DESTDIR="1" diff --git a/x11-libs/pango/pango-1.8.1-r1.ebuild b/x11-libs/pango/pango-1.8.1-r1.ebuild index f9f4ccca1c25..de070da6d83d 100644 --- a/x11-libs/pango/pango-1.8.1-r1.ebuild +++ b/x11-libs/pango/pango-1.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.12 2006/02/06 22:27:30 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.13 2006/06/07 14:09:47 allanonjl Exp $ inherit gnome2 eutils @@ -62,9 +62,6 @@ src_install() { gnome2_src_install rm ${D}/etc/pango/pango.modules - use amd64 && mkdir ${D}/etc/pango/${CHOST} - use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST} - } pkg_postinst() { @@ -74,9 +71,8 @@ pkg_postinst() { use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}" use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}" PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango/} + mkdir -p ${PANGO_CONFDIR} pango-querymodules > /${PANGO_CONFDIR}/pango.modules fi } - -USE_DESTDIR="1" -- 2.26.2