Look for xineramaproto, not panoramix. Reported by steev.

(Portage version: 2.0.51.22-r2)

6 files changed, 42 insertions, 6 deletions

diff --git a/x11-apps/xdpyinfo/ChangeLog b/x11-apps/xdpyinfo/ChangeLog
index 5abd05bbed4f..82cde8809af4 100644
--- a/x11-apps/xdpyinfo/ChangeLog
+++ b/x11-apps/xdpyinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xdpyinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.3 2005/08/20 22:49:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.4 2005/08/22 08:05:46 spyderous Exp $
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xineramaproto.patch, xdpyinfo-0.99.0.ebuild:
+  Look for xineramaproto, not panoramix. Reported by steev.
 
   20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xdpyinfo-0.99.0.ebuild:
diff --git a/x11-apps/xdpyinfo/files/xineramaproto.patch b/x11-apps/xdpyinfo/files/xineramaproto.patch
new file mode 100644
index 000000000000..0bb0ec58171a
--- /dev/null
+++ b/x11-apps/xdpyinfo/files/xineramaproto.patch
@@ -0,0 +1,12 @@
+diff -urN xdpyinfo-0.99.0.orig/configure.ac xdpyinfo-0.99.0/configure.ac
+--- xdpyinfo-0.99.0.orig/configure.ac	2005-08-01 13:15:17.000000000 -0700
++++ xdpyinfo-0.99.0/configure.ac	2005-08-22 01:03:37.000000000 -0700
+@@ -82,7 +82,7 @@
+ 	AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>])
+ 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+ 
+-PKG_CHECK_MODULES(XINERAMA, panoramixproto xinerama, 
++PKG_CHECK_MODULES(XINERAMA, xineramaproto xinerama, 
+ 	[SAVE_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $XINERAMA_CFLAGS"
+ 	AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>])
diff --git a/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
index 060e8b26260a..88fbf51bdc49 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild,v 1.3 2005/08/20 22:49:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild,v 1.4 2005/08/22 08:05:46 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
+PATCHES="${FILESDIR}/xineramaproto.patch"
+
 DESCRIPTION="X.Org xdpyinfo application"
 KEYWORDS="~sparc ~x86"
 RDEPEND="x11-libs/libXext
diff --git a/x11-libs/libXinerama/ChangeLog b/x11-libs/libXinerama/ChangeLog
index 25d1900f20cc..b2c4866dcd16 100644
--- a/x11-libs/libXinerama/ChangeLog
+++ b/x11-libs/libXinerama/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libXinerama
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.4 2005/08/20 22:51:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/ChangeLog,v 1.5 2005/08/22 08:02:57 spyderous Exp $
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xineramaproto.patch, libXinerama-0.99.0.ebuild:
+  Look for xineramaproto, not panoramix. Reported by steev.
 
   20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   libXinerama-0.99.0.ebuild:
diff --git a/x11-libs/libXinerama/files/xineramaproto.patch b/x11-libs/libXinerama/files/xineramaproto.patch
new file mode 100644
index 000000000000..7697430effb1
--- /dev/null
+++ b/x11-libs/libXinerama/files/xineramaproto.patch
@@ -0,0 +1,12 @@
+diff -urN libXinerama-0.99.0.orig/configure.ac libXinerama-0.99.0/configure.ac
+--- libXinerama-0.99.0.orig/configure.ac	2005-08-01 13:15:28.000000000 -0700
++++ libXinerama-0.99.0/configure.ac	2005-08-22 00:58:55.000000000 -0700
+@@ -33,7 +33,7 @@
+ AC_PROG_LIBTOOL
+ 
+ # Check for dependencies
+-PKG_CHECK_MODULES(DEP, x11 xext xextproto panoramixproto)
++PKG_CHECK_MODULES(DEP, x11 xext xextproto xineramaproto)
+ 
+ AC_SUBST(DEP_CFLAGS)
+ AC_SUBST(DEP_LIBS)
diff --git a/x11-libs/libXinerama/libXinerama-0.99.0.ebuild b/x11-libs/libXinerama/libXinerama-0.99.0.ebuild
index e758161c6c36..098f3eb2d9aa 100644
--- a/x11-libs/libXinerama/libXinerama-0.99.0.ebuild
+++ b/x11-libs/libXinerama/libXinerama-0.99.0.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-0.99.0.ebuild,v 1.4 2005/08/20 22:51:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-0.99.0.ebuild,v 1.5 2005/08/22 08:02:57 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
+PATCHES="${FILESDIR}/xineramaproto.patch"
+
 DESCRIPTION="X.Org Xinerama library"
 #HOMEPAGE="http://foo.bar.com/"
 #SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"