Fix libNL SONAME #407785 by Alain B.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 78 insertions, 5 deletions

diff --git a/dev-games/hawknl/ChangeLog b/dev-games/hawknl/ChangeLog
index e0a9dce79253..74b26ad92d6d 100644
--- a/dev-games/hawknl/ChangeLog
+++ b/dev-games/hawknl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/hawknl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.11 2010/09/10 10:01:59 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/ChangeLog,v 1.12 2012/03/12 16:38:44 vapier Exp $
+
+*hawknl-1.68-r2 (12 Mar 2012)
+
+  12 Mar 2012; Mike Frysinger <vapier@gentoo.org> +hawknl-1.68-r2.ebuild,
+  files/hawknl-1.68-build.patch:
+  Fix libNL SONAME #407785 by Alain B.
 
   10 Sep 2010; Tupone Alfredo <tupone@gentoo.org> hawknl-1.68-r1.ebuild,
   files/hawknl-1.68-build.patch:
diff --git a/dev-games/hawknl/Manifest b/dev-games/hawknl/Manifest
index c02d4ddb104c..16cb3acd5af7 100644
--- a/dev-games/hawknl/Manifest
+++ b/dev-games/hawknl/Manifest
@@ -1,5 +1,26 @@
-AUX hawknl-1.68-build.patch 1535 RMD160 ab6e5e4a45de6da41e6b2cc623f5f1b40b1f449e SHA1 4f946d465b27a1b9abc3ec36eca300b4068a6607 SHA256 87e0cd935c844de9c274c22964467d646db1692f52ccf37fbdacd44619d9ba72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX hawknl-1.68-build.patch 1538 RMD160 16365cc9ada9280d866456a46aeec5b44c7e6a77 SHA1 917fbdb05dc756afc910f6f08a844c0ccd1c5276 SHA256 57650e91bdfc190df3b7f37b9f38491bc72b5698758ce54dc473941570a5e61e
 DIST HawkNL168src.tar.gz 181263 RMD160 2e61a171eb4afbac75ce1b27b455a971ee885ad9 SHA1 561af0b414dae3d01cac9dfbfd86bbe3422b8318 SHA256 31a2883dbfe02937c9c862bb1aac0b89e465bbab822513c06bffa3f13e4c3c2e
 EBUILD hawknl-1.68-r1.ebuild 1154 RMD160 5df0fb9e2470aec41ac4141b3eca6cecedfe90da SHA1 6f83be9c67ac183cc550c6dc4ef9f173351cbc43 SHA256 9d60f2c244c7cb5a72789bf8573c90974a105b532b4f4ac9a40f371e03e09c51
-MISC ChangeLog 1471 RMD160 255191e6cc1bfe56b7bcd689cc1300d793b2f617 SHA1 a10228b5e332fe996a8048c383df662c6058a6f6 SHA256 f10be1204ab89956af4bfff9bdacd19585c9ac7405e6e10769a36181290304af
+EBUILD hawknl-1.68-r2.ebuild 1155 RMD160 5f56082699949bde4e05d3c015e3035fb21d3f32 SHA1 7e48d5aaed580b67f5d00b0c68a085574764c270 SHA256 f0f7975beda91c7347a8a50d4a334e5212a7665487202252dcd6d9bcba91957a
+MISC ChangeLog 1649 RMD160 b90d6721cd8da6a635bf5bf77b2588e26b25f8ca SHA1 1fd7a16eaad41b6cc50f1c295b23d5971de1358a SHA256 1ead6536f6cca013f95c390c8305c9e1430d6d483ddaaf5b915f02013fce93e3
 MISC metadata.xml 1049 RMD160 331307be76dd6bab947c0d1777182fc1ce33703f SHA1 a5892fbf17bc1cedcb200e316e685252d2d9500b SHA256 9d9de03edb9a4e60d7cc9c4b0283512fe44cd8bface16e4a66ce519ed02aa56c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPXiaeAAoJELEHsLL7fEFWTU8P/3o5mVPFGAr7qe+Xc0HYSn5/
+YJGQADSZRYTtq4aba2VxG6YM5pvp8sHwaGnQQajhbyjfJx1rH+caV9m7X4yV9wgD
+hRWQASV+2E0oasnpGUVZv9l7x45fz9hLJQJok+7cZIwkXFoJuPpu3ftra34KN9N6
+OkNf9Y4GTn821nB8tvDJuflNpY1L3VTgobUkf4C5E8TTg0leDuVydkidzCrgV01H
+2JfDNvI0sQ6+eL66lX58KaJPiuTxJndExqFH4OYMuFvT/H/2NnmwihL1VjiSRhR4
+jORchVvR27R7EnSHDW0c6KU3+yOs3r1AoWvzn025zTBl8DUxv0KzuB2tWAOUrYeo
+XRkX9U7sc/A6NsYK7/15p/LRqJYu2i3gVu5sFwrW9uQ2MTXSaxmaQ3od4F92ulRi
+qj7GTiRW6dDCNcwOPvFIGfM7zgqOkP+ugf21P4HxV6J0Xm+TOE+TIgdSLtRWW7pz
+qQtgARwU6lZxp2Ww7qaZT19P0byjM9kVDDartbsd2aWJC9HKbF9wviuHqR+MULQ+
+ZE2qQIl7dyoOr7SrMieCzgLi25GbTNqMvgDhIndeopDF/JofknDseGiu6pStc1vo
+2Zm2R1BzZ4ZP8QZZiqTcUCNWslDeQuLqtpyBA2QdOG5iuojsf0Hwnz+ESEiaPlaI
+WMKHRcST7sP8RUFoaKii
+=2c9p
+-----END PGP SIGNATURE-----
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
index cf9b609f0ee0..d94daaaf6d88 100644
--- a/dev-games/hawknl/files/hawknl-1.68-build.patch
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -26,7 +26,7 @@
  OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT

  CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)

 -LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread

-+LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread

++LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread

  OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o

  

  all: $(OBJECTS)

diff --git a/dev-games/hawknl/hawknl-1.68-r2.ebuild b/dev-games/hawknl/hawknl-1.68-r2.ebuild
new file mode 100644
index 000000000000..45c4e59407fa
--- /dev/null
+++ b/dev-games/hawknl/hawknl-1.68-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation, 2004 Richard Garand <richard@garandnet.net>
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68-r2.ebuild,v 1.1 2012/03/12 16:38:44 vapier Exp $
+
+EAPI=2
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="A cross-platform network library designed for games"
+HOMEPAGE="http://www.hawksoft.com/hawknl/"
+SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/hawknl${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i \
+		-e '/echo /d' src/makefile.linux \
+		|| die "sed src/makefile.linux failed"
+}
+
+src_compile() {
+	emake -C src -f makefile.linux \
+		CC="$(tc-getCC)" \
+		OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT" \
+		|| die "emake failed"
+}
+
+src_install() {
+	make -C src -f makefile.linux \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		INCDIR="${D}/usr/include" \
+		install \
+		|| die "make install failed"
+	if use doc ; then
+		docinto samples
+		dodoc samples/* || die "dodoc failed"
+	fi
+}