pacho       14/05/06 20:52:20

  Modified:             ChangeLog
  Added:                emul-linux-x86-gtklibs-20140506.ebuild
  Removed:              emul-linux-x86-gtklibs-20131008-r3.ebuild
                        emul-linux-x86-gtklibs-20131008-r4.ebuild
                        emul-linux-x86-gtklibs-20131008-r1.ebuild
                        emul-linux-x86-gtklibs-20131008-r2.ebuild
  Log:
  Version bump, drop old
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.124                app-emulation/emul-linux-x86-gtklibs/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?rev=1.124&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?rev=1.124&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?r1=1.123&r2=1.124

Index: ChangeLog
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog   4 May 2014 12:22:48 -0000       1.123
+++ ChangeLog   6 May 2014 20:52:20 -0000       1.124
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.123 
2014/05/04 12:22:48 pacho Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.124 
2014/05/06 20:52:20 pacho Exp $
+
+*emul-linux-x86-gtklibs-20140506 (06 May 2014)
+
+  06 May 2014; Pacho Ramos <pa...@gentoo.org>
+  +emul-linux-x86-gtklibs-20140506.ebuild, +files/remove-native-20140506,
+  -emul-linux-x86-gtklibs-20131008-r1.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r2.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r3.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r4.ebuild, -files/remove-native-20131008-r2,
+  -files/remove-native-20131008-r3, -files/remove-native-20131008-r4:
+  Version bump, drop old
 
   04 May 2014; Pacho Ramos <pa...@gentoo.org>
   emul-linux-x86-gtklibs-20140406.ebuild:



1.1                  
app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild?rev=1.1&content-type=text/plain

Index: emul-linux-x86-gtklibs-20140506.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild,v
 1.1 2014/05/06 20:52:20 pacho Exp $

EAPI=5
inherit emul-linux-x86

LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
KEYWORDS="-* ~amd64"
IUSE="abi_x86_32"

DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
        ~app-emulation/emul-linux-x86-xlibs-${PV}
        ~app-emulation/emul-linux-x86-opengl-${PV}
        !abi_x86_32? (
                !>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
                !>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
        )
        abi_x86_32? (
                >=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
                >=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
                >=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
                >=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
                >=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
                >=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
                >=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
                >=media-libs/imlib-1.9.15-r4[abi_x86_32(-)]
        )"
# RDEPEND on opengl stuff needed due cairo, bug #410213

my_gdk_pixbuf_query_loaders() {
        # causes segfault if set
        unset __GL_NO_DSO_FINALIZER

        local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
        if [ -z "${tmp_file}" ]; then
                ewarn "Cannot create temporary file"
                return 1
        fi

        if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
                cat "${tmp_file}" > 
"${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
        else
                ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
        fi
        rm "${tmp_file}"
}

my_pango_querymodules() {
        PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
        einfo "Generating pango modules listing..."

        mkdir -p "${PANGO_CONFDIR}"
        local pango_conf="${PANGO_CONFDIR}/pango.modules"
        local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
        if [ -z "${tmp_file}" ]; then
                ewarn "Cannot create temporary file"
                return 1
        fi

        if pango-querymodules32 > "${tmp_file}"; then
                cat "${tmp_file}" > "${pango_conf}"
        else
                ewarn "Cannot update pango.modules, file generation failed"
        fi
        rm "${tmp_file}"
}

my_gtk_query_immodules() {
        GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
        einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."

        mkdir -p "${GTK2_CONFDIR}"
        local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
        local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
        if [ -z "${tmp_file}" ]; then
                ewarn "Cannot create temporary file"
                return 1
        fi

        if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
                cat "${tmp_file}" > "${gtk_conf}"
        else
                ewarn "Cannot update gtk.immodules, file generation failed"
        fi
        rm "${tmp_file}"
}

src_prepare() {
        
query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
        
ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
        emul-linux-x86_src_prepare

        # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
        mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
        mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
        mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die

        # Remove migrated stuff.
        use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
}

pkg_preinst() {
        #bug 169058
        for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
                [[ -L ${l} ]] && rm -f ${l}
        done
}

pkg_postinst() {
        my_gtk_query_immodules
        if ! use abi_x86_32; then
                my_pango_querymodules
                my_gdk_pixbuf_query_loaders
        fi

        # gdk-pixbuf.loaders should be in their CHOST directories respectively.
        if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
                ewarn
                ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be 
present on"
                ewarn "multilib systems, please remove it by hand."
                ewarn
        fi
}




Reply via email to