Fixed modular X dependencies and closing bug #121091.

(Portage version: 2.1_pre4-r1)

13 files changed, 35 insertions, 240 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 695f680d7f6d..8f4df93a6d15 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.14 2005/12/02 17:16:20 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.15 2006/02/10 16:13:28 wolf31o2 Exp $
+
+  10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/0.7.1-opengl.patch, -files/irrlicht-0.10.0-opengl.patch,
+  -files/0.7.1-jpeg.patch, -files/0.7.1-system-libs.patch,
+  -irrlicht-0.7.1.ebuild, -irrlicht-0.10.0.ebuild, -irrlicht-0.11.0.ebuild,
+  irrlicht-0.12.0.ebuild, irrlicht-0.14.0.ebuild:
+  Fixed modular X dependencies and closing bug #121091.
 
 *irrlicht-0.14.0 (02 Dec 2005)
 
diff --git a/dev-games/irrlicht/files/0.7.1-jpeg.patch b/dev-games/irrlicht/files/0.7.1-jpeg.patch
deleted file mode 100644
index 152a226553d5..000000000000
--- a/dev-games/irrlicht/files/0.7.1-jpeg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CImageLoaderJPG.cpp.orig	2003-12-12 19:46:00.000000000 +0100
-+++ CImageLoaderJPG.cpp	2004-02-23 02:32:05.000000000 +0100
-@@ -44,1 +44,1 @@
--u8 CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)

-+boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)

---- CImageLoaderJPG.h.orig	2003-12-20 14:21:00.000000000 +0100
-+++ CImageLoaderJPG.h	2004-02-23 02:32:48.000000000 +0100
-@@ -67,1 +67,1 @@
--	static u8 fill_input_buffer (j_decompress_ptr cinfo);

-+	static boolean fill_input_buffer (j_decompress_ptr cinfo);

