Fix library symlinks on install

Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 84 insertions, 6 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index e95ab952d805..c12c0fb22b82 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.76 2015/06/09 13:26:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.77 2015/07/21 01:17:17 mr_bones_ Exp $
+
+*irrlicht-1.8.1-r1 (21 Jul 2015)
+
+  21 Jul 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +irrlicht-1.8.1-r1.ebuild, irrlicht-1.8.1.ebuild:
+  Fix library symlinks on install
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index d85a44ad9298..34c08291ff1d 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -4,6 +4,7 @@ AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b
 AUX irrlicht-1.8.1-jpeg-9a.patch 484 SHA256 ec5346a4f46f3cfbdd21932038e8eacfb267fc5b1fae114ab613188ded638fe1 SHA512 bc865101bf5315a445d09a03cddf25b90c68b06a27a514feefb9bb627320c7295c2f66c53492c4f47ad22e59c0278b6e9bc2381d371045b7766db13c09b80c01 WHIRLPOOL a0b6faa7f822fa7c400ade21d84142dc764662f2091ce9c449316dcd4091a66de5348a779447b77ab0c3a107e673cc0df0b9a7b1bef4a0fbe3b742c65e926a0a
 AUX irrlicht-1.8.1-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2
 DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd722227181d696eb63e82b4093aaadac132b
-EBUILD irrlicht-1.8.1.ebuild 1731 SHA256 012de9d1d8cbada09f8ea5b82a93b22fd8ab2a4bc860a1ebf1d0af158d78e8a0 SHA512 1467f267c0cff0b9afcf21b99fe66343b5b258861c0833428127288a03216e554dea40a13ef6c2f234c33e89deab5174e865b39ce8de6f3f73f490f4c093a247 WHIRLPOOL d1f95b52fcc569e96dcdeff7465f48da76c0afbf4fa546ee95601c0cca5a52477e08e31bdb421e2fad588fcfbd11ebd31cfd427e6aede90d883fb57ba86272dc
-MISC ChangeLog 12404 SHA256 f6cf9de86f78e1b2663e4e49695dc94ac6dac744485b070b57c5fcdcbcaf0e10 SHA512 6c61c1f16b9eb3653a8b6f0c98a350b46fffca94af0934ab65b935fcff1f6b1427bac19857edb402c1dc3c48ca19ff9e12dcdb2338f3a820c337a56ccab4740a WHIRLPOOL e9aa788eea7a1eff9f7f9175c531bf89c514cdc4eae1ae4f5d7ce250c9c0e8b280f2a09b0a532b858c564160b07b7aeb561fcd8482057530f3f7f97a22522d17
+EBUILD irrlicht-1.8.1-r1.ebuild 1740 SHA256 26ccf69026bae5d691d3786615c8561b803a4daebd8ca9e21699082b392167a9 SHA512 3cdd7bb82477946cacbf7aa3ba3a674df5653a25bbc67a0c924606a3f4c1b9e71181503733ee4f6816426debdd2ea6ce3c628a9fd1825c78647bc71389cd260d WHIRLPOOL 31929ec5b0150ef160d1adce5025c9e38feaf6554c606639863120143366a490a379e8111ca1a29c1bf464f8bec947c951cdcc90c684c6adfb5d5202c5394d34
+EBUILD irrlicht-1.8.1.ebuild 1737 SHA256 931de4cff3b3da0030c76373a4e22d0f75b9bc661a2017b53f49390bd2679977 SHA512 a54f91e8287ed0bfe29614a839e6afa7b6d3d726f2bf55ed6aeef76ad02d5b6454ef1f7f4ad7fba27d3d0d7abd140995cef76e5b24289daf8959936083a644b8 WHIRLPOOL 57c8b366647627bc8af90686658a039f99a01c0882ea2d546682f180e1797b949816104eaa5561c68231ed2ae1abf705b4d3282dc937f4188debd0588c3537de
+MISC ChangeLog 12585 SHA256 0eb47ae0efcdb3caefedb3856b121a8318349157dbfd0d2d26fb2bbe7ed082b3 SHA512 bf044eb47c500db31b5fa7dc915b726d1968220b9f6cecbe70e93b418cf35087c5f8b9a6b5d5678b445ed47dd1ce373e39494858814160ca4867e202be463343 WHIRLPOOL 3442532399fc647f6a235dae175f71fcf54caa50530b6c544469df1930d4000dda6ccdddbaeb6634413b893b8860467ab76d2ae463065a4fbcd073ad53fa1e36
 MISC metadata.xml 870 SHA256 394ae293a956d54c8bbe32cdf1064488c4fb3142b349ed7f03611353878000d4 SHA512 f7fc23c732bc61244e4712acd9f18c68ab4347ecd8af80291e81b8c694033bce6801050e623839337d52c8677da96c1aa511068c6d7032c80a82f8893b2eab6f WHIRLPOOL defd4f58de7a4930732f564c6c477d8efa94fa879d5ab4e33ab0253d9c11baffc32ca24f074262feadddf89adf6189a6cd07b02132ec3147cfec976de9534e2a
diff --git a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..901215492089
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild,v 1.1 2015/07/21 01:17:17 mr_bones_ 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 static-libs"
+
+RDEPEND="virtual/jpeg:0
+	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}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch \
+		"${FILESDIR}"/${P}-mesa-10.x.patch \
+		"${FILESDIR}"/${P}-jpeg-9a.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 $(usex static-libs "staticlib" "")
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	use static-libs && dolib.a lib/Linux/libIrrlicht.a
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.${PV} /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
+}
diff --git a/dev-games/irrlicht/irrlicht-1.8.1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
index 6c63d42ca66e..c98c83bdc3ce 100644
--- a/dev-games/irrlicht/irrlicht-1.8.1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1.ebuild,v 1.6 2015/02/21 12:26:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1.ebuild,v 1.7 2015/07/21 01:17:17 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -57,8 +57,8 @@ src_install() {
 	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
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
 
 	insinto /usr/include/${PN}
 	doins include/*