Version bump for bug fixes in the 2.12 series

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 178 insertions, 2 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 48b549e517b0..43ffccf40dc5 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.395 2008/09/09 11:18:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.396 2008/09/22 03:07:22 leio Exp $
+
+*gtk+-2.12.12 (22 Sep 2008)
+
+  22 Sep 2008; Mart Raudsepp <leio@gentoo.org> +gtk+-2.12.12.ebuild:
+  Version bump for bug fixes in the 2.12 series
 
   09 Sep 2008; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.11.ebuild:
   alpha/ia64/sparc stable wrt #236971
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 41f672c46323..fb6eaf313840 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -26,14 +26,16 @@ DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288
 DIST gtk+-2.10.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 SHA1 78b819814d52caa66739ab64611e41f35e5b48c3 SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
 DIST gtk+-2.12.10.tar.bz2 16230724 RMD160 cea5a22478f9ad32a49df42c5ceb08b07390d4c5 SHA1 03ba66925d3ef8509c2aa227cdb7b11c194055ee SHA256 6e4ca68a2e099418610eddd699012558cb704c441094228161966683ec8c2f18
 DIST gtk+-2.12.11.tar.bz2 16232428 RMD160 189baa48d16736ab60fd2ed2b124cd4fa2448d78 SHA1 c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b SHA256 c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
+DIST gtk+-2.12.12.tar.bz2 16222631 RMD160 2aeeeb6557530d6062e799e11138186a57ddaed2 SHA1 e3c247783da930ff3bdce7f4cdc738d74ee1a03f SHA256 eeacb49b99312e89c611d9ee72b4351b36a136c1344064af2c831d452dd92116
 DIST gtk+-2.12.8.tar.bz2 16101527 RMD160 e1ae63c6e0230e6e7e52d67836028f9b1351275e SHA1 48e3efd396c33682538e16fa09ee72853dee563b SHA256 ff2f542d5dca2089f9e6bef67ba5ebce6224d88b5372d87f4195dcdbe938f0ef
 DIST gtk+-2.12.9.tar.bz2 16027448 RMD160 c93c046aa30b26bbf4d53b6f3e900283eb2d5616 SHA1 95e375f8478940a5b096845a9bff76004f265eba SHA256 5bd9bf1fb331259f0c25056380cad405063df9ad655d5e07a679ee9f098d0ec8
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.10.14.ebuild 4156 RMD160 7f4b413b39fa05c4c9140901f33f21c38998a44d SHA1 4fd35077b4a940c25202d232c846a3f8a67c5a49 SHA256 8aab4a2d5932bc051065568774decedfa92b98adc9a4939377bd38d569dd3143
 EBUILD gtk+-2.12.10-r1.ebuild 5127 RMD160 42c432f6a45759699a48a84d05cea8037420ec93 SHA1 1810f8307426f31b34c937904e6e515857ee223c SHA256 8ff3b0486ef1c40cd67b31e131fef2ef1f7aebad5d58330621ea9b50d8275230
 EBUILD gtk+-2.12.11.ebuild 4855 RMD160 b2a1ce9334ae6ddf9cadf75aded5d5b311857725 SHA1 5aad976d531672f97422bd70e3baf2390c636676 SHA256 5a79abfc50d5c0735a33bc7e6e10232904e8d6b6a91d9366a40d49e1bee8a6e6
+EBUILD gtk+-2.12.12.ebuild 4857 RMD160 3de9a98829ab1484e1490a71b968248bd79264f1 SHA1 672b3a97e4e45c977d0b46760cdebf39546d232c SHA256 82f35661a9a45f334e12950a8b2e3c32f7f0a29c7e7020f60603ae223e80b334
 EBUILD gtk+-2.12.8.ebuild 4571 RMD160 5ee8c3872801e50cf1dc99282e74253946422c47 SHA1 2fcdb81933fd6bab2fb7b10ede0ac7fed5d553a6 SHA256 80ea9abd64a29eafcc09e4b248214f2ad0f7aebee627ab053258a911ca2f82e6
 EBUILD gtk+-2.12.9-r1.ebuild 4615 RMD160 98b7930a6ade2ad915a7101f6750922926a43c08 SHA1 e790f140baa04576a518574d076e3527cc30bca7 SHA256 1c703580dcb5620fdffd811bad7366c3484865cc570a8e319220f05f4b7b2326
 EBUILD gtk+-2.12.9-r2.ebuild 5455 RMD160 a16d03626f9b8f03a656523bac0b1239242db034 SHA1 b6f55b8277da86d740f1d6c13656cac7635b049c SHA256 3fa5da02d232e4cb17bf904a8f8fc0de582626b819373346ad7c230991eb5e01
-MISC ChangeLog 56332 RMD160 84e6dc02e4a2fc5e6389d7c05cd7124f0a655749 SHA1 550df32a1618f85c0aefe90820fe97a749b2dbd6 SHA256 58091444545619eb530cdaaa92879a25b3f8caafaf15f468589a72c48aa6cca0
+MISC ChangeLog 56476 RMD160 eecffbd7bc8cf54f5b7f4e2f7cf072a6a7e540b3 SHA1 7ce19ba1a56e348bb2937b0f019a1f8022d066f4 SHA256 45298005d47ade2859b18d0bc669b2854f6492d2ab60352aaebd40101cc7f9c6
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
diff --git a/x11-libs/gtk+/gtk+-2.12.12.ebuild b/x11-libs/gtk+/gtk+-2.12.12.ebuild
new file mode 100644
index 000000000000..3fb3be429825
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.12.12.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.12.ebuild,v 1.1 2008/09/22 03:07:23 leio Exp $
+
+WANT_AUTOMAKE="1.7"
+
+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
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
+	doc? (
+			>=dev-util/gtk-doc-1.8
+			~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}/${PN}-2.12.1-firefox-print-preview.patch"
+
+	# Compile without libintl.h (uclibc)
+	epatch "${FILESDIR}/${PN}-2.12.10-no-libintl.patch"
+
+	# Work without C++
+	epatch "${FILESDIR}/${PN}-2.12.10-fix-nocxx.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# Fix libtool usage for configure stage, bug #213789
+	epatch "${FILESDIR}/${PN}-2.12.9-libtool-2.patch"
+
+	# remember, eautoreconf applies elibtoolize.
+	# if you remove this, you should manually run elibtoolize
+	eautoreconf
+}
+
+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) \
+		$(use_enable cups cups auto) \
+		--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() {
+	Xemake check || die
+}
+
+src_install() {
+	emake 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"
+}