[dev-games/irrlicht] 1.8.0_pre3993 for supertuxkart

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

7 files changed, 108 insertions, 89 deletions

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 2e2743b..25a8281 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,6 +1,5 @@
-AUX irrlicht-1.7.2-gcc46.patch 402 RMD160 ee6992b85c971502d9f7884e7ed81821f8e738f4 SHA1 02c7df9e7a99fd3b09e46690cf0b76a1b52bb566 SHA256 a942e9374e1182eec9ebb46f53b343cc050c26d02cfea3dd7027e318f50b9777
-AUX irrlicht-9999-config.patch 1504 RMD160 60dde9817954aa88b7471b77b76697df39d7d848 SHA1 e3cc90ec54a495220be5ae0eba03475227dbe5f5 SHA256 32610a2c1a5504df018c8e9e19782fd4ea90e2a3923cdf14903a845243f58171
+AUX irrlicht-1.8.0_pre3993-gcc46.patch 524 RMD160 e172646742a1dd190e95132f14db562558ca7ad2 SHA1 0b868dcd435b15bea14a53f59a1caa2739be94fd SHA256 b8e119408f3f5dbd8c9954e989e6b47cdcbe24cc932d3d063a92d8eb0714f7e7
+AUX irrlicht-1.8.0_pre3993-unbundle-libs.patch 3456 RMD160 36de256b79f1312e0e11597169474b33bffe1fe6 SHA1 57edee4ba9d9fca1107514c344bf2c328db043c6 SHA256 ac192cc6a057e533e08ed7e5f076f9ed5bac73873af852e31a3f829816bda561
 AUX irrlicht-9999-demoMake.patch 25660 RMD160 60bfdf9c62c0ab40d0fa5b82fd6ea6fe5a2fcc10 SHA1 7573071687ee30409b3c5b213d911c0be213034a SHA256 81ddd5da919ef94b428674e5f1b0acac8e5f23f25c63fcdac7ddcb58076d782f
-AUX irrlicht-9999-gentoo.patch 3524 RMD160 26b6a5fb26ff1c0bb10619c4151180ea1be00fd0 SHA1 2753eda80ad518c3efdaa04fe2903c2fc77ae1c1 SHA256 53f170c20738bbf8da3ae8e56bfc8ba0dead8a390deae9a16eabc8f0f59c6f34
-EBUILD irrlicht-1.8.0_pre3843.ebuild 1589 RMD160 3b052600d08eb29324b419a1d7c41d82f2076251 SHA1 62f478b4cc581505f76141ae2712b612a6d84b83 SHA256 92a8c1f84eb9a413863f65af266bc083e3a5d58fd3c56ae851d73217375b93a8
-MISC metadata.xml 371 RMD160 529100bef04026c08bbc8232d603a7fe699bfc7e SHA1 48b31081865011010b1b40b30f3e649f0724ff1d SHA256 1ee7dade98e7ee206d26b38b2c50cb59478cd5a7a9b37a4a863e7cff47bc707a
+EBUILD irrlicht-1.8.0_pre3993.ebuild 1761 RMD160 83191b5dfcfef4e7c84c8a2b1d7c129c8ba74846 SHA1 d69f843c9e5995fe4544ec7e25b58c73f847a614 SHA256 b9c9809caee784dfa290c255de798e5492b002a02fb0fcb6e2f08a1136bc5e3b
+MISC metadata.xml 350 RMD160 46a3b160fcdfb94db02ec63387fe56a6ea4797c8 SHA1 5520402cda6e341d8813c4177424d51627454125 SHA256 3bfcb5280cd6a49c5c15599a44a270956f74b22b32c2381861ef49b7a19daf97
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch b/dev-games/irrlicht/files/irrlicht-1.8.0_pre3993-gcc46.patch
index 39231ba..93dbb21 100644
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch
+++ b/dev-games/irrlicht/files/irrlicht-1.8.0_pre3993-gcc46.patch
@@ -1,6 +1,8 @@
---- ./source/Irrlicht/Makefile.orig
-+++ ./source/Irrlicht/Makefile
-@@ -75,7 +75,6 @@
+Index: source/Irrlicht/Makefile
+===================================================================
+--- source/Irrlicht/Makefile	(revision 3993)
++++ source/Irrlicht/Makefile	(working copy)
+@@ -84,7 +84,6 @@
  LIB_PATH = ../../lib/$(SYSTEM)

  INSTALL_DIR = /usr/local/lib

  sharedlib install: SHARED_LIB = libIrrlicht.so

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.0_pre3993-unbundle-libs.patch b/dev-games/irrlicht/files/irrlicht-1.8.0_pre3993-unbundle-libs.patch
new file mode 100644
index 0000000..19e55e5
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.0_pre3993-unbundle-libs.patch
@@ -0,0 +1,78 @@
+diff -Nuar irrlicht.work/include/IrrCompileConfig.h irrlicht.unbundle/include/IrrCompileConfig.h
+--- irrlicht.work/include/IrrCompileConfig.h	2011-11-15 14:30:32.574236293 +0600
++++ irrlicht.unbundle/include/IrrCompileConfig.h	2011-11-15 14:33:47.254243015 +0600
+@@ -244,7 +244,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.

+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.

+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */

+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_

++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_

+ #endif

+@@ -260,7 +260,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.

+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.

+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */

+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_

++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_

+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_

+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_

+ #endif

+@@ -588,7 +588,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib

+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is

+ defined. */

+-#define _IRR_USE_NON_SYSTEM_ZLIB_

++//#define _IRR_USE_NON_SYSTEM_ZLIB_

+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_

+ #undef _IRR_USE_NON_SYSTEM_ZLIB_

+ #endif

+@@ -609,7 +609,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the bzlib

+ installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is

+ defined. */

+-#define _IRR_USE_NON_SYSTEM_BZLIB_

++//#define _IRR_USE_NON_SYSTEM_BZLIB_

+ #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_

+ #undef _IRR_USE_NON_SYSTEM_BZLIB_

+ #endif

+diff -Nuar irrlicht.work/source/Irrlicht/Makefile irrlicht.unbundle/source/Irrlicht/Makefile
+--- irrlicht.work/source/Irrlicht/Makefile	2011-11-15 14:31:04.643237400 +0600
++++ irrlicht.unbundle/source/Irrlicht/Makefile	2011-11-15 14:37:05.787249868 +0600
+@@ -52,23 +52,20 @@
+ EXTRAOBJ =

+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \

+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \

+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \

+-	$(BZIP2OBJ) $(EXTRAOBJ)

++	$(IRRGUIOBJ) $(LIBAESGM) $(EXTRAOBJ)

+ 

+ ###############

+ #Compiler flags

+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

++CXXINCS = -I../../include

+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

+ ifndef NDEBUG

+ CXXFLAGS += -g -D_DEBUG

+-else

+-CXXFLAGS += -fexpensive-optimizations -O3

+ endif

+ ifdef PROFILE

+ CXXFLAGS += -pg

+ endif

+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

++CFLAGS := -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

+ 

+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC

+ sharedlib sharedlib_osx: CFLAGS += -fPIC

+@@ -84,7 +81,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)

+ INSTALL_DIR = /usr/local/lib

+ sharedlib install: SHARED_LIB = libIrrlicht.so

+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm

++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lbz2 -lGL -ljpeg -lpng -lXxf86vm -lz

+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include

+ 

+ #OSX specific options

diff --git a/dev-games/irrlicht/files/irrlicht-9999-config.patch b/dev-games/irrlicht/files/irrlicht-9999-config.patch
deleted file mode 100644
index 0c5ead9..0000000
--- a/dev-games/irrlicht/files/irrlicht-9999-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uNr irrlicht-9999_orig/include/IrrCompileConfig.h irrlicht-9999/include/IrrCompileConfig.h
---- irrlicht-9999_orig/include/IrrCompileConfig.h	2011-07-28 16:05:01.000000000 +0700
-+++ irrlicht-9999/include/IrrCompileConfig.h	2011-07-28 16:06:54.620321437 +0700
-@@ -244,7 +244,7 @@
- //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
-+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #endif
-@@ -260,7 +260,7 @@
- //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_LIB_PNG_
-+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
- #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
- #endif
-@@ -588,7 +588,7 @@
- /** If this is commented out, Irrlicht will try to compile using the zlib
- installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
- defined. */
--#define _IRR_USE_NON_SYSTEM_ZLIB_
-+//#define _IRR_USE_NON_SYSTEM_ZLIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
- #undef _IRR_USE_NON_SYSTEM_ZLIB_
- #endif
diff --git a/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch b/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch
deleted file mode 100644
index f73b504..0000000
--- a/dev-games/irrlicht/files/irrlicht-9999-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr irrlicht-9999_orig/source/Irrlicht/Makefile irrlicht-9999/source/Irrlicht/Makefile
---- irrlicht-9999_orig/source/Irrlicht/Makefile	2011-07-28 15:23:29.000000000 +0700
-+++ irrlicht-9999/source/Irrlicht/Makefile	2011-07-28 15:28:42.715922607 +0700
-@@ -40,11 +40,7 @@
- IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

--ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

--JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o

--LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o

- LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o

--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o

- 

- # Next variable is for additional scene nodes etc. of customized Irrlicht versions

- EXTRAOBJ =

-@@ -55,18 +51,16 @@
- 

- ###############

- #Compiler flags

--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

-+CXXINCS = -I../../include

- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

- CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

- ifndef NDEBUG

- CXXFLAGS += -g -D_DEBUG

--else

--CXXFLAGS += -fexpensive-optimizations -O3

- endif

- ifdef PROFILE

- CXXFLAGS += -pg

- endif

--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

-+CFLAGS := -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

- 

- sharedlib sharedlib_osx: CXXFLAGS += -fPIC

- sharedlib sharedlib_osx: CFLAGS += -fPIC

diff --git a/dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild b/dev-games/irrlicht/irrlicht-1.8.0_pre3993.ebuild
index 7476d76..4864f9e 100644
--- a/dev-games/irrlicht/irrlicht-1.8.0_pre3843.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.0_pre3993.ebuild
@@ -1,38 +1,38 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.5 2011/04/08 03:21:08 mr_bones_ Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils toolchain-funcs subversion
 
 DESCRIPTION="open source high performance realtime 3D engine written in C++"
 HOMEPAGE="http://irrlicht.sourceforge.net/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 ESVN_REPO_URI="https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk/"
-ESVN_REVISION=3843
+ESVN_REVISION=3993
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="debug examples"
 
 RDEPEND="virtual/jpeg
 	media-libs/libpng
 	app-arch/bzip2
+	sys-libs/zlib
 	virtual/opengl
+	x11-libs/libXxf86vm
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	app-arch/unzip
 	x11-proto/xproto
 	x11-proto/xf86vidmodeproto"
+#app-arch/unzip
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-gentoo.patch
-	edos2unix include/IrrCompileConfig.h
 	epatch \
-		"${FILESDIR}"/"${PN}"-9999-config.patch \
-		"${FILESDIR}"/${PN}-9999-demoMake.patch \
-		"${FILESDIR}"/${PN}-1.7.2-gcc46.patch
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-unbundle-libs.patch \
+		"${FILESDIR}"/${PN}-9999-demoMake.patch
 
 	sed -i \
 		-e 's:\.\./\.\./media:../media:g' \
@@ -44,17 +44,24 @@ src_prepare() {
 src_compile() {
 	cd source/Irrlicht
 	tc-export CXX CC AR
-	emake sharedlib staticlib || die "emake failed"
+	use !debug && config="NDEBUG=1"
+	# staticlib removed (static-libs USE?)
+	emake ${config} sharedlib || die "emake failed"
 }
 
 src_install() {
-	dolib.a lib/Linux/libIrrlicht.a || die
-	dolib.so lib/Linux/libIrrlicht.so* || die
+#	dolib.a lib/Linux/libIrrlicht.a || die
 	insinto /usr/include/${PN}
 	doins include/* || die
 	dodoc changes.txt readme.txt
-	if use doc ; then
+	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples media || die
 	fi
+	cd lib/Linux
+	ln -s libIrrlicht.so.1.8.0 libIrrlicht.so
+	ln -s libIrrlicht.so.1.8.0 libIrrlicht.so.1.8
+	dolib.so libIrrlicht.so* || die
+#   dolib.a lib/Linux/libIrrlicht.a || die
+
 }
diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml
index bf62230..bd5871b 100644
--- a/dev-games/irrlicht/metadata.xml
+++ b/dev-games/irrlicht/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
 <email>azamat.hackimov@gmail.com</email>
 <name>Azamat H. Hackimov</name>