From bbc02a1c6abea12533d5bad074d0c452deb2d6c9 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 23 Feb 2010 14:52:38 +0000 Subject: [PATCH] Use libresolv from sys-libs/itx-bin on Interix Prefix Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- x11-libs/gtk+/ChangeLog | 5 ++++- x11-libs/gtk+/gtk+-2.18.7.ebuild | 12 +++++++++++- x11-libs/libwnck/ChangeLog | 6 +++++- x11-libs/libwnck/libwnck-2.28.0.ebuild | 15 ++++++++++++--- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 14a0a6a0073c..9d6380da5e16 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.442 2010/02/23 09:22:26 mrpouet Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.443 2010/02/23 14:50:29 fauli Exp $ + + 23 Feb 2010; Christian Faulhammer gtk+-2.18.7.ebuild: + Use libresolv from sys-libs/itx-bin on Interix Prefix *gtk+-2.18.7 (23 Feb 2010) diff --git a/x11-libs/gtk+/gtk+-2.18.7.ebuild b/x11-libs/gtk+/gtk+-2.18.7.ebuild index 6b11d7b90c96..434905cd2f41 100644 --- a/x11-libs/gtk+/gtk+-2.18.7.ebuild +++ b/x11-libs/gtk+/gtk+-2.18.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7.ebuild,v 1.1 2010/02/23 09:22:26 mrpouet Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7.ebuild,v 1.2 2010/02/23 14:50:29 fauli Exp $ EAPI="2" @@ -52,6 +52,9 @@ DEPEND="${RDEPEND} x11-proto/inputproto x11-proto/damageproto ) + x86-interix? ( + sys-libs/itx-bind + ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( @@ -94,6 +97,13 @@ src_prepare() { -i gtk/tests/testing.c || die "sed 1 failed" sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ -i gtk/tests/recentmanager.c || die "sed 2 failed" + + if use x86-interix; then + # activate the itx-bind package... + append-flags "-I${EPREFIX}/usr/include/bind" + append-ldflags "-L${EPREFIX}/usr/lib/bind" + fi + elibtoolize } diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog index deb5f12a5eba..be0d397b1279 100644 --- a/x11-libs/libwnck/ChangeLog +++ b/x11-libs/libwnck/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libwnck # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.230 2010/01/16 17:11:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.231 2010/02/23 14:52:38 fauli Exp $ + + 23 Feb 2010; Christian Faulhammer + libwnck-2.28.0.ebuild: + Use libresolv from sys-libs/itx-bin on Interix Prefix 16 Jan 2010; Raúl Porcel libwnck-2.26.2-r2.ebuild: sh stable diff --git a/x11-libs/libwnck/libwnck-2.28.0.ebuild b/x11-libs/libwnck/libwnck-2.28.0.ebuild index 1d72f1b68d08..307c94c0df20 100644 --- a/x11-libs/libwnck/libwnck-2.28.0.ebuild +++ b/x11-libs/libwnck/libwnck-2.28.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.28.0.ebuild,v 1.1 2009/10/29 21:25:21 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.28.0.ebuild,v 1.2 2010/02/23 14:52:38 fauli Exp $ EAPI="2" GCONF_DEBUG="no" @@ -27,7 +27,10 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40 dev-util/gtk-doc-am gnome-base/gnome-common - doc? ( >=dev-util/gtk-doc-1.9 )" + doc? ( >=dev-util/gtk-doc-1.9 ) + x86-interix? ( + sys-libs/itx-bind + )" DOCS="AUTHORS ChangeLog HACKING NEWS README" @@ -40,6 +43,12 @@ pkg_setup() { src_prepare() { gnome2_src_prepare + if use x86-interix; then + # activate the itx-bind package... + append-flags "-I${EPREFIX}/usr/include/bind" + append-ldflags "-L${EPREFIX}/usr/lib/bind" + fi + # Fix glib-mkenum auto generation (bug #279832) epatch "${FILESDIR}"/${PN}-2.26.2-fix-glib-mkenums.diff # required to force regeneration of wnck-enum-types.h -- 2.26.2