gdk-pixbuf.loaders installation was broken by einstall passing sysconfdir, revert back to using make with destdir wrt #199746.

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

4 files changed, 185 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 5c07d1540b4e..7acb14d8384a 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.352 2007/11/20 06:14:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.353 2007/11/21 13:01:03 drac Exp $
+
+*gtk+-2.12.1-r2 (21 Nov 2007)
+
+  21 Nov 2007; Samuli Suominen <drac@gentoo.org> +gtk+-2.12.1-r2.ebuild:
+  gdk-pixbuf.loaders installation was broken by einstall passing sysconfdir,
+  revert back to using make with destdir wrt #199746.
 
   20 Nov 2007; Joshua Kinard <kumba@gentoo.org> gtk+-2.12.1-r1.ebuild:
   Stable on mips, per #198845.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 49156d2bcbac..6a22b888f192 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -108,6 +108,10 @@ EBUILD gtk+-2.12.1-r1.ebuild 4660 RMD160 dd3b1500c18c110cdc5ae0a93d99735f4bd53af
 MD5 0b95634d17cd6f2d5f5b2747d2052207 gtk+-2.12.1-r1.ebuild 4660
 RMD160 dd3b1500c18c110cdc5ae0a93d99735f4bd53afd gtk+-2.12.1-r1.ebuild 4660
 SHA256 f0276f867831f22bd514123ea21a0ea0fa83a8c5f682610fb363030001050620 gtk+-2.12.1-r1.ebuild 4660
+EBUILD gtk+-2.12.1-r2.ebuild 4678 RMD160 fe8a98d02f795712e9765c087dc5806222c3f32f SHA1 00f8d64a4d08f6953ab17c2a3b4d83b814a1a4eb SHA256 e2f3181c60e9c195afabfc92866c6676ba6f9034690df0490efdaa758b28526d
+MD5 f2802d1989f8d593f0d5f7e5a2e2f222 gtk+-2.12.1-r2.ebuild 4678
+RMD160 fe8a98d02f795712e9765c087dc5806222c3f32f gtk+-2.12.1-r2.ebuild 4678
+SHA256 e2f3181c60e9c195afabfc92866c6676ba6f9034690df0490efdaa758b28526d gtk+-2.12.1-r2.ebuild 4678
 EBUILD gtk+-2.6.10-r1.ebuild 3373 RMD160 357e8e06cbde3d735dbad4c73498f952bc7bf94a SHA1 178d985d81017185ee96dcdc861913867ffe2bfd SHA256 d9331de70b6779199cf571300892f4522a5c54bec5dbe1533cdae993a52a58fc
 MD5 815e9a0c3c0afbf98f8b2594721d9993 gtk+-2.6.10-r1.ebuild 3373
 RMD160 357e8e06cbde3d735dbad4c73498f952bc7bf94a gtk+-2.6.10-r1.ebuild 3373
@@ -120,10 +124,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 3995 RMD160 63db77d1dfb70baf86b719215e8161db33408ae
 MD5 e60d4093c148b610523da787aac0b1e9 gtk+-2.8.20-r1.ebuild 3995
 RMD160 63db77d1dfb70baf86b719215e8161db33408ae6 gtk+-2.8.20-r1.ebuild 3995
 SHA256 a9fc160f3fc34133dccb8d4676d7ec6575d66f48fdb2cf2cc1932f661c0adb3b gtk+-2.8.20-r1.ebuild 3995
-MISC ChangeLog 49912 RMD160 a3755f216028fb5281a77c82d37181b79579bd94 SHA1 e05122a87f2afcbd568db72e5685ac096770b6a2 SHA256 d91251d420dde974808c2834d3fc30b533fa5fe9e880fc165d2c5626a47de53e
-MD5 64fb557a5d9bfb0637a0ae957d16b7f1 ChangeLog 49912
-RMD160 a3755f216028fb5281a77c82d37181b79579bd94 ChangeLog 49912
-SHA256 d91251d420dde974808c2834d3fc30b533fa5fe9e880fc165d2c5626a47de53e ChangeLog 49912
+MISC ChangeLog 50147 RMD160 cb2b4b0391647ef13ef469919eba0f615313013e SHA1 cc058bed64cc630458db5797e71fceee80e9e8a4 SHA256 ddc0225869f356c88e8b4143a52274c053eded41d00474a7d74d03a6f0b57e9e
+MD5 a8df849ba178275eeafcde2dc16cc405 ChangeLog 50147
+RMD160 cb2b4b0391647ef13ef469919eba0f615313013e ChangeLog 50147
+SHA256 ddc0225869f356c88e8b4143a52274c053eded41d00474a7d74d03a6f0b57e9e ChangeLog 50147
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -140,6 +144,9 @@ SHA256 ef2f3edecff46be6433fbbf80837b1911339138e0e51d5ab5e8b5cc5dc8a198c files/di
 MD5 952b086559c0de52e60b7794efc0062b files/digest-gtk+-2.12.1-r1 244
 RMD160 2e7ecbd60b30605a792b84f7357f43ff3d531de4 files/digest-gtk+-2.12.1-r1 244
 SHA256 566f0bbb5618303d45184fb311f2fa87d6b9838a6ffdee40b7df443ed3a87191 files/digest-gtk+-2.12.1-r1 244
+MD5 952b086559c0de52e60b7794efc0062b files/digest-gtk+-2.12.1-r2 244
+RMD160 2e7ecbd60b30605a792b84f7357f43ff3d531de4 files/digest-gtk+-2.12.1-r2 244
+SHA256 566f0bbb5618303d45184fb311f2fa87d6b9838a6ffdee40b7df443ed3a87191 files/digest-gtk+-2.12.1-r2 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.1-r2 b/x11-libs/gtk+/files/digest-gtk+-2.12.1-r2
new file mode 100644
index 000000000000..c6d1447e5e6e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.12.1-r2
@@ -0,0 +1,3 @@
+MD5 c46f34addc2fe3ea6756055d59fb8856 gtk+-2.12.1.tar.bz2 15856678
+RMD160 3c3facd971a20178060c7e7cfe9d4cefd651250b gtk+-2.12.1.tar.bz2 15856678
+SHA256 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6 gtk+-2.12.1.tar.bz2 15856678
diff --git a/x11-libs/gtk+/gtk+-2.12.1-r2.ebuild b/x11-libs/gtk+/gtk+-2.12.1-r2.ebuild
new file mode 100644
index 000000000000..6a90dcd7a099
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.12.1-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1-r2.ebuild,v 1.1 2007/11/21 13:01:03 drac Exp $
+
+inherit gnome.org flag-o-matic eutils autotools virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="cups debug doc jpeg tiff vim-syntax xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.13.5
+	>=x11-libs/pango-1.17.3
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-1.2.0
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	>=dev-util/pkgconfig-0.9
+	=sys-devel/automake-1.7*
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	doc? (
+			>=dev-util/gtk-doc-1.6
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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"
+
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
+	epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-workaround.patch"
+
+	# Firefox print review crash fix, bug #195644
+	epatch "${FILESDIR}/${P}-firefox-print-preview.patch"
+
+	# Fix printing on ppc64.  Bug #197639
+	epatch "${FILESDIR}"/${P}-cupsutils.patch
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# remember, eautoreconf applies elibtoolize.
+	# if you remove this, you should manually run elibtoolize
+	export WANT_AUTOMAKE=1.7
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR="." eautoreconf
+
+	epunt_cxx
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xmake check || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# 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*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality"
+}