diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/gtk+/Manifest | 24 | ||||
-rw-r--r-- | x11-libs/gtk+/files/digest-gtk+-2.7.4 | 3 | ||||
-rw-r--r-- | x11-libs/gtk+/files/digest-gtk+-2.8.0 | 2 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.8.0.ebuild (renamed from x11-libs/gtk+/gtk+-2.7.4.ebuild) | 39 | ||||
-rw-r--r-- | x11-libs/gtk+/metadata.xml | 8 |
6 files changed, 49 insertions, 34 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index dfea2c2e0c15..b060adf4d98b 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/gtk+ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.171 2005/07/31 15:31:57 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.172 2005/08/16 01:37:05 leonardop Exp $ + +*gtk+-2.8.0 (15 Aug 2005) + + 15 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> gtk+-2.8.0.ebuild: + New version. *gtk+-2.7.4 (31 Jul 2005) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index dfe5e500a873..4db287b2bfd9 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,20 +1,20 @@ -MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831 -MD5 4719d1845d3618d0e464d397289e8577 gtk+-2.6.4-r1.ebuild 2960 -MD5 803ec854f5933b0747aae16bb0201e2a gtk+-2.7.4.ebuild 2906 +MD5 1c9aa56acd909ab637d84408a9a1ddf9 ChangeLog 24589 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719 +MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831 MD5 c23a87ba8c10d2a6b0733b3bcb088d73 gtk+-2.6.8.ebuild 2848 +MD5 c6c3805d8435d72c357e32e4277cb948 gtk+-2.8.0.ebuild 2935 +MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424 +MD5 4719d1845d3618d0e464d397289e8577 gtk+-2.6.4-r1.ebuild 2960 MD5 4be3562f71af8184c46d141fba5e6a8b gtk+-2.6.7.ebuild 2838 -MD5 870e76c8fce39f3d7327ded606e5565e ChangeLog 24468 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208 -MD5 611d813de53655fa348ad470ee9c7179 files/digest-gtk+-2.6.8 208 -MD5 8ac6ed9e628a36a6410cdad6f78b51e9 files/digest-gtk+-2.7.4 206 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 611d813de53655fa348ad470ee9c7179 files/digest-gtk+-2.6.8 208 +MD5 03586690fef8f3011aa496c446eecb92 files/digest-gtk+-2.8.0 137 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 -MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220 -MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208 -MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732 +MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 +MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208 +MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256 +MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208 +MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.7.4 b/x11-libs/gtk+/files/digest-gtk+-2.7.4 deleted file mode 100644 index fb78a337bc47..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.7.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1a121264a4ba2e208c025d9eb0515d41 gtk+-2.7.4.tar.bz2 11747876 -MD5 ad9550c814fc5e24d2f03aa2dc3d5b8f gtk+-2-smoothscroll-r6.patch 18162 -MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0 b/x11-libs/gtk+/files/digest-gtk+-2.8.0 new file mode 100644 index 000000000000..85772c1bb2be --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.8.0 @@ -0,0 +1,2 @@ +MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118 +MD5 ad9550c814fc5e24d2f03aa2dc3d5b8f gtk+-2-smoothscroll-r6.patch 18162 diff --git a/x11-libs/gtk+/gtk+-2.7.4.ebuild b/x11-libs/gtk+/gtk+-2.8.0.ebuild index 2b3aae6e25f5..327e3fd234b3 100644 --- a/x11-libs/gtk+/gtk+-2.7.4.ebuild +++ b/x11-libs/gtk+/gtk+-2.8.0.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.7.4.ebuild,v 1.1 2005/07/31 15:31:57 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.0.ebuild,v 1.1 2005/08/16 01:37:05 leonardop Exp $ -inherit flag-o-matic eutils debug +inherit gnome.org flag-o-matic eutils debug DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.7/${P}.tar.bz2 - mirror://gentoo/gtk+-2-smoothscroll-r6.patch - amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )" +SRC_URI="${SRC_URI} + mirror://gentoo/gtk+-2-smoothscroll-r6.patch" +# amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )" +# Patch doesn't apply anymore, see bug #101289 LICENSE="LGPL-2" SLOT="2" @@ -19,24 +20,27 @@ RDEPEND="virtual/x11 >=dev-libs/glib-2.7.1 >=dev-libs/atk-1.0.1 >=x11-libs/pango-1.9 - >=x11-libs/cairo-0.6 + >=x11-libs/cairo-0.9.2 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 + >=dev-util/pkgconfig-0.9 sys-devel/autoconf >=sys-devel/automake-1.7.9 - doc? ( >=dev-util/gtk-doc-1 - =app-text/docbook-xml-dtd-4.1.2* ) - !x11-themes/gtk-engines-pixmap" + doc? ( + >=dev-util/gtk-doc-1.4 + ~app-text/docbook-xml-dtd-4.1.2 )" -# An arch specific config directory is used on multilib systems -has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" -use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" -GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} + +pkg_setup() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} +} src_unpack() { @@ -52,10 +56,11 @@ src_unpack() { cd ${S} # use an arch-specific config directory so that 32bit and 64bit versions # dont clash on multilib systems - has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2 + # has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.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 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2 + # use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2 # patch for ppc64 (#64359) use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch @@ -78,7 +83,7 @@ src_compile() { `use_with jpeg libjpeg` \ `use_with tiff libtiff` \ `use_enable static` \ - --with-png \ + --with-libpng \ --with-gdktarget=x11 \ --with-xinput \ || die diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml index da6fd63d0085..2662444a43de 100644 --- a/x11-libs/gtk+/metadata.xml +++ b/x11-libs/gtk+/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>gnome</herd> + <herd>gnome</herd> + <longdescription> + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, GTK+ is suitable + for projects ranging from small one-off projects to complete + application suites. + </longdescription> </pkgmetadata> |