Make xinerama support optional. Bug #118744

Package-Manager: portage-2.1_pre3-r1

4 files changed, 52 insertions, 11 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 30300b7f205a..4c9eebbbb36c 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.212 2006/01/13 23:03:48 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.213 2006/01/14 20:30:38 dang Exp $
+
+  14 Jan 2006; <dang@gentoo.org> +files/gtk+-2.8.10-xinerama.patch,
+  gtk+-2.8.10.ebuild:
+  Make xinerama support optional. Bug #118744
 
   13 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> gtk+-2.8.8.ebuild:
   Stable on alpha wrt bug #117505
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 1507628e6d6e..902ca6dbe994 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8764a868bf9b5e68f76dbccbdd8929b0 ChangeLog 30452
+MD5 785f66f11a59b26fb3cc84bbedda449a ChangeLog 30588
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 f0e0f202bdf17540985215d5384480ed files/digest-gtk+-2.6.10-r1 212
@@ -14,19 +14,20 @@ MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 8289aa1fb556b38e9fb2f9201a065755 files/gtk+-2.8.10-xinerama.patch 1083
 MD5 9ea5c063ade44a46b279eab398fc969a files/gtk+-gdk-pixbuf-testfix.patch 578
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 03ae62ac03643ccc0a36779df1bfd6af gtk+-1.2.10-r10.ebuild 1702
 MD5 60b495d6aa1169ba2dc4b20a303b18d7 gtk+-1.2.10-r11.ebuild 1916
 MD5 6017f72966d53602c58c288364dd61a9 gtk+-2.6.10-r1.ebuild 3125
-MD5 f0afd1a0ef262a76f38f8651ce34f2cf gtk+-2.8.10.ebuild 4123
+MD5 d07770ad85c46bcdc72f37cd92873317 gtk+-2.8.10.ebuild 4267
 MD5 98a655345fb0223bea83f0b1318ae056 gtk+-2.8.8.ebuild 4112
 MD5 b1d222ade0fd24eb5aa4b7f22b49fc6d gtk+-2.8.9.ebuild 4122
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDyDHzViELBEf1JB0RAtl7AJ492/g0KjC1Npz4hC9VFXUD6bJXUQCcC2T1
-zG+nALaRNSjrfWTalaeNQgE=
-=iY9p
+iD8DBQFDyV+oomPajV0RnrERApqLAJ9k2VK7u9oRBpGzlIr3CVbIBvatYQCfQZfi
+Tbf32dIQ73hHsEwayFQJk2A=
+=Bfo/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch b/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch
new file mode 100644
index 000000000000..429e083c4e50
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch
@@ -0,0 +1,32 @@
+Index: gtk+-2.8.9/configure.in
+===================================================================
+--- gtk+-2.8.9.orig/configure.in
++++ gtk+-2.8.9/configure.in
+@@ -195,6 +195,10 @@ AC_ARG_ENABLE(shm,
+               [AC_HELP_STRING([--enable-shm],
+                               [support shared memory if available [default=yes]])],,
+               [enable_shm="yes"])
++AC_ARG_ENABLE(xinerama,
++              [AC_HELP_STRING([--enable-xinerama],
++	                      [support xinerama extension if available [default=yes]])],,
++              [enable_xinerama="yes"])
+ AC_ARG_ENABLE(xkb,
+               [AC_HELP_STRING([--enable-xkb],
+                               [support XKB [default=maybe]])],,
+@@ -1193,7 +1197,7 @@ if test "x$gdktarget" = "xx11"; then
+   fi
+ 
+   # Check for Xinerama extension (Solaris impl or Xfree impl)
+-
++  if test "x$enable_xinerama" = "xyes"; then
+   gtk_save_cppflags="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $x_cflags"
+   
+@@ -1241,6 +1245,7 @@ if test "x$gdktarget" = "xx11"; then
+          fi
+          ;;
+   esac
++  fi
+ 
+   # set up things for XInput
+ 
diff --git a/x11-libs/gtk+/gtk+-2.8.10.ebuild b/x11-libs/gtk+/gtk+-2.8.10.ebuild
index d5a1f20518ac..da89750fb40c 100644
--- a/x11-libs/gtk+/gtk+-2.8.10.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.10.ebuild,v 1.1 2006/01/13 01:10:14 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.10.ebuild,v 1.2 2006/01/14 20:30:38 dang Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc jpeg tiff"
+IUSE="debug doc jpeg tiff xinerama"
 
 RDEPEND="|| ( (
 			x11-libs/libXrender
@@ -20,7 +20,7 @@ RDEPEND="|| ( (
 			x11-libs/libXi
 			x11-libs/libXt
 			x11-libs/libXext
-			x11-libs/libXinerama
+			xinerama? ( x11-libs/libXinerama )
 			x11-libs/libXcursor
 			x11-libs/libXrandr
 			x11-libs/libXfixes )
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xextproto
 			x11-proto/xproto
 			x11-proto/inputproto
-			x11-proto/xineramaproto )
+			xinerama? ( x11-proto/xineramaproto ) )
 		virtual/x11 )
 
 	doc? (
@@ -77,6 +77,9 @@ src_unpack() {
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
 	epatch "${DISTDIR}"/${PN}-2-smoothscroll-r6.patch.bz2
 
+	# Make xinerama support optional
+	epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
+
 	# 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
@@ -102,6 +105,7 @@ src_compile() {
 	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"