fix missing linkage (nonfatal for the build though, but breaks consumers)

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 140 insertions, 3 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 17eaa7ce0170..2f3aa4b677e6 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.62 2013/03/06 18:01:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.63 2013/03/06 18:47:08 hasufell Exp $
+
+*irrlicht-1.8-r2 (06 Mar 2013)
+
+  06 Mar 2013; Julian Ospald <hasufell@gentoo.org> +irrlicht-1.8-r2.ebuild,
+  +files/irrlicht-1.8-r2-gentoo.patch:
+  fix missing linkage (nonfatal for the build though, but breaks consumers)
 
 *irrlicht-1.8-r1 (06 Mar 2013)
 
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index b13826be5a69..5e6804167edd 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,7 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX irrlicht-1.8-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
 AUX irrlicht-1.8-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
 AUX irrlicht-1.8-gentoo.patch 3432 SHA256 45dd91f42f88677f475d466a02c786e3d8e0729fb7da8e8285584f1e33729f2f SHA512 3a4b7a16ce6900e9afef9fdc2fdcd766155d593febc85093da840e683a1c147dc5a664e9581a87b5707fa36deb9e749c2daeb5e4d9929af07f4429dc5518d1af WHIRLPOOL 3bc3e9817958bb0f1c8816bb92ef1639b6a98280c0a34c758e4da3a2e255e03c234b2884927ffef05c92d640d92c109646e6a6f93c6c4d9a031390a16f5fd5af
+AUX irrlicht-1.8-r2-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
 DIST irrlicht-1.8.zip 23674513 SHA256 f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 SHA512 07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 WHIRLPOOL b021cc06fb216a9add40ad70beac22f41f2902f0b053713491c80057c04f05f9f45e19c282c109850235d7db89675ffaa7f5170b0b83f2b8918a0915ee43837d
-EBUILD irrlicht-1.8-r1.ebuild 1580 SHA256 1e68a5658aef655b59244d13abbc77fd75013342804ddc8e0d180bede5fbb54f SHA512 bb1fdd5b4a6997255ba5ffe568cfdc7a073581eead486cb266a226e87e11819021e9fb8f8bb0a126cd90c377f4650e512d00776810e0847ef65b89f1f15d2e50 WHIRLPOOL 47751af95447682803149ff77dda632f800ede00e5de3d5da3b25d0492df41fbaef88993066451c11c208edfb169a328011798d749188995d10fcc86d44c9002
-MISC ChangeLog 10269 SHA256 910087ddae7af0b6db9a97d32dedf569d393e975f70b8b934f68d8957ec382b1 SHA512 6e1c438f0a08ac8181f2d57e1110ed275866cb9f7c7d90cf469e6f3ba8db30a67254f79c98ddec0485eb6ed2fed3bbd97a3cd3c60d334d68fb36552a73c5cf47 WHIRLPOOL 944e97ff1e5b66723a3d44bcecb043ecbf8542892743df8fd88f94f8aef6cd8da6045097245c24100ef2d9870fc201b493c7fb3b16528903ee2cdc8d8e8b2bce
+EBUILD irrlicht-1.8-r1.ebuild 1588 SHA256 426996ce55fecb76565abfb5e48a82b312a8fb8402f8b3f41d4208ac2ca2b06b SHA512 6d972660c36548d20f84dab0893ddce034fa6b93c72fa4caaf69c6432561d5bebc9d81f44f533ebbd8b8eee6a44f7b68be4017254eb4b1426b8967de71a6ba47 WHIRLPOOL 9201b3e8f7ac982532fac7f4c79cd3789b5a0138e22e1ebea7ab539e1e66d6446b03372a55fb26bf966023f9d5609070204fc046dea458f271d45c712c497dea
+EBUILD irrlicht-1.8-r2.ebuild 1607 SHA256 211eeea3ccfa7ed0e4dd29bbdbd1c4c48bdaf8afb6e60f12996c7ab5f4f42c58 SHA512 54d7b16b7afa5ec10b36737aff20ad51c5c391cc2986791fc271e88e45df1e9959d2971f3126bde58ea2fd1836ed746cf0696aaf343b5b3d93b1e5c4cc800434 WHIRLPOOL f6c26e54b4e705b007775e04f1fa038e3c64c63e7e716b422a3cfccd823f42797facbc28e9d2f3a2c3432f67166b59e9b18a5e0c7e6f611fa8a71242299eff29
+MISC ChangeLog 10492 SHA256 f93f3805d8bc823c6701440976e028d8b6b3c6cffabdbc229472e7a30d323f84 SHA512 173481498e3ace9c0b5456a17c3102c3b66fb2d3c34ae823455c22b030195560ab78355c98857393f81e7366ce67b9b8830f474b44de8fc9cdea99bd46ebfdcd WHIRLPOOL 4227c60981fff06f0f448e6641b8c0076e46b6842fc087c582c389ccd64dc0dfc6519b64c35614d3995d3a8182a381a2e6a91f69e2c21199c9b9b9ebd6a0d512
 MISC metadata.xml 790 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc SHA512 d4006cf3f5afcb96934d074360aaa49e35249ecf346965bd170704947ae6a194ef6daa8f4bff7cf473bbbab4f658f978a5398e3a1efda8ce034314637903719a WHIRLPOOL 6cc67212be3a7109e97e0fa471f83ea6d73e01d5ac49f45e62b89d6dbd28d2e861d4179a22f5a7ac53fe0835c7b9d92d2d22c56e9b07a8ac72b189db1e318d0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRN48wAAoJEFpvPKfnPDWzk3cH/2zTfLBj/QKg45uf784jBuM3