diff --git a/dev-games/irrlicht/files/0.7.1-opengl.patch b/dev-games/irrlicht/files/0.7.1-opengl.patch
deleted file mode 100644
index 6e82ef74be0a..000000000000
--- a/dev-games/irrlicht/files/0.7.1-opengl.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- CVideoOpenGL.cpp.orig	2004-01-02 00:40:54.697754952 -0500
-+++ CVideoOpenGL.cpp	2004-01-02 00:40:16.800516208 -0500
-@@ -0,0 +1,2 @@
-+#define GL_GLEXT_LEGACY
-+#define GL_GLEXT_PROTOTYPES
diff --git a/dev-games/irrlicht/files/0.7.1-system-libs.patch b/dev-games/irrlicht/files/0.7.1-system-libs.patch
deleted file mode 100644
index a86a62c29a79..000000000000
--- a/dev-games/irrlicht/files/0.7.1-system-libs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	2004-09-08 19:04:52.000000000 +0200
-+++ Makefile	2004-09-12 09:29:21.967216112 +0200
-@@ -7,14 +7,10 @@
- LIBS =  -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lXxf86vm -lz -ljpeg
- CXXINCS = -I"include/"
- BIN  = libIrrlicht.a
--CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-+CXXFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- 
- all: $(LINKOBJ) $(BIN)
--	make -C jpeglib -f makefile.ansi libjpeg.a
--	make -C zlib -f Makefile
- 	cp libIrrlicht.a ../../lib/Linux/
--	cp zlib/libz.a ../../lib/Linux
--	cp jpeglib/libjpeg.a ../../lib/Linux
- 
- clean:
- 	rm -f $(LINKOBJ) $(BIN)
diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.10.0 b/dev-games/irrlicht/files/digest-irrlicht-0.10.0
deleted file mode 100644
index 6688111c1ec9..000000000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 027244998de45944aa80f81f3f7fde55 irrlicht-0.10.0.zip 13540616
diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.11.0 b/dev-games/irrlicht/files/digest-irrlicht-0.11.0
deleted file mode 100644
index d83cde6861b7..000000000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 adec31a372f7636c4ee9fcb68169bbb3 irrlicht-0.11.0.zip 13598541
diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.7.1 b/dev-games/irrlicht/files/digest-irrlicht-0.7.1
deleted file mode 100644
index ab67d39272be..000000000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.7.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1c0da1e5c2393e450403a8c6213ed708 irrlicht-0.7.zip 11998051
-MD5 e418b935206bd0aeccd54811099ce0e5 irrlicht-0.7.1.zip 3630149
diff --git a/dev-games/irrlicht/files/irrlicht-0.10.0-opengl.patch b/dev-games/irrlicht/files/irrlicht-0.10.0-opengl.patch
deleted file mode 100644
index 1b642f6e1ab2..000000000000
--- a/dev-games/irrlicht/files/irrlicht-0.10.0-opengl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix compiling error:
-COpenGLDriver.cpp: In member function `void irr::video::COpenGLDriver::loadExtensions()':
-COpenGLDriver.cpp:357: error: `glXGetProcAddress' undeclared (first use this function)
-COpenGLDriver.cpp:357: error: (Each undeclared identifier is reported only once for each function it appears in.)
-make: *** [COpenGLDriver.o] Error 1
-
-Patch by Chris Statzer.
-
-http://bugs.gentoo.org/87015
-
---- COpenGLDriver.cpp
-+++ COpenGLDriver.cpp
-@@ -2,6 +2,7 @@
- 
- #include "IrrCompileConfig.h"
- #ifdef _IRR_COMPILE_WITH_OPENGL_
-+#define glXGetProcAddress glXGetProcAddressARB
- 
- #include "COpenGLTexture.h"
- #include "COpenGLMaterialRenderer.h"
diff --git a/dev-games/irrlicht/irrlicht-0.10.0.ebuild b/dev-games/irrlicht/irrlicht-0.10.0.ebuild
deleted file mode 100644
index 732f18ebb032..000000000000
--- a/dev-games/irrlicht/irrlicht-0.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.10.0.ebuild,v 1.1 2005/06/07 03:33:04 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
-	mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl
-	virtual/x11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/source
-	unzip -qo source.zip || die "unpacking source.zip"
-	rm -f source.zip
-	cd Irrlicht
-	rm -r zlib jpeglib libpng
-	sed -i -e 's:zlib.zlib\.h:zlib.h:' CZipReader.cpp || die "zlib sed"
-	sed -i -e '/include/s:jpeglib/::'  CImageLoaderJPG.h || die "jpeg sed"
-	sed -i -e '/include/s:libpng/::'   CImageLoaderPNG.cpp || die "png sed"
-	sed -i -r \
-		-e '/^CXXFLAGS/s:=:+=:' \
-		-e '/^LINKOBJ/s:(zlib|jpeglib|libpng)/[^.]+\.o::g' \
-		Makefile || die "sed objs"
-
-	# stupid nvidia / xorg GL differences
-	if echo -e '#include <GL/glx.h>\nglXGetProcAddress blah;' | \
-	   $(tc-getCC) -E - | \
-	   grep -q glXGetProcAddressARB
-	then
-		epatch "${FILESDIR}"/${P}-opengl.patch
-	fi
-}
-
-src_compile() {
-	emake -C source/Irrlicht || die "emake failed"
-}
-
-src_install() {
-	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
-	insinto /usr/include/${PN}
-	doins include/* || die "doins failed"
-	dodoc changes.txt readme.txt
-	if use doc ; then
-		cp -r examples media "${D}"/usr/share/doc/${PF}/ || die "cp failed"
-	fi
-}
diff --git a/dev-games/irrlicht/irrlicht-0.11.0.ebuild b/dev-games/irrlicht/irrlicht-0.11.0.ebuild
deleted file mode 100644
index 67d12297a4c6..000000000000
--- a/dev-games/irrlicht/irrlicht-0.11.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.11.0.ebuild,v 1.2 2005/09/01 03:49:58 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
-	mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl
-	virtual/x11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/source
-	unzip -qo source.zip || die "unpacking source.zip"
-	rm -f source.zip
-	cd Irrlicht
-	rm -r zlib jpeglib libpng
-	sed -i -e 's:zlib.zlib\.h:zlib.h:' CZipReader.cpp || die "zlib sed"
-	sed -i -e '/include/s:jpeglib/::'  CImageLoaderJPG.h || die "jpeg sed"
-	sed -i -e '/include/s:libpng/::'   CImageLoaderPNG.cpp || die "png sed"
-	sed -i -r \
-		-e '/^CXXFLAGS/s:=:+=:' \
-		-e '/^LINKOBJ/s:(zlib|jpeglib|libpng)/[^.]+\.o::g' \
-		Makefile || die "sed objs"
-
-	# stupid nvidia / xorg GL differences
-	if echo -e '#include <GL/glx.h>\nglXGetProcAddress blah;' | \
-	   $(tc-getCC) -E - | \
-	   grep -q glXGetProcAddressARB
-	then
-		epatch "${FILESDIR}"/${PN}-0.10.0-opengl.patch
-	fi
-}
-
-src_compile() {
-	emake -C source/Irrlicht || die "emake failed"
-}
-
-src_install() {
-	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
-	insinto /usr/include/${PN}
-	doins include/* || die "doins failed"
-	dodoc changes.txt readme.txt
-	if use doc ; then
-		cp -r examples media "${D}"/usr/share/doc/${PF}/ || die "cp failed"
-	fi
-}
diff --git a/dev-games/irrlicht/irrlicht-0.12.0.ebuild b/dev-games/irrlicht/irrlicht-0.12.0.ebuild
index e46a6cc57443..b78dd6380183 100644
--- a/dev-games/irrlicht/irrlicht-0.12.0.ebuild
+++ b/dev-games/irrlicht/irrlicht-0.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.12.0.ebuild,v 1.1 2005/09/01 05:12:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.12.0.ebuild,v 1.2 2006/02/10 16:13:28 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,9 +18,18 @@ RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib
 	virtual/opengl
-	virtual/x11"
+	|| (
+		(
+			virtual/glu
+			x11-libs/libX11	)
+		 virtual/x11 )"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+	|| (
+		(
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto )
+		 virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-games/irrlicht/irrlicht-0.14.0.ebuild b/dev-games/irrlicht/irrlicht-0.14.0.ebuild
index aecd06bf10b9..8cc6e45d440b 100644
--- a/dev-games/irrlicht/irrlicht-0.14.0.ebuild
+++ b/dev-games/irrlicht/irrlicht-0.14.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.14.0.ebuild,v 1.2 2005/12/03 20:06:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.14.0.ebuild,v 1.3 2006/02/10 16:13:28 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,9 +18,18 @@ RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib
 	virtual/opengl
-	virtual/x11"
+	|| (
+		(
+			virtual/glu
+			x11-libs/libX11	)
+		 virtual/x11 )"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+	|| (
+		(
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto )
+		 virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-games/irrlicht/irrlicht-0.7.1.ebuild b/dev-games/irrlicht/irrlicht-0.7.1.ebuild
deleted file mode 100644
index c47c96d0290d..000000000000
--- a/dev-games/irrlicht/irrlicht-0.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.7.1.ebuild,v 1.3 2005/03/29 02:43:47 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/irrlicht/irrlicht-0.7.zip
-		mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/jpeg
-	sys-libs/zlib
-	virtual/opengl
-	virtual/x11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	mv irrlicht-0.7/{include,media,examples} ${P} || die "mv failed"
-	cd "${S}/source"
-	unzip -qo source.zip || die "unpacking source.zip"
-	rm -f source.zip
-	cd Irrlicht
-	rm -rf zlib jpeglib
-	ln -s /usr/include jpeglib
-	ln -s /usr/include zlib
-	epatch "${FILESDIR}/${PV}-system-libs.patch" || die "system libs patch failed"
-	epatch "${FILESDIR}/${PV}-jpeg.patch" || die "JPEG patch failed"
-	epatch "${FILESDIR}/${PV}-opengl.patch" || die "OpenGL patch failed"
-}
-
-src_compile() {
-	emake -C source/Irrlicht || die "emake failed"
-}
-
-src_install() {
-	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
-	insinto /usr/include/${PN}
-	doins include/* || die "doins failed"
-	dodoc changes.txt readme.txt
-	if use doc ; then
-		cp -r examples media "${D}/usr/share/doc/${PF}/" || die "cp failed"
-	fi
-}