Fix building with SYMLINK_LIB=no #505760 by Georgi Georgiev. Sync the non-9999 and 9999 ebuild versions.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

5 files changed, 109 insertions, 25 deletions

diff --git a/sys-process/numad/ChangeLog b/sys-process/numad/ChangeLog
index eb4dfb533ffc..807b544b3d8e 100644
--- a/sys-process/numad/ChangeLog
+++ b/sys-process/numad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/numad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/ChangeLog,v 1.6 2014/01/20 07:50:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/ChangeLog,v 1.7 2014/04/23 19:49:02 vapier Exp $
+
+*numad-0.5-r2 (23 Apr 2014)
+
+  23 Apr 2014; Mike Frysinger <vapier@gentoo.org> +files/numad-0.5-ldlibs.patch,
+  +numad-0.5-r2.ebuild, numad-9999.ebuild:
+  Fix building with SYMLINK_LIB=no #505760 by Georgi Georgiev. Sync the non-9999
+  and 9999 ebuild versions.
 
 *numad-0.5-r1 (20 Jan 2014)
 
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index 166b1b9abf66..94012a337940 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0001-Fix-man-page-directory-creation.patch 722 SHA256 615a03c589a521a6e3ef812466504a3ada154b550acfd10238024dd9ecd63856 SHA512 e43609c3e6af1f01c886e707cd126126b9bbc8da98b8313e67d98909889f2c81d640db9bc999ca056611dc7792c8a0d3e9ecf9949b4c0a58d33e9bbe74b127ae WHIRLPOOL 9970336f2ce6bd10992ca999d25e425788f808ef1f1afe7f5a28bfa758887ad8e2964c847bb1f5b7939a9008ec70134c9eaec60ea9ddc228a6606e39212a33f9
+AUX numad-0.5-ldlibs.patch 912 SHA256 1f44a6d95a6abfa282ebf68d243e5139a72327ea03daa41218f34e9f3e308fda SHA512 7bd6e90617382080aaa217fa82c1b792d4b33b2dfc51ec43f3539e2b98eec1aa7fa8312e11fef97974d3ecd3f888a997a3c2b21ee980fc8ec4e74dd4bcdb6cbc WHIRLPOOL b3f0d3edad53b12e771a1b72d537ea17f1f1b8a60f13494416bffb52024884afabc7e813ba776d9bcfb6f88b21e53f72eccfc208b493fa1c89015922d94cd1c8
 DIST numad-0.5-334278f.tar.bz2 21007 SHA256 5a288f3597d616211f7ce7cc9e7e9e65c72f2360754ac02f9e0e17f86118ea9b SHA512 1b4a577f0713bae1386f2064fcb2dcbfb9453e23e7617f40cfff4e56d02a8c26a48c8d03f1ac7aa36e4ba168824572377f84bc669d1dabdc1820c2cdc4c57911 WHIRLPOOL e4ca9eeaccab3544d39e0a7ef812f1d2eca4269f5ee8466ee043dbdabc9e987b9393b4f3f3d5f6e1d898256179515ca52985e2e38c4afa27b84c4514e2e9259d
 EBUILD numad-0.5-r1.ebuild 1051 SHA256 524a97ac215942fa435a2e74c81c2e8913b80234cb41231c83782a4ecfc944d8 SHA512 6bc0154a7f2ef02510883b2001a04b357f0dbc342a1372d92e5e27b09d64bdaf60a9e1563d316d7876c5202f639eec43fbc721c7e0d10ffd2e807eb64fc3d701 WHIRLPOOL 0c884cc30acb72c7ee7e1a49febd4a134b87715b98ad4e970115faf09bb4053cd7823180dfe3605b8fb5ac77f0bb7b5060c4cebe05b54eef406b8908bc1b6f89
+EBUILD numad-0.5-r2.ebuild 1088 SHA256 70450fefb4db311c7f3ce796c12584e0b227d1c9791d4afd895bf92180cc146c SHA512 9cfd66520a2d4bff540b564241f3304f046ab44190df470ad881cb9c06939e490494c6b3355658a5c47504050d64543a1ecaaa3381621f3dab069e59d00a3012 WHIRLPOOL e43d32deced344c86af157959ea762e7aac98503b6bfcaaf23fc701c718d484bde33042ca420d4f58918c1ea58f659620d25ed7757dbcc3efd0bff5e55825cc7
 EBUILD numad-0.5.ebuild 977 SHA256 a0edce6c5d412a8129ac6886fb205a2f4f4428b2b6e0f85d139ba2ed7314a4b1 SHA512 bf84154d2bea39f38520f604166364c283cf1ae1a3bbde3e45d7707ffc6bbeacbf1e72483196487dcfb07249b00cb26b9683e18a77d37461cfdb63b6b86b4a10 WHIRLPOOL 2158905ada65776d95bbacc3390ebf7862147f30af10247b1d084a4e4f1c0116d5827df03e9763569921106fcc4a928232146fd6d0ff8223324c3aa8c8849164
