From: Pacho Ramos Date: Fri, 9 Sep 2011 20:16:59 +0000 (+0000) Subject: Version bump, remove old. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3707c3af37894f22eb75177e5b118ec5b8c49d88;p=gentoo.git Version bump, remove old. Package-Manager: portage-2.1.10.14/cvs/Linux x86_64 --- diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index eb5ef8d6b3bd..9e427a12f2ec 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.530 2011/09/04 09:10:11 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.531 2011/09/09 20:16:59 pacho Exp $ + +*gtk+-2.24.6 (09 Sep 2011) + + 09 Sep 2011; Pacho Ramos +gtk+-2.24.6.ebuild, + -gtk+-3.0.11.ebuild: + Version bump, remove old. 04 Sep 2011; Fabian Groffen gtk+-3.0.12.ebuild: Fix compilation on Solaris diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 9bf91cd8555b..1ee072a5d07c 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -19,20 +19,20 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aa DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 DIST gtk+-2.24.4.tar.bz2 17607752 RMD160 56a6f731cfdc47686c71f8f6b4253484e08dd230 SHA1 c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf SHA256 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5 DIST gtk+-2.24.5.tar.xz 13252580 RMD160 f0eb690c906166c5f0e296faac8fdb983955921b SHA1 eb1200fe42bd2d5e3dc1bdb69b524600cbc06df1 SHA256 d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3 -DIST gtk+-3.0.11.tar.xz 12673196 RMD160 e7ed69ac6f0876917263dabbae2c8f9fb83325c9 SHA1 5278d6f1dfe1ba8299028704962f5fe2dd41952c SHA256 e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b +DIST gtk+-2.24.6.tar.xz 13173032 RMD160 5d78546b5f2aeb79d8fd8839911ee9a442e674e9 SHA1 da835834fe882be1893d0df41216e8141737b51b SHA256 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b EBUILD gtk+-2.24.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a SHA1 d6d4caaf3ad58d7d81884d82b3fd6fbff6a15120 SHA256 08ae86596433eca5aa8cfa82f6eca0f0463fb4860d5ebfca1363dacb08eb4cc5 EBUILD gtk+-2.24.5-r1.ebuild 7820 RMD160 8e63ef3d7752ab5ba7c7c34d808774d4004e30fa SHA1 d928f781289082e2a13a76864c4d818b4e1ad8d6 SHA256 3f4b00d8a827119a3e99dd3c91abb05365ee13831a33b21de3f9173bd68af979 -EBUILD gtk+-3.0.11.ebuild 6055 RMD160 7e69516cff88f605ad0aa0635fa35d20a4d2dc87 SHA1 79acbd6124d08bdca724edc777fc49ee6577fe39 SHA256 5d9f161be94d922fd008d870f03a1d829401cd96bdb7c8b53c0afad806cfd042 +EBUILD gtk+-2.24.6.ebuild 7676 RMD160 b36290f910c27eee2fc2ddd0a4c506c71b92a6f3 SHA1 845a413728db1fc707b641175808ea97785c02ad SHA256 a02fc317af27b02b9dea43adab64c1845ae5f3a2b7ed346875cadd9e4f5d6ba2 EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e -MISC ChangeLog 79381 RMD160 836acf531dad7e5a4559b91f861ad3558e946f53 SHA1 ed2b1f87895dc10a1427fc220caa48bccbb81480 SHA256 ce5047be418fc395f463cda74725d13f28ac781931ef9dae3fc75e057f9ad77f +MISC ChangeLog 79526 RMD160 ec5f6d9dd8fe8c69de71eeed5ad840e661248298 SHA1 970d0b4ddc83e670f85f819b024b7b78934b6d00 SHA256 4bf4fad551f4866fcd5bd896251980f6a7e918d6b4d6fe18dbb41c45d7eba19f MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (SunOS) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5jQHoACgkQX3X2B8XHTokmgQCdGQFR6sgd0Y3tiRtREoJgFfC6 -wT4AnjPmm2Xp/g5N9RnNaCI47rm8bvca -=/tMw +iEYEARECAAYFAk5qdEEACgkQCaWpQKGI+9SYugCbBTlD7kDcVSu9LMIo3iuruFRv +bWAAnjerdit/kkQMdsjY8LUPcA+uTz5p +=jve7 -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/gtk+-2.24.6.ebuild b/x11-libs/gtk+/gtk+-2.24.6.ebuild new file mode 100644 index 000000000000..6b1570454d85 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.6.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.6.ebuild,v 1.1 2011/09/09 20:16:59 pacho Exp $ + +EAPI="3" +GNOME_TARBALL_SUFFIX="xz" +PYTHON_DEPEND="2:2.4" + +inherit eutils flag-o-matic gnome.org libtool python virtualx autotools + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama" + +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +RDEPEND="!aqua? ( + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + >=x11-libs/libXrandr-1.3 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + >=x11-libs/cairo-1.6[X,svg] + x11-libs/gdk-pixbuf:2[X,introspection?] + ) + aqua? ( + >=x11-libs/cairo-1.6[aqua,svg] + x11-libs/gdk-pixbuf:2[introspection?] + ) + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.27.3:2 + >=x11-libs/pango-1.20[introspection?] + >=dev-libs/atk-1.29.2[introspection?] + media-libs/fontconfig + x11-misc/shared-mime-info + cups? ( net-print/cups ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) + ! "${T}/gtkrc" + insinto /etc/gtk-2.0 + doins "${T}"/gtkrc || die "doins gtkrc failed" + + # Enable xft in environment as suggested by + echo "GDK_USE_XFT=1" > "${T}"/50gtk2 + doenvd "${T}"/50gtk2 || die "doenvd failed" + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" + + # add -framework Carbon to the .pc files + use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do + sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed" + done + + python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert + + find "${ED}" -name '*.la' -exec rm -f {} + +} + +pkg_postinst() { + set_gtk2_confdir + + # gtk.immodules should be in their CHOST directories respectively. + gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \ + || ewarn "Failed to run gtk-query-immodules-2.0" + + if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then + elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" + elog "aware location. Removing deprecated file." + rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules + fi + + # pixbufs are now handled by x11-libs/gdk-pixbuf + if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then + elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + elog "Removing deprecated file." + rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders + fi + + # two checks needed since we dropped multilib conditional + if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then + elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + elog "Removing deprecated file." + rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders + fi + + if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" + fi + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your gtkrc." + fi +} diff --git a/x11-libs/gtk+/gtk+-3.0.11.ebuild b/x11-libs/gtk+/gtk+-3.0.11.ebuild deleted file mode 100644 index 73a8b4c0f856..000000000000 --- a/x11-libs/gtk+/gtk+-3.0.11.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.11.ebuild,v 1.4 2011/07/11 15:43:06 mattst88 Exp $ - -EAPI="3" -GNOME_TARBALL_SUFFIX="xz" - -inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="3" -# NOTE: This gtk+ has multi-gdk-backend support, see: -# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ -# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html -# I tried this and got it all compiling, but the end result is unusable as it -# horribly mixes up the backends -- grobian -IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# FIXME: introspection data is built against system installation of gtk+:3 -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert -# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 -COMMON_DEPEND="!aqua? ( - x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - >=x11-libs/libXrandr-1.3 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - >=x11-libs/cairo-1.10.0[X,glib,svg] - >=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] - ) - aqua? ( - >=x11-libs/cairo-1.10.0[aqua,glib,svg] - >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] - ) - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.28.0 - >=x11-libs/pango-1.24.0[introspection?] - >=dev-libs/atk-1.30[introspection?] - >=x11-libs/gtk+-2.24:2 - media-libs/fontconfig - x11-misc/shared-mime-info - cups? ( net-print/cups ) - introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" -DEPEND="${COMMON_DEPEND} - >=dev-util/pkgconfig-0.9 - !aqua? ( - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - ) - x86-interix? ( - sys-libs/itx-bind - ) - xinerama? ( x11-proto/xineramaproto ) - >=dev-util/gtk-doc-am-1.11 - doc? ( - >=dev-util/gtk-doc-1.11 - ~app-text/docbook-xml-dtd-4.1.2 ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" -RDEPEND="${COMMON_DEPEND} - ! "${T}/gtkrc" - insinto /etc/gtk-3.0 - doins "${T}"/gtkrc || die "doins gtkrc failed" - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" - - # Remove unneeded *.la files - find "${ED}" -name "*.la" -delete - - # add -framework Carbon to the .pc files - use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do - sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done -} - -pkg_preinst() { - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_schemas_update - - local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" - gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ - || ewarn "Failed to run gtk-query-immodules-3.0" - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." - fi -} - -pkg_postrm() { - gnome2_schemas_update --uninstall -}