New release: 2.8.3. Removing old ebuilds/patches.

Package-Manager: portage-2.0.51.22-r2

8 files changed, 39 insertions, 235 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 9ec8722356ba..1354fb0a89e3 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.182 2005/08/31 21:44:02 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.183 2005/09/01 10:29:28 leonardop Exp $
+
+*gtk+-2.8.3 (01 Sep 2005)
+
+  01 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/gtk+-2.8.0-dep_checks.patch, -files/gtk+-2.8.0-gdk_fix.patch,
+  -gtk+-2.8.0-r2.ebuild, -gtk+-2.8.2.ebuild, +gtk+-2.8.3.ebuild:
+  New version.
 
   31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> gtk+-2.6.8.ebuild:
   Stable on amd64.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 8c2559c500df..0f2613445712 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,34 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 26880a3d933d497f199fb77d0e0dfceb ChangeLog 26310
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 07e71f518bc78394ab678bdb2294dbc1 gtk+-2.8.0-r2.ebuild 3011
-MD5 3335c749f17d6e98890c50f25491e255 gtk+-2.8.2.ebuild 3368
 MD5 d9750f9180ebd11501fbbe1768786b73 gtk+-2.6.10.ebuild 2826
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
-MD5 c2d2f7a84d31b5cecba977e30e4b944c gtk+-2.6.8.ebuild 2840
 MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
-MD5 97dae2584ac0eae690d1d729d3e5303a ChangeLog 26072
+MD5 c2d2f7a84d31b5cecba977e30e4b944c gtk+-2.6.8.ebuild 2840
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
-MD5 435a16e306ba84bc7d8536a3369cf631 files/gtk+-2.8.0-dep_checks.patch 1690
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
-MD5 cee94d5e2a8fd817ee69da2964876851 files/digest-gtk+-2.8.2 140
-MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 1995a6e7110df51f768949fa3de2cedf gtk+-2.8.3.ebuild 3339
 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 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
+MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
+MD5 d08a7fb70155059b3c3460cf44a99e9a files/digest-gtk+-2.8.3 140
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
-MD5 fff5a03e20c5f0e1321a2a29fa38fca9 files/digest-gtk+-2.8.0-r2 140
-MD5 287a783fae710028b7fda8fdef220425 files/gtk+-2.8.0-gdk_fix.patch 638
-MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDFiSv2G5bA0cA/ScRAvU2AJ9B8yhBJriG8viMGuwClXTRvGwlvgCfWwIs
-DrSfB4DRkwTIb4kDNbt8A2g=
-=wDJ6
------END PGP SIGNATURE-----
+MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.2 b/x11-libs/gtk+/files/digest-gtk+-2.8.2
deleted file mode 100644
index 6eb3728b9d13..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5b8b6d24f9f24469f96934b6efcc34b9 gtk+-2.8.2.tar.bz2 11802646
-MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r2 b/x11-libs/gtk+/files/digest-gtk+-2.8.3
index f9c33208c33e..303fa12976b1 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r2
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.3
@@ -1,2 +1,2 @@
-MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118
+MD5 1e7a49eaf078af8aeb84369a5fefa8c0 gtk+-2.8.3.tar.bz2 11765089
 MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch b/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch
