From a3aa354f7f7dc04c32a3cd098d5d90b76fe8f542 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 14 Mar 2010 15:50:00 +0000 Subject: Missing libglade symlink (required for building snes9x). (Portage version: 2.2_rc67/cvs/Linux x86_64) --- app-emulation/emul-linux-x86-gtklibs/ChangeLog | 8 ++- .../emul-linux-x86-gtklibs-20100220-r1.ebuild | 65 --------------------- .../emul-linux-x86-gtklibs-20100220-r2.ebuild | 66 ++++++++++++++++++++++ .../emul-linux-x86-gtklibs-20100220.ebuild | 55 ------------------ 4 files changed, 73 insertions(+), 121 deletions(-) delete mode 100644 app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild create mode 100644 app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild delete mode 100644 app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220.ebuild (limited to 'app-emulation') diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog index 42b17e9bc29a..ade480769dc0 100644 --- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog +++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-gtklibs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.73 2010/03/13 19:19:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.74 2010/03/14 15:50:00 ssuominen Exp $ + +*emul-linux-x86-gtklibs-20100220-r2 (14 Mar 2010) + + 14 Mar 2010; Samuli Suominen + +emul-linux-x86-gtklibs-20100220-r2.ebuild: + Missing libglade symlink (required for building snes9x). *emul-linux-x86-gtklibs-20100220-r1 (13 Mar 2010) diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild deleted file mode 100644 index 6d38783edeca..000000000000 --- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 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-20100220-r1.ebuild,v 1.1 2010/03/13 19:19:48 pacho Exp $ - -inherit emul-linux-x86 - -SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 - http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libglade-2.0.so.0.0.7" - -LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )" -KEYWORDS="-* ~amd64" - -IUSE="" - -DEPEND="" -RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} - ~app-emulation/emul-linux-x86-xlibs-${PV}" - -src_unpack() { - 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_unpack - - # 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 -} - -src_install() { - emul-linux-x86_src_install - insinto /usr/lib32/ - doins "${DISTDIR}"/libglade-2.0.so.0.0.7 || die - dosym /usr/lib32/libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so.0 || die -} - -pkg_preinst() { - #bug 169058 - for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do - [[ -L ${l} ]] && rm -f ${l} - done -} - -pkg_postinst() { - PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu" - if [[ ${ROOT} == "/" ]] ; then - einfo "Generating pango modules listing..." - mkdir -p ${PANGO_CONFDIR} - pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules - fi - - GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu" - einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..." - mkdir -p ${GTK2_CONFDIR} - gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - - # 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 -} diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild new file mode 100644 index 000000000000..c7d1efb92882 --- /dev/null +++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2010 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-20100220-r2.ebuild,v 1.1 2010/03/14 15:50:00 ssuominen Exp $ + +inherit emul-linux-x86 + +SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 + http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libglade-2.0.so.0.0.7" + +LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )" +KEYWORDS="-* ~amd64" + +IUSE="" + +DEPEND="" +RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} + ~app-emulation/emul-linux-x86-xlibs-${PV}" + +src_unpack() { + 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_unpack + + # 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 +} + +src_install() { + emul-linux-x86_src_install + insinto /usr/lib32/ + doins "${DISTDIR}"/libglade-2.0.so.0.0.7 || die + dosym /usr/lib32/libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so.0 || die + dosym /usr/lib32/libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so || die +} + +pkg_preinst() { + #bug 169058 + for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do + [[ -L ${l} ]] && rm -f ${l} + done +} + +pkg_postinst() { + PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu" + if [[ ${ROOT} == "/" ]] ; then + einfo "Generating pango modules listing..." + mkdir -p ${PANGO_CONFDIR} + pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules + fi + + GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu" + einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..." + mkdir -p ${GTK2_CONFDIR} + gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" + gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" + + # 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 +} diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220.ebuild deleted file mode 100644 index 40b94b754a0f..000000000000 --- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 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-20100220.ebuild,v 1.1 2010/02/20 23:06:13 pacho Exp $ - -inherit emul-linux-x86 - -LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )" -KEYWORDS="-* ~amd64" - -IUSE="" - -DEPEND="" -RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} - ~app-emulation/emul-linux-x86-xlibs-${PV}" - -src_unpack() { - 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_unpack - - # 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 -} - -pkg_preinst() { - #bug 169058 - for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do - [[ -L ${l} ]] && rm -f ${l} - done -} - -pkg_postinst() { - PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu" - if [[ ${ROOT} == "/" ]] ; then - einfo "Generating pango modules listing..." - mkdir -p ${PANGO_CONFDIR} - pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules - fi - - GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu" - einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..." - mkdir -p ${GTK2_CONFDIR} - gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - - # 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 -} -- cgit v1.2.3-65-gdbad