-EBUILD numad-9999.ebuild 869 SHA256 52e44a1d017c69c36416f6a49d7bbd6c0efbce45a7c9720d4d960e1cd5645c4c SHA512 e9e4dc79d61fcf36ca8ed066f3b78ce00561fc4d91ab1f4f75eed7d43ee36025235c2548eff1502d442d07197dc294243afe9c85b03af49c448fd3f091d88e3c WHIRLPOOL 677d409ce2438e9c996eb0ed68e2c8e21c4b827f7b9e67edba83a75a2d2b3f3d4f048e2967a3a5a41410db3b5e7d6246ac830a7be4145f3b1f6f6d45f8faf705
-MISC ChangeLog 1112 SHA256 ccac734eefd2700611c2154fefb639268442481cd0228b53a84cbdb93995241d SHA512 35ca1fd4a3674ccc415509411de5b623a4fa9a2f090aaeb5de51b58cbd442061b2f27081df77cec62a87ccdeb54f93e5a1c35c550576287702d678890bf7a1eb WHIRLPOOL 759209b15c53196af6f77deb4c7038df3228a850e47dd786fba35f4433f4c872c389e50e01b860d5f52e4e79299fa03498adc43f1268e25dccb6d9801ce4fbf7
+EBUILD numad-9999.ebuild 844 SHA256 73bd169c5b6c2235becf9cc0d23e91bb7c91b1b18a2c9e4d1b4a14bf549f8848 SHA512 b5a1a56246ba854e5efd3ab9b69208c8ada3ca69a3bfc12ee78f0c95ca564f646e1ab1bd16e33afbfbf3e4ea80b9b44c2a6d35c72ac4b436ab3a62331145acd8 WHIRLPOOL cca275cab0626018545389c83ab8ce9b1accc790cb8808325373ad05f6e868363700f7dafba29a59877c5a43229f5d37ff2aa87c619c93fe8c4eb944ddc56438
+MISC ChangeLog 1377 SHA256 de20f6b62c3e207f2a57dd452d5e53e091b797859ce21e0855986ffd75a71296 SHA512 17369374f1d0a8a466c44f6c07e53eab193a7e53fa3558f170cb84c88c2f6baa873f429ff7d0f403ea2802a99ee2d6497b4475682e23c107ba2c3f199531630d WHIRLPOOL 291bef8d24d84f632cf3b556ec6e17e6b4631bc0c0b6baa906381849bd731a5498e674f93420fb7850b9e00da6ddc1e8ea7c1bbf091a8938e1024c883db11cd3
 MISC metadata.xml 266 SHA256 084dbf6adc603187bfa06a12821cd08d75348686c3625c280c56efa8509a6381 SHA512 a5af4b32a5c2d985829e5d8df45eafbfcccd907270e4172657cee347adb735d0c76dfc40e34e408d6a4c81ae3b22defbac63ee342e0042cc26b5edc0f0397ec5 WHIRLPOOL 90d7c21661ad0aaeb5486e56d37230c9c65771fa1288fa55a0016b84f2f1316ff459621ecf51f30790dc96f5364184b4c3d408dc37dff578cfc37b94b9a3051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS3NU2AAoJELnU8jG9FVirqF0P/ihD25zE3QNfk4R5IVxiFDTA
-5b/jrizqNC3FrVYbzQcwRC9VE/pxLUxCM/hZhl8Tu4vSpcqtD59LyrtbnSVrHh4c
-Rlsy/OOY1nJzeQoJ+P74dl6tTxGizi5MqeXn0kUvcJrFvxCXPOwBTI0xwCTOZR73
-XCtaatumIp0n9PckQJPh29ljk6MyGilmdwgGMX+c03ATR9F7S5jngXSjC8+ekigm
-0JuIe5Vvqicm7BJJ1QZLsOhgkxu/moekK8x7CJX0LC/pS5dASmebJP7bmyRrUnpo
-ZJEZ4emsT+/cE4w4ttB+NIH2hySmtZZqXR2evJjTblWIKOKStAOJpNr7/R/f65Ie
-faqvNCcVNg5sZPeOPwjyBHoVSU+0QCTJwqfG/0LJceN5zHc4LTSbtLtcYs1vwSIz
-PZ4hVICR0tM8JJM/Em3+tP+KKcqYkj1pCYlmjm5NP6fRqKRWSYuvAKrwEuYmstyA
-QHnJVfI5le388peMJ6/pCIpVrTyxpITusLGV9P8paUIsc0Apbg3SRsMNimQo1bgY
-SiGC/PBXfSuU4Cede+AN9xMrm56fx2HtAEe4jWeA89Lk6a4KTA794JFDBRz3sq5N
-9ydFNmhC5A3tneFS8RQJOH2kXlZxHj0GpvbEC8zO6606+1vWjYgJevJDlgJyeosP
-d/GvA7F9w2ErUlnBD5W0
-=vxlJ
+iQIcBAEBCAAGBQJTWBkzAAoJEPGu1DbS6WIAt6QQAIdC2ZkufOoGDZJZHdhfLDSN
+pqd27SLvEpCWBGSRZsTqUi97uQ+Iv8jhgKdsDJ4g9dDpCphT0bfO12djS0uAnqCV
+EQCCEyfAg72gbsM+CIfHol5/vp/44qBctGQKFaR/D76F0xFfw+eVhs/504sMsvpv
+IG3fZ2yNeNYdI9PWdbGAOg10OjJXy3Beaz7urjd5q4DAv5UXwzhTCewUYcUJmdOq
+elR5ywx8dlPX4HAs67h98FzwshMpuL+th95FzLLRlSfoFe5rqOSsnGI0mDZltB3R
+LXMUfdaWltHCA/wtSNdxpBgLu7oL8nuLX5vYBoG2r0M3HXGC/uJ6xpoHeCWG6IMp
+f3V+sOhj0081zaoqb0Bmn7oiMbdmZQbDIh89SJ+JgdmsF+Tt7JM4KbqgI0ObVMqT
+BQ5Zd0GQVGdXK5GTZUvJYUi8PaS30NxUpng/mTJOsBjMQjEe0+aJz7Dsjd06zeml
+G8/iNyWIdvjfOMFqbLOqbdzhLrjOPmHNt6gU1YJSmoi8+pAnEYzkn/zMLLaRUjNT
+jtBiDQPtnVnq+DeIuAWeyCDS/ScIo+fAGZEqQzcpxOjRqukBYI63vuXwLWSWo063
+RngzhqAifoUJWQM6y1564sep2ql6QX+w4a8CRjxwsyq9i24Ea1As572/j+yu69E9
++ZmTCak59bvcd2ABgeg1
+=pZte
 -----END PGP SIGNATURE-----
