From: Marinus Schraal Date: Tue, 2 Nov 2004 00:20:26 +0000 (+0000) Subject: new release, dep fix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96880b879ca99060a7c3e3f0632bee2424a77ce0;p=gentoo.git new release, dep fix --- diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index d800af47e4d7..decccb01dad8 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gtk+ # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.127 2004/10/13 21:02:25 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.128 2004/11/02 00:20:26 foser Exp $ + +*gtk+-2.4.13 (02 Nov 2004) + + 02 Nov 2004; foser gtk+-2.4.13.ebuild : + Not so fresh release (#64913) + Add correct automake dep (#65796) 14 Oct 2004; Mamoru KOMACHI gtk+-1.2.10-r11.ebuild: Removed ~ppc-macos keyword until bug #57677 is solved. diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index ffc319201162..c42a99845108 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,31 +1,23 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 71531996ce3e654b8c2f1de597b99481 gtk+-1.2.10-r11.ebuild 1789 -MD5 6880289256085cb8cb69a597d8098333 gtk+-2.4.1.ebuild 2238 -MD5 d5904f53031cf372937b9a803f39ea14 gtk+-2.4.4.ebuild 2989 MD5 4b173bf958771b902f94c9bf0702ad7f gtk+-2.4.7.ebuild 3037 -MD5 a163afecf3733f645a0926074e03929f gtk+-2.4.9-r1.ebuild 3107 -MD5 d3ec0459739e45362319504586f8e008 ChangeLog 19262 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 1aa3638017cfffe3060e9102e2fb2865 gtk+-2.4.9-r1.ebuild 3135 MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719 -MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138 +MD5 d5904f53031cf372937b9a803f39ea14 gtk+-2.4.4.ebuild 2989 +MD5 6c6beebaaa830d1af7abec33c54d1e54 gtk+-2.4.13.ebuild 3070 +MD5 6880289256085cb8cb69a597d8098333 gtk+-2.4.1.ebuild 2238 +MD5 04da915da3a1c1ecbdf674f6268d4f2a ChangeLog 19420 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 18620b7ba0f3cf18b663d7e314669aa7 files/digest-gtk+-2.4.1 64 MD5 1010233f6bd82db56f1e6efa4cb7327a files/digest-gtk+-2.4.4 133 MD5 3cbd11bc85612e3d8111ed4d030f27dd files/digest-gtk+-2.4.7 133 -MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133 +MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138 +MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138 +MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 -MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 -MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006 +MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 +MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133 MD5 c036eedc28ac4fb298c20ef606d53935 files/gtk+-2.4.1-define_sensible_icon_theme.patch 582 +MD5 a68d7378a0b93c1ac32c3be67e42d360 files/digest-gtk+-2.4.13 65 +MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291 -MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 -MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (Darwin) - -iD8DBQFBbZjMVWNWqTUmv+0RAuuCAJ9fe6M5cL/qB4Mu8uU7WizczWRn0wCff9Vd -nXM9X5s7rJpfPPAo6xgj91M= -=4zTX ------END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.13 b/x11-libs/gtk+/files/digest-gtk+-2.4.13 new file mode 100644 index 000000000000..1aeadefaf341 --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.4.13 @@ -0,0 +1 @@ +MD5 3a438e1010704b11acaf060c9ba0fd7b gtk+-2.4.13.tar.bz2 9272024 diff --git a/x11-libs/gtk+/gtk+-2.4.13.ebuild b/x11-libs/gtk+/gtk+-2.4.13.ebuild new file mode 100644 index 000000000000..0701695771e6 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.4.13.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.13.ebuild,v 1.1 2004/11/02 00:20:26 foser Exp $ + +inherit libtool flag-o-matic eutils + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2 + amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64" +IUSE="doc tiff jpeg" + +RDEPEND="virtual/x11 + >=dev-libs/glib-2.4 + >=dev-libs/atk-1.0.1 + >=x11-libs/pango-1.4 + x11-misc/shared-mime-info + >=media-libs/libpng-1.2.1 + jpeg? ( >=media-libs/jpeg-6b-r2 ) + tiff? ( >=media-libs/tiff-3.5.7 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12.0 + sys-devel/autoconf + >=sys-devel/automake-1.7.9 + doc? ( >=dev-util/gtk-doc-1 )" + +src_unpack() { + + unpack ${A} + + cd ${S} + # Turn of --export-symbols-regex for now, since it removes + # the wrong symbols + epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch + # beautifying patch for disabled icons + epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch + # add smoothscroll support for usability reasons + # http://bugzilla.gnome.org/show_bug.cgi?id=103811 + epatch ${FILESDIR}/${PN}-2.4-smoothscroll.patch + + # use an arch-specific config directory so that 32bit and 64bit versions + # dont clash on multilib systems + use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2 + # and this line is just here to make building emul-linux-x86-gtklibs a bit + # easier, so even this should be amd64 specific. + use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2 + + autoconf || die + automake || die + +} + +src_compile() { + + # bug 8762 + replace-flags "-O3" "-O2" + + elibtoolize + + econf \ + `use_enable doc gtk-doc` \ + `use_with jpeg libjpeg` \ + `use_with tiff libtiff` \ + --with-png \ + --with-gdktarget=x11 \ + --with-xinput \ + || die + + # gtk+ isn't multithread friendly due to some obscure code generation bug + MAKEOPTS="${MAKEOPTS} -j1" emake || die + +} + +src_install() { + + dodir /etc/gtk-2.0 + use amd64 && dodir /etc/gtk-2.0/${CHOST} + use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST} + + make DESTDIR=${D} install || die + + # Enable xft in environment as suggested by + dodir /etc/env.d + echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2 + + dodoc AUTHORS ChangeLog* HACKING INSTALL NEWS* README* + +} + +pkg_postinst() { + + use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} + + gtk-query-immodules-2.0 > /${GTK2_CONFDIR}/gtk.immodules + gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders + + einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines." + einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if" + einfo "you upgrade from gtk+-2.2 to 2.4 (requires gentoolkit)." + +} diff --git a/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild index dc4d024dc416..6cfc3d1309ab 100644 --- a/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild,v 1.8 2004/10/10 02:14:11 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild,v 1.9 2004/11/02 00:20:26 foser Exp $ inherit libtool flag-o-matic eutils @@ -26,6 +26,7 @@ RDEPEND="virtual/x11 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0 sys-devel/autoconf + >=sys-devel/automake-1.7.9 doc? ( >=dev-util/gtk-doc-1 )" src_unpack() {