Fix from Togge for proper multilib paths #179447.

Package-Manager: portage-2.1.3.7

4 files changed, 32 insertions, 22 deletions

diff --git a/sys-apps/initng/ChangeLog b/sys-apps/initng/ChangeLog
index 5a0c9b80aae6..3a91f793ef70 100644
--- a/sys-apps/initng/ChangeLog
+++ b/sys-apps/initng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/initng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/ChangeLog,v 1.42 2007/08/25 17:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/ChangeLog,v 1.43 2007/08/25 17:59:38 vapier Exp $
+
+  25 Aug 2007; Mike Frysinger <vapier@gentoo.org> initng-0.6.10.1.ebuild,
+  initng-9999.ebuild:
+  Fix from Togge for proper multilib paths #179447.
 
 *initng-0.6.10.1 (25 Aug 2007)
 
diff --git a/sys-apps/initng/Manifest b/sys-apps/initng/Manifest
index 470743ee31b5..766c4e5b4fb7 100644
--- a/sys-apps/initng/Manifest
+++ b/sys-apps/initng/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST initng-0.6.10.1.tar.bz2 709412 RMD160 479090067e04ec13d00d91e6df9ba9532ede6add SHA1 7b9599fbbc11abdd10c44c2b13ac6fa9ef4cc92d SHA256 23ea60f0e8ba83ad153a64111b84832497920632a7360bf7a658a32426afa4ba
-EBUILD initng-0.6.10.1.ebuild 1943 RMD160 2b7b6d6cead896c1b311a142fbdc660cf2fac6af SHA1 bacb62d2e7bbf7cb6bb1fc306697bd8e9d4644a8 SHA256 ec2172c7c81bfde9b3fc65ced762a43873c7dd485566bc5b10d86e346a337c33
-MD5 1db33b98f4ace39ec09643d9e91c93d6 initng-0.6.10.1.ebuild 1943
-RMD160 2b7b6d6cead896c1b311a142fbdc660cf2fac6af initng-0.6.10.1.ebuild 1943
-SHA256 ec2172c7c81bfde9b3fc65ced762a43873c7dd485566bc5b10d86e346a337c33 initng-0.6.10.1.ebuild 1943
-EBUILD initng-9999.ebuild 1836 RMD160 f980acb8558380d1c01c201d56843bbb74ef556f SHA1 b271275c1130b18a5d33323bdfadfeabae1fd7a4 SHA256 88240808c664fb6834b124e2d01ece2b86da5ef893092b6ad42ded63cacdfe50
-MD5 d94f1dabdf6ae1aa613d9e44517019da initng-9999.ebuild 1836
-RMD160 f980acb8558380d1c01c201d56843bbb74ef556f initng-9999.ebuild 1836
-SHA256 88240808c664fb6834b124e2d01ece2b86da5ef893092b6ad42ded63cacdfe50 initng-9999.ebuild 1836
-MISC ChangeLog 5834 RMD160 5b25f07dce2a98986f5ce7038dfac27d7360febe SHA1 53a3cec245f66106babe7dd9d869109dc310b263 SHA256 6c3d70f040c2daf94128fff07350ba41f7c4f8e9b368831cfcd8afd8cc6ca2fb
-MD5 fb344516b24b33f367850d9fa4771dff ChangeLog 5834
-RMD160 5b25f07dce2a98986f5ce7038dfac27d7360febe ChangeLog 5834
-SHA256 6c3d70f040c2daf94128fff07350ba41f7c4f8e9b368831cfcd8afd8cc6ca2fb ChangeLog 5834
+EBUILD initng-0.6.10.1.ebuild 1997 RMD160 deb6daae81ce57f038fdb33cb2b992a651a215a2 SHA1 093cf48910142bb8670a33bc9ce4b79bb311bce3 SHA256 0ab4b002afbf268424cbbd04703bbafe46e4d86909826bb2508bc2312f0373ce
+MD5 09dd8846bd022e661138c894ac31cb7b initng-0.6.10.1.ebuild 1997
+RMD160 deb6daae81ce57f038fdb33cb2b992a651a215a2 initng-0.6.10.1.ebuild 1997
+SHA256 0ab4b002afbf268424cbbd04703bbafe46e4d86909826bb2508bc2312f0373ce initng-0.6.10.1.ebuild 1997
+EBUILD initng-9999.ebuild 1891 RMD160 99e0641ed318e7f1438aac9c772e9c6cd98d4a22 SHA1 102444a56d5ee576e4497cc8f18fc7367c6121df SHA256 24a6a88536ad0059026480069d4229c678b429d908d3f302cb65472181a48f88
+MD5 500519ff110ca5035f67ce5aa653e0b0 initng-9999.ebuild 1891
+RMD160 99e0641ed318e7f1438aac9c772e9c6cd98d4a22 initng-9999.ebuild 1891
+SHA256 24a6a88536ad0059026480069d4229c678b429d908d3f302cb65472181a48f88 initng-9999.ebuild 1891
+MISC ChangeLog 5983 RMD160 6d650ffa4f42e586bc74d642a31a40798ec0f69b SHA1 392ecc7339b025652bed5adb5fdbeacdefb04580 SHA256 0fbc266c5b7939e7658944d72580ba34fb9c5659e1a2e0e57ff7441ba5fdba9e
+MD5 8072fdb8b4f0b51ba97fb3b28f077db2 ChangeLog 5983
+RMD160 6d650ffa4f42e586bc74d642a31a40798ec0f69b ChangeLog 5983
+SHA256 0fbc266c5b7939e7658944d72580ba34fb9c5659e1a2e0e57ff7441ba5fdba9e ChangeLog 5983
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -27,7 +27,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0G2Kp/wUKkr7RBoRAjNOAJ9WW3Z0yXLzm86Y61V1ODwxbUn7vACeP+PO
-OiWf7aRPvPB4WDf08F3HG8A=
-=lC0w
+iD8DBQFG0G5dp/wUKkr7RBoRAlFlAJ0TYMrM3mo95gfiy3ZFQj0NO0/LGgCgov66
+DLxM2o0il2PzU0Gydd5l3/g=
+=hSMP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/initng/initng-0.6.10.1.ebuild b/sys-apps/initng/initng-0.6.10.1.ebuild
index 6a7ce77ca18a..46a59cb9b666 100644
--- a/sys-apps/initng/initng-0.6.10.1.ebuild
+++ b/sys-apps/initng/initng-0.6.10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-0.6.10.1.ebuild,v 1.1 2007/08/25 17:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-0.6.10.1.ebuild,v 1.2 2007/08/25 17:59:38 vapier Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A next generation init replacement"
 HOMEPAGE="http://initng.org/"