deleted file mode 100644
index 34ec3d0f7fea..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -NurdB gtk+-2.8.0/configure.in gtk+-2.8.0-patched/configure.in
---- gtk+-2.8.0/configure.in	2005-08-13 07:51:54.000000000 -0500
-+++ gtk+-2.8.0-patched/configure.in	2005-08-18 16:28:14.000000000 -0500
-@@ -1023,8 +1023,8 @@
- GDK_PIXBUF_XLIB_PACKAGES=
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
--
--X_PACKAGES=
-+	
-+X_PACKAGES=fontconfig
- GDK_EXTRA_LIBS="$GDK_WLIBS"
- GDK_EXTRA_CFLAGS=
- 	
-@@ -1034,11 +1034,20 @@
- 
- if test "x$gdktarget" = "xx11"; then
-   #
-+  # We use fontconfig very peripherally when decoding the default
-+  # settings.
-+  #
-+  if $PKG_CONFIG --exists fontconfig; then : ; else
-+    AC_MSG_ERROR([
-+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
-+  fi
-+
-+  #
-   # Check for basic X packages; we use pkg-config if available
-   #
-   if $PKG_CONFIG --exists x11 xext; then
-     have_base_x_pc=true
--    X_PACKAGES="x11 xext"
-+    X_PACKAGES="$X_PACKAGES x11 xext"
-     x_libs="`pkg-config --libs x11 xext`"
-     
-     # Strip out any .la files that pkg-config might give us (this happens
-@@ -1285,7 +1294,7 @@
-     X_PACKAGES="$X_PACKAGES xfixes"
-   fi
- 
--  if $have_base_pc ; then
-+  if $have_base_x_pc ; then
-     GDK_EXTRA_LIBS="$x_extra_libs"
-   else
-     GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lX11 $GDK_EXTRA_LIBS"
-diff -NurdB gtk+-2.8.0/gdk/x11/gdkdrawable-x11.c gtk+-2.8.0-patched/gdk/x11/gdkdrawable-x11.c
---- gtk+-2.8.0/gdk/x11/gdkdrawable-x11.c	2005-07-20 22:57:00.000000000 -0500
-+++ gtk+-2.8.0-patched/gdk/x11/gdkdrawable-x11.c	2005-08-18 16:29:26.000000000 -0500
-@@ -29,8 +29,6 @@
- #include "gdkx.h"
- #include "gdkregion-generic.h"
- 
--#include <pango/pangoxft.h>
--
- #include <cairo-xlib.h>
- 
- #include <stdlib.h>
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch b/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch
deleted file mode 100644
index 3cbe23c2d88a..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB gtk+-2.8.0/gdk/x11/gdkwindow-x11.c gtk+-2.8.0-patched/gdk/x11/gdkwindow-x11.c
---- gtk+-2.8.0/gdk/x11/gdkwindow-x11.c	2005-08-12 08:13:54.000000000 -0500
-+++ gtk+-2.8.0-patched/gdk/x11/gdkwindow-x11.c	2005-08-18 16:47:48.000000000 -0500
-@@ -2913,7 +2913,7 @@
-   g_return_if_fail (pixmap == NULL || !parent_relative);
-   g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
- 
--  if (!gdk_drawable_get_colormap (pixmap))
-+  if (pixmap && !gdk_drawable_get_colormap (pixmap))
-     {
-       g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
-       return;
diff --git a/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild b/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild
deleted file mode 100644
index 814681d258c9..000000000000
--- a/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.8.0-r2.ebuild,v 1.2 2005/08/19 17:23:31 leonardop Exp $
-
-inherit gnome.org flag-o-matic eutils debug
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gtk+-2-smoothscroll-r6.patch.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc tiff jpeg static"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.7.1
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.9
-	>=x11-libs/cairo-0.9.2
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.2.1
-	media-libs/fontconfig
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-
-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() {
-
-	unpack ${A}
-
-	cd ${S}
-	# 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 ${DISTDIR}/${PN}-2-smoothscroll-r6.patch.bz2
-
-	cd ${S}
-
-	# Some sanity checks from upstream.
-	epatch ${FILESDIR}/${P}-dep_checks.patch
-	# Avoid Gdk warnings and other side-effects.
-	epatch ${FILESDIR}/${P}-gdk_fix.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch ${FILESDIR}/gtk+-2.8.0-multilib.patch
-
-	# 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 ${FILESDIR}/gtk+-2.8.0-multilib.patch
-
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
-	use ppc64 && append-flags -mminimal-toc
-
-	autoconf || die
-	automake || die
-
-	epunt_cxx
-
-}
-
-src_compile() {
-
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		`use_enable static` \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput \
-		|| die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	emake -j1 || die
-
-}
-
-src_install() {
-
-	dodir ${GTK2_CONFDIR}
-
-	make DESTDIR=${D} install || die
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.8.2.ebuild b/x11-libs/gtk+/gtk+-2.8.3.ebuild
index 769a0ff010f1..72387cfc1373 100644
--- a/x11-libs/gtk+/gtk+-2.8.2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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.8.2.ebuild,v 1.1 2005/08/25 18:34:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.3.ebuild,v 1.1 2005/09/01 10:29:28 leonardop Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -12,10 +12,9 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc tiff jpeg static"
+IUSE="debug doc tiff jpeg static"
 
-RDEPEND="|| (
-		(
+RDEPEND="|| ( (
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXi
@@ -24,12 +23,11 @@ RDEPEND="|| (
 		x11-libs/libXinerama
 		x11-libs/libXcursor
 		x11-libs/libXrandr
-		x11-libs/libXfixes
-		)
+		x11-libs/libXfixes )
 		virtual/x11 )
 	>=dev-libs/glib-2.7.1
-	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.9
+	>=dev-libs/atk-1.0.1
 	>=x11-libs/cairo-0.9.2
 	x11-misc/shared-mime-info
 	>=media-libs/libpng-1.2.1
@@ -41,12 +39,16 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/autoconf
 	>=sys-devel/automake-1.7.9
-	|| ( ( x11-proto/xextproto
+
+	|| ( (
+		x11-proto/xextproto
 		x11-proto/xproto
 		x11-proto/inputproto
 		x11-proto/xineramaproto )
-	virtual/x11 )
-	doc? ( >=dev-util/gtk-doc-1.4
+		virtual/x11 )
+
+	doc? (
+		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
 pkg_setup() {
@@ -58,8 +60,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
@@ -86,15 +88,15 @@ src_unpack() {
 
 src_compile() {
 
-	# bug 8762, that's a festival bug
-	# most likely bug 8375, but no longer necessary
-#	replace-flags "-O3" "-O2"
+	# bug #8375
+	# replace-flags "-O3" "-O2"
 
 	econf \
 		`use_enable doc gtk-doc` \
 		`use_with jpeg libjpeg` \
 		`use_with tiff libtiff` \
 		`use_enable static` \
+		`use_enable debug` \
 		--with-libpng \
 		--with-gdktarget=x11 \
 		--with-xinput \
@@ -110,11 +112,11 @@ src_install() {
 
 	dodir ${GTK2_CONFDIR}
 
-	make DESTDIR=${D} install || die "Installation failed"
+	make DESTDIR="${D}" install || die "Installation failed"
 
 	# Enable xft in environment as suggested by <utx@gentoo.org>
 	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
+	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
@@ -122,7 +124,7 @@ src_install() {
 
 pkg_postinst() {
 
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	gtk-query-immodules-2.0  > /${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 }