Respect multilib properly

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

4 files changed, 24 insertions, 15 deletions

diff --git a/net-dialup/accel-ppp/ChangeLog b/net-dialup/accel-ppp/ChangeLog
index 522941fbd3ce..4a7d67beaa65 100644
--- a/net-dialup/accel-ppp/ChangeLog
+++ b/net-dialup/accel-ppp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/accel-ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.6 2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.7 2014/06/05 08:09:28 pinkbyte Exp $
+
+  05 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> accel-ppp-1.7.4.ebuild,
+  accel-ppp-1.7.9999.ebuild:
+  Respect multilib properly
 
 *accel-ppp-1.7.4 (03 Jun 2014)
 
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 1081c91b62ec..c224c2c9bb21 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -7,18 +7,18 @@ AUX accel-ppp.initd 1323 SHA256 91343ed26c05e11a5c54b9a55716160e09bb12e508229581
 DIST accel-ppp-1.7.3.tar.bz2 1489289 SHA256 bc6eb6e94603b8584976369d9c40a5b430614b54b57368e8656374145ad94059 SHA512 d15e1adc8cecab92a6259901d960e6e23bb7be0be257609b2e2bdeb69e3a0ea925d33c161afff1557fb0955928501c64eb0d5db4d4f744364979eef650b6fe56 WHIRLPOOL 5b75674c735adbe02dd66568c603c657513b773d30dda5a8e5cc9219fe89472b05fdf0d923c019ce6478cdc86c5f39317fcc930c0e288853f86e42e8bbcaab36
 DIST accel-ppp-1.7.4.tar.bz2 1496145 SHA256 981b36ed8a6ae1a50dde2e8f70de9a31888b479757930fb98a811b9f410425d3 SHA512 b503d6ca6a24bb93254a978477f43fea966aacd27b73cfa9c8f2bdab5e945549ee76fb385d337c60711d6a10c6d2f72b1a0f3d3d2c30a4ea3259b90a3dabff89 WHIRLPOOL 4b46f55ae783b283be72f1f0daa9d7061e4105e447a17be83b936e7bef9f90dede956bcd649541a2548de6e6b6f82fa677b55c08dc6375c49e054d6325ad2dab
 EBUILD accel-ppp-1.7.3.ebuild 1912 SHA256 e6fa546dbe218ce1dea62d41be30854fec28c4938077bf137fd1add13286ec3f SHA512 9a013efab0e82cba9de473133907b877579ded348791b7c90eb642e89cc5e4557d57cba84fd1c748f04bc9e9f8d3b45db0db8e221e4f20f03458b8b4eb70a35c WHIRLPOOL 84c6d769f7a38754372f125b9848b114540fbdfe4a26090ba1e4dc2c6688d0e5d301422b394b6b0154f88337ba022060b479df86d969a2b1175f41c7e04e772c
-EBUILD accel-ppp-1.7.4.ebuild 1841 SHA256 0d4b638d48c38fa70e0320de8ca857be51289f4c004d6635b14b7f1568a448be SHA512 4f4f13345eb7bcd877bbcdbd65be8e20cee7d1ba5a1f5d75fb9e99d65b1af69fdb6f1f04e38fadb2dab425315d248d3909b7028b6073d2cf2e6605e629c30567 WHIRLPOOL c7c54847f0f861b711b55e15b0bf955d3033ab9cd4b446ca340973b86b2d0dc44fc19599874fb9eab9253495223fd2ded55c78fb9be2ca100a2a231a7e46a1a2
-EBUILD accel-ppp-1.7.9999.ebuild 1843 SHA256 421eb57684edf628ab3b5543022db2abb2208daaff685f5c381d23c232340942 SHA512 8c11bec689c9a8fd355e00aa39e4c06e2d028b9fe36aaa74faa7f61e464c70af7a57545031b61fb1b9c22710f6cf70f4cf5448a48b3424fdee8ca628dce9d243 WHIRLPOOL 6284a7cccf85e8c75faab789a6ff05032c7da57c27753e4e7fea8f6bdfddb3988ccaef13d8ef37e0f5d9c6ba5e4ac316d3afdc0035a8216f6fd1d446003f4e93
-MISC ChangeLog 1381 SHA256 6c8fa455a70610e8b637c821fd0118dea239e245106df81b2b44095975656148 SHA512 a5e6c64bdf018b7b241e010f7f8d112b5d1854e40ec60c6c9780b0302d4401a7fb852b1ec6825b7dbc7c033a6ee8a2c2122c8908eeee7e92f447ae2a75a6bafe WHIRLPOOL f5aed5169c692dd5292ac4b3fc78e1c1d97ae4c8c0bef4ef4e93100466de67bb3e3a3ac8a0f46cdf0adfab820e6de8c323b02fcc544d868b5373724073b5ffda
+EBUILD accel-ppp-1.7.4.ebuild 1916 SHA256 5cac6503f5d37c8c0f6192857ced348ba42ddda0cdc2bd39e1bb37eddcf682ac SHA512 ce2d2c776971e53e4e0179ce6b8f4806c5385140d428c6e22893861558640f13727e52797bc9b226940854d0a83740cc5067dfd630f529d256ecb7f6a1916b76 WHIRLPOOL a93546cb0e6c6abf107236b1a54ba0e4db072bd2e7060f47142f0fd1a89efbcadc5961aa7318af90efbc908fc8ca71f360d3005beca057a7b4fb7224b099a177
+EBUILD accel-ppp-1.7.9999.ebuild 1974 SHA256 20e4093b945dd56c500ec3be3eb8af1d0b0fb8006aa8f6ccf32785ee9f6e92db SHA512 1cb954133d9e8d4d34d26ad04b742cdc5b39d5781789e4965c820bb3b42e43027d33d98387f3dbb06f9cc00215c52eb3f8f3de1731704c3d545854ca04399a3b WHIRLPOOL 5681dcbf0d430bfc59b369e59af8b581607700f14964d4077825efa5b44d67da5ffa96bd222b64427f190fed16a3a25676ffbb89ea7e2f140204397f2b079664
+MISC ChangeLog 1513 SHA256 3497e90cfc370a4ace4f5339aced63c06d4bcb9bce57539d97355a6fccd63879 SHA512 2678f52abc99b11e310b80bd0f970109339ea9111181259bf190f64864f8c6cbfdb17eae05006a1685b65124260db0cc7d45e76700ff095a2fd74edc97412d3b WHIRLPOOL cca321270cd1b03b6067d69b1940b6a3da00fea9beff3064ac8a449b8d1fe1783f85610baf6a097ef86f8b5488511b1b228c5e26ceb98f78947a9c909e74a2f3
 MISC metadata.xml 387 SHA256 c07e1a86e24c4bf8e1a04448c27e69ebd45a382ee581b438faa913fb09b22d33 SHA512 2b01ec6fe938919e5882b917dd7ac26f445d1d37c423b45545b84550874ba31351688c63dd8e5607a10f02c175f82c48f36f22a37ce18b169e812aa29f6acba9 WHIRLPOOL c8b3089d874878ad5e967afab27fa74504ec117ce5c36b1027b230ceeaefa530465f6a58a934bb7063e567f508badf9b14904cb0808abeec216095d982a31f94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTjYJpAAoJECo/aRed9267IAQIALbfJnULzI9GDn9Zwapr1gcx