diff --git a/sys-process/numad/files/numad-0.5-ldlibs.patch b/sys-process/numad/files/numad-0.5-ldlibs.patch
new file mode 100644
index 000000000000..d124e32e9ee4
--- /dev/null
+++ b/sys-process/numad/files/numad-0.5-ldlibs.patch
@@ -0,0 +1,34 @@
+From 9eb3cc5c51d846c8c8b750a4eb55545d7b5fea6c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 23 Apr 2014 15:41:26 -0400
+Subject: [PATCH] use LDLIBS for linker flags
+
+When you put -lfoo into the dependency line of make, it forces it to
+search /lib and /usr/lib for files to link against.  This can cause
+problems when trying to cross-compile or build for different ABIs.
+Use the standard LDLIBS variable instead.
+
+URL: https://bugs.gentoo.org/505760
+Reported-by: Georgi Georgiev <chutzimir@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f3838b4..f2e9a6e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,8 @@ docdir := ${prefix}/share/doc
+ 
+ all: numad
+ 
+-numad: numad.o -lpthread
++LDLIBS := -lpthread
++numad: numad.o
+ 
+ AR ?= ar
+ RANLIB ?= ranlib
+-- 
+1.9.2
+
diff --git a/sys-process/numad/numad-0.5-r2.ebuild b/sys-process/numad/numad-0.5-r2.ebuild
new file mode 100644
index 000000000000..a1db5c2cbb2a
--- /dev/null
+++ b/sys-process/numad/numad-0.5-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-0.5-r2.ebuild,v 1.1 2014/04/23 19:49:02 vapier Exp $
+
+EAPI=5
+
+inherit linux-info toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://git.fedorahosted.org/numad.git"
+	inherit git-2
+else
+	HASH="334278ff3d774d105939743436d7378a189e8693"
+	SRC_URI="http://git.fedorahosted.org/git/?p=numad.git;a=snapshot;h=${HASH};sf=tbz2 -> numad-0.5-${HASH:0:7}.tar.bz2"
+	KEYWORDS="~amd64 -arm -s390 ~x86"
+	S="${WORKDIR}/${PN}-${HASH:0:7}"
+fi
+
+DESCRIPTION="The NUMA daemon that manages application locality"
+HOMEPAGE="http://fedoraproject.org/wiki/Features/numad"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="~NUMA ~CPUSETS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Fix-man-page-directory-creation.patch
+	epatch "${FILESDIR}"/${PN}-0.5-ldlibs.patch #505760
+	tc-export CC
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -std=gnu99"
+}
+
+src_install() {
+	emake prefix="${ED}/usr" install
+}
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index c80d2bb32736..3676e6f2ccdb 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-9999.ebuild,v 1.3 2014/01/20 07:50:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-9999.ebuild,v 1.4 2014/04/23 19:49:02 vapier Exp $
 
 EAPI=5
 
-inherit git-r3 linux-info toolchain-funcs
+inherit linux-info toolchain-funcs eutils
 
-if [[ ${PV} = "9999" ]]; then
-	inherit git-2
+if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.fedorahosted.org/numad.git"
-	KEYWORDS=""
+	inherit git-2
 else
 	SRC_URI=""
 	KEYWORDS="~amd64 ~x86 -arm -s390"
@@ -25,9 +24,7 @@ IUSE=""
 CONFIG_CHECK="~NUMA ~CPUSETS"
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${FILESDIR}" \
-		epatch
-
+	epatch "${FILESDIR}"/0001-Fix-man-page-directory-creation.patch
 	tc-export CC
 }