@@ -50,7 +50,10 @@ src_compile() {
 			cmake_opts="${cmake_opts} -D${x}=OFF"
 		fi
 	done
-	cmake -DCMAKE_INSTALL_PREFIX=/ ${cmake_opts} || die
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/ \
+		-DLIB_INSTALL_DIR=/$(get_libdir) \
+		${cmake_opts} || die
 	emake || die
 }
 
diff --git a/sys-apps/initng/initng-9999.ebuild b/sys-apps/initng/initng-9999.ebuild
index 8f0149be502d..172bb8ebd107 100644
--- a/sys-apps/initng/initng-9999.ebuild
+++ b/sys-apps/initng/initng-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-9999.ebuild,v 1.11 2007/06/24 18:06:38 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-9999.ebuild,v 1.12 2007/08/25 17:59:38 vapier Exp $
 
 ESVN_REPO_URI="http://svn.initng.org/initng/trunk"
 ESVN_PROJECT="initng"
-inherit subversion
+inherit subversion multilib
 
 DESCRIPTION="A next generation init replacement"
 HOMEPAGE="http://initng.org/"
@@ -48,7 +48,10 @@ src_compile() {
 			cmake_opts="${cmake_opts} -D${x}=OFF"
 		fi
 	done
-	cmake -DCMAKE_INSTALL_PREFIX=/ ${cmake_opts} || die
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/ \
+		-DLIB_INSTALL_DIR=/$(get_libdir) \
+		${cmake_opts} || die
 	emake || die
 }