-DeMpAeRB3FPW563y/VZFtNGma+EsI9nTEE5cSiUjdLdFYoW1omvIkwnc2VUam4GS
-ksF2Pv1ITgPT1Ubbt4zq0TBPXV17E2kfypZJ8kJtKp9T0wfdG2t0AvmZb6Yc8qxN
-2SpBD9DagPJ6Fd6lxX5ffth2ZjQdJU9hWY76BAyaQaD0/NWbykrQDVxvfTiPsVAw
-XdQiDnkMevPpM5ifw70s2y1zmooE9o1rX/B4YML45VR7yZbFZZtCPLDuUkDJv01q
-h1XFBxAg3WVn05mYL1T1ZahwGJs/ZdcWyoejyP8kaOHcA6sqvgyZw+MamKSNrbM=
-=ztBk
+iQEcBAEBCAAGBQJTkCWWAAoJECo/aRed9267HG0H/iFdipYYMrLJb9WLwkvb6PDm
+ZzIe0Bk7aJy4IctKxP23cI2zndeXNQTN8yGjtZm9MI7N4HocZB096zUPaXLFv2tn
+SR2qrzcjtREoZ/P8g1zerHHVKw1VYxQsnVzR7AHkozGD8djPpiSr7AKUp8PYoHSU
+/JL3AclrEcUnoimevZpZhuA+a0aeTDjzG/RUVvSCTNK0DKhVuT+SoK8qMMn3fbxz
+LxVBkeIIMaj3xnF8Fng1xwYab6qw0M/R62snVKnPizwk16UZf4xwfWCwUZ2SHQ0s
+DNUvKGFuSmueSKrK9BGNTecbA7mxHaZR6DXUWmTAt4f9CaUILzADm61ZL6doq3c=
+=WwPj
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild
index a9da54310de9..5668de92c2c7 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.1 2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.2 2014/06/05 08:09:28 pinkbyte Exp $
 
 EAPI=5
 
-inherit cmake-utils linux-info
+inherit cmake-utils linux-info multilib
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
@@ -38,8 +38,10 @@ src_prepare() {
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
 		-DBUILD_DRIVER=FALSE
 		-DCRYPTO=OPENSSL
 		$(cmake-utils_use debug MEMDEBUG)
diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild
index 2c5bd989358c..d5406382aaa7 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.4 2014/06/03 08:08:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.5 2014/06/05 08:09:28 pinkbyte Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp"
 EGIT_BRANCH="1.7"
-inherit cmake-utils git-r3 linux-info
+inherit cmake-utils git-r3 linux-info multilib
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
@@ -32,6 +32,7 @@ src_prepare() {
 		-e "/echo/d" \
 		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
 
+	# TBF shaper is obsolete by upstream, so it's disabled
 	sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \
 		accel-pppd/extra/CMakeLists.txt || die 'sed on accel-pppd/extra/CMakeLists.txt failed'
 
@@ -39,8 +40,10 @@ src_prepare() {
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
 		-DBUILD_DRIVER=FALSE
 		-DCRYPTO=OPENSSL
 		$(cmake-utils_use debug MEMDEBUG)