+hgszFFUCTAiNfl5NS2WAEWzf31bFbOvpeBscuXTXfGBUJfr69YASDlwqa5dmGHyt
+ZyKMJ1alehl/t5MbOMm3BSQTdXwE4VpOdL8R0HjF0yoYQo7ZsNrBhvQSHAfK6JFx
+yHRNM17A5vDc5GbGQQqaGvEjfjbsBzeMQdY4bqHtack7lWMs7+G6cKMj+P7POgyx
+6Snp7pbCCjSuf/4uG4QzFZIRXVrXAbfqyPiMA6zUrbLlPf3MRSo7VwDWq+FRcJ/0
+j4lQaURoReYFZd8Ze76ds8dNOK6qvzhkxgWvJQ3OuKkMOYb0GnzV1RHMQHtwv78=
+=OtZd
+-----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch
new file mode 100644
index 000000000000..ccbf2cfb921e
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch
@@ -0,0 +1,46 @@
+--- source/Irrlicht/Makefile

++++ source/Irrlicht/Makefile

+@@ -46,11 +46,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 =


+@@ -61,18 +57,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


++CXXFLAGS += -Wall -fno-exceptions -fno-rtti


+ ifndef NDEBUG


+-CXXFLAGS += -g -D_DEBUG


+-else


+-CXXFLAGS += -fexpensive-optimizations -O3


++CXXFLAGS += -D_DEBUG


+ 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


+@@ -88,7 +82,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) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz


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


+ 


+ #OSX specific options


diff --git a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild
new file mode 100644
index 000000000000..f7f993958837
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8-r2.ebuild,v 1.1 2013/03/06 18:47:08 hasufell Exp $
+
+EAPI=5
+inherit eutils multilib 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"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc"
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng:0
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	edos2unix include/IrrCompileConfig.h
+
+	epatch \
+		"${FILESDIR}"/${PF}-gentoo.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch
+
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake NDEBUG=$(usex debug "" "1") sharedlib staticlib
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	dolib.a lib/Linux/libIrrlicht.a
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so
+
+	insinto /usr/include/${PN}
+	doins include/*
+
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media
+	fi
+}