rev bump. modular X depends. clean up old cruft from the 2.0.x days.

(Portage version: 2.0.51.22-r2)

4 files changed, 152 insertions, 15 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 55e3a812a774..33f0eb2f41d5 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.178 2005/08/25 17:51:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.179 2005/08/25 18:34:48 cardoe Exp $
+
+*gtk+-2.8.2 (25 Aug 2005)
+
+  25 Aug 2005; Doug Goldstein <cardoe@gentoo.org> +gtk+-2.8.2.ebuild:
+  rev bump. modular X depends. clean up old cruft from the 2.0.x days.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtk+-2.6.8.ebuild:
   stable on ia64
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index be11073a6d85..42355c7fb236 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,22 +1,24 @@
-MD5 07e71f518bc78394ab678bdb2294dbc1 gtk+-2.8.0-r2.ebuild 3011
-MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
+MD5 8b27df28377cb86b7863b4d9bc30a643 ChangeLog 25811
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
-MD5 231a3f2686f178d59e6ba8364fbf6d56 ChangeLog 25642
+MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
 MD5 ca27b0fbeaefef6ba9f6885046c08e87 gtk+-2.6.8.ebuild 2846
-MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
+MD5 07e71f518bc78394ab678bdb2294dbc1 gtk+-2.8.0-r2.ebuild 3011
+MD5 4c3e54913b8bc99bcf210325fd299919 gtk+-2.8.2.ebuild 3371
 MD5 d9750f9180ebd11501fbbe1768786b73 gtk+-2.6.10.ebuild 2826
-MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 287a783fae710028b7fda8fdef220425 files/gtk+-2.8.0-gdk_fix.patch 638
+MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
+MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
-MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
 MD5 fff5a03e20c5f0e1321a2a29fa38fca9 files/digest-gtk+-2.8.0-r2 140
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
 MD5 435a16e306ba84bc7d8536a3369cf631 files/gtk+-2.8.0-dep_checks.patch 1690
+MD5 287a783fae710028b7fda8fdef220425 files/gtk+-2.8.0-gdk_fix.patch 638
+MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 cee94d5e2a8fd817ee69da2964876851 files/digest-gtk+-2.8.2 140
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+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
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.2 b/x11-libs/gtk+/files/digest-gtk+-2.8.2
new file mode 100644
index 000000000000..6eb3728b9d13
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.2
@@ -0,0 +1,2 @@
+MD5 5b8b6d24f9f24469f96934b6efcc34b9 gtk+-2.8.2.tar.bz2 11802646
+MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
diff --git a/x11-libs/gtk+/gtk+-2.8.2.ebuild b/x11-libs/gtk+/gtk+-2.8.2.ebuild
new file mode 100644
index 000000000000..769a0ff010f1
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.2.ebuild
@@ -0,0 +1,128 @@
+# 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 $
+
+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="|| (
+		(
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXfixes
+		)
+		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
+	|| ( ( x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/xineramaproto )
+	virtual/x11 )
+	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
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch ${FILESDIR}/${PN}-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}/${PN}-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 "autoconf failed"
+	automake || die "automake failed"
+
+	epunt_cxx
+}
+
+src_compile() {
+
+	# bug 8762, that's a festival bug
+	# most likely bug 8375, but no longer necessary
+#	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 "./configure failed to run"
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	# was an issue with 2.0.6, but no longer an issue
+	emake || die "gtk+ failed to compile"
+
+}
+
+src_install() {
+
+	dodir ${GTK2_CONFDIR}
+
+	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
+
+	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
+
+}