diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2007-03-01 17:32:38 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2007-03-01 17:32:38 +0000 |
| commit | 5b597d522de13b9b8f24bd3613f591b55717a402 (patch) | |
| tree | 82fa9665ceac34c20cf06d23d1d2e0ff28bf6a9f /app-emulation | |
| parent | Prevent collisions with media-sound/mp3blaster, bug #148293 (diff) | |
| download | gentoo-2-5b597d522de13b9b8f24bd3613f591b55717a402.tar.gz gentoo-2-5b597d522de13b9b8f24bd3613f591b55717a402.tar.bz2 gentoo-2-5b597d522de13b9b8f24bd3613f591b55717a402.zip | |
it's qt3 not qt
(Portage version: 2.1.2-r9)
Diffstat (limited to 'app-emulation')
3 files changed, 8 insertions, 58 deletions
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog index f8e49e33e5ac..0756e0ea9c1d 100644 --- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog +++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-gtklibs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.40 2007/02/28 16:45:29 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.41 2007/03/01 17:32:38 blubb Exp $ + + 01 Mar 2007; Simon Stelling <blubb@gentoo.org> + emul-linux-x86-gtklibs-10.0-r1.ebuild: + it's qt3, not qt *emul-linux-x86-gtklibs-10.0-r1 (28 Feb 2007) diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild index e524c8e0a094..87ed53432ff9 100644 --- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild +++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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-10.0-r1.ebuild,v 1.1 2007/02/28 16:45:29 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild,v 1.2 2007/03/01 17:32:38 blubb Exp $ inherit emul-libs @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/atk-1.12.3.tbz2 mirror://gentoo/gtk+-1.2.10-r12.tbz2 mirror://gentoo/gtk+-2.10.6.tbz2 mirror://gentoo/gtk-engines-2.8.2.tbz2 - qt? ( mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 ) + qt3? ( mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 ) mirror://gentoo/gtk-engines-xfce-2.2.8-r1.tbz2 mirror://gentoo/imlib-1.9.14-r3.tbz2 mirror://gentoo/pango-1.14.9.tbz2" @@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/atk-1.12.3.tbz2 LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )" KEYWORDS="-* ~amd64" -IUSE="qt" +IUSE="qt3" DEPEND="" RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2 diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0.ebuild deleted file mode 100644 index f5fed60c08dc..000000000000 --- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2007 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-10.0.ebuild,v 1.3 2007/02/27 12:18:26 blubb Exp $ - -inherit emul-libs - -SRC_URI="mirror://gentoo/atk-1.12.3.tbz2 - mirror://gentoo/cairo-1.2.4.tbz2 - mirror://gentoo/gtk+-1.2.10-r12.tbz2 - mirror://gentoo/gtk+-2.10.6.tbz2 - mirror://gentoo/gtk-engines-2.8.2.tbz2 - mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 - mirror://gentoo/gtk-engines-xfce-2.2.8-r1.tbz2 - mirror://gentoo/imlib-1.9.14-r3.tbz2 - mirror://gentoo/pango-1.14.9.tbz2" - -LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )" -KEYWORDS="-* ~amd64" - -DEPEND="" -RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2 - >=app-emulation/emul-linux-x86-qtlibs-10.0 - >=app-emulation/emul-linux-x86-xlibs-10.0" - -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-libs_src_unpack - - # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST} - mv -f "${S}/usr/bin/pango-querymodules"{,32} - mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} - mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} - - rm -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so -} - -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 - else - ewarn "You'll have to run the following command after chrooting into ${ROOT}:" - ewarn "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 -} |