Fixed multilib handling, bug #205454.

Package-Manager: portage-2.1.4.1

5 files changed, 55 insertions, 51 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index fb91858cf691..725e17aa8533 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/kicad
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.29 2007/12/12 11:08:52 leio Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.30 2008/02/09 12:09:49 calchan Exp $
+
+  09 Feb 2008; Denis Dupeyron <calchan@gentoo.org> kicad-20070115.ebuild,
+  kicad-20070525.ebuild, kicad-20070702.ebuild:
+  Fixed multilib handling, bug #205454.
 
   12 Dec 2007; Mart Raudsepp <leio@gentoo.org> kicad-20070115.ebuild,
   kicad-20070525.ebuild, kicad-20070702.ebuild:
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index dd05e1594c7e..1fa05e9cbcc9 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,8 +5,8 @@ DIST kicad-2007-07-02.tgz 62664384 RMD160 7f80fc895ab8f737216d88a61100acb089869b
 DIST kicad-20070115.tar.bz2 11653448 RMD160 3ca516324aabb8fd7b6038fba34603298bf612de SHA1 21d2e865c064173d8b346386b4ba7c9800fd383d SHA256 0c9cfb0241714207498a71122570e453389d977ad33942bac68cec154cfbed35
 DIST kicad-20070525.tar.bz2 11075020 RMD160 96c019dfb9437d967d001a5343bcae2c4e9dea11 SHA1 df7fb34bf0ee2358633479cc6c98319afe9c3901 SHA256 cc5e776671a293ab8b67843957ec35a3820803556e5ff778b636e841b390a2d1
 DIST kicad-20070702.tar.bz2 11115678 RMD160 af141117d233c91ae930b8839cbd3cf4a997c821 SHA1 6cbc4c7e9259210a49d5cc252e12e800aac59e62 SHA256 91238183d588164397579fd3ff4b5531ffcd82d7d5fd36dd4ef5b2172aafeabc
-EBUILD kicad-20070115.ebuild 3402 RMD160 549ab2543bdd422b31693ce5dff3b8f69b28a86b SHA1 b7b4ca5b76788dc1acbecc23e0c1b17969421425 SHA256 7329058f81e55d1a2f0d2c5ea65712ce96443bd154592708d249901ee1fe3df6
-EBUILD kicad-20070525.ebuild 3864 RMD160 429603656becd37e3ff4b9ef018afe93286ece9a SHA1 bef4c5923d532a7e5ccdc318247bc05a3afdd5ad SHA256 141fb4f30008a7398954215a03e8eb9b52706e4fe14774fc8259ccf6795186f2
-EBUILD kicad-20070702.ebuild 3937 RMD160 fddf1c5c3cc11aa7d00a1a77b5370e8677bdcedd SHA1 0c7febb05c4cdd7cf42a0a3032dd1f99f0b11521 SHA256 45d3d3c91fb0873e2589fe13ec6d7bf582ef7c529b48ae0ab65261d1347a21ac
-MISC ChangeLog 4459 RMD160 59f0edb4e5c7289699831dc5d5c51a00578d646a SHA1 4f7f9732679e27e96391e4bcec2b2cd01c399198 SHA256 8da197eb21c366498a9ad43384318010ce4333604ad95da183316c01b47ea246
+EBUILD kicad-20070115.ebuild 3534 RMD160 2000e2423659686cad6bbd409a21aaec0f821318 SHA1 347dd42f08a639213df32212cbfb34c4fa8657a8 SHA256 cd1c7b9f60eaaf7b1e23d80bb9116d8fe5b72a934f1476478e02a5b69de4abf1
+EBUILD kicad-20070525.ebuild 3996 RMD160 78084688b5b57ba3e6425783a6757b7a11fb6d01 SHA1 b22be659a1b698e91bb8b1fba66a0e5aa1710904 SHA256 ff00e446014b4393a54caef84d107be5a5342b5093e2f52be7a1e49f190ee6c8
+EBUILD kicad-20070702.ebuild 4069 RMD160 0c133b1d13d141ed978ff65177811c1b4397190f SHA1 1a865933ea3e74b1ebff0a4610e823e358c268b6 SHA256 b98e50a625df3d90a2d73b0f42a16ad68da031440c855bd3234db165533d18aa
+MISC ChangeLog 4625 RMD160 f20e2c3ab31d52f0d5e55128000a0b03cf2e2058 SHA1 d214fe8eae7b5639a6375761d97e95f9cb77b387 SHA256 5f91ab217dc4f8df4dbc5acbaef3631f4677f5afac25edff89239c7168d0d33a
 MISC metadata.xml 339 RMD160 edfadf44bb7c0a6049e40379258ccfbe89b74b5f SHA1 387abeb29f7e875057901f84b2bdb77c4f942c2e SHA256 311ce02a24351429c5d83af4292d0b8fa315ffde140ba06ac64e6bf3c233d173
diff --git a/sci-electronics/kicad/kicad-20070115.ebuild b/sci-electronics/kicad/kicad-20070115.ebuild
index ac49f9dc39ce..973d8c0c4664 100644
--- a/sci-electronics/kicad/kicad-20070115.ebuild
+++ b/sci-electronics/kicad/kicad-20070115.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.12 2007/12/12 11:08:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.13 2008/02/09 12:09:49 calchan Exp $
 
-inherit wxwidgets
+inherit wxwidgets multilib
 
 UPSTREAM_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 DESCRIPTION="Electronic schematic and PCB design tools."
@@ -50,33 +50,33 @@ src_compile() {
 
 src_install() {
 	# kicad doesn't use the autotools yet
-	exeinto /usr/lib/${PN}/linux
+	exeinto /usr/$(get_libdir)/${PN}/linux
 	doexe eeschema/eeschema
 	doexe pcbnew/pcbnew
 	doexe cvpcb/cvpcb
 	doexe kicad/kicad
 	doexe kicad/minizip/minizip
 	doexe gerbview/gerbview
-	exeinto /usr/lib/${PN}/linux/plugins
+	exeinto /usr/$(get_libdir)/${PN}/linux/plugins
 	doexe eeschema/plugins/netlist_form_pads-pcb
 	newicon kicad_icon.png kicad.png
-	make_wrapper kicad "/usr/lib/${PN}/linux/kicad"
+	make_wrapper kicad "/usr/$(get_libdir)/${PN}/linux/kicad"
 	make_desktop_entry kicad Kicad kicad.png "Application;Engineering;Electronics"
 
 	# kicad requires everything to be in the same place
-	cp -pPR library "${D}"/usr/lib/${PN}
-	cp -pPR internat "${D}"/usr/lib/${PN}
-	cp -pPR template "${D}"/usr/lib/${PN}
-	cp -pPR help "${D}"/usr/lib/${PN}
+	cp -pPR library "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR internat "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR template "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR help "${D}"/usr/$(get_libdir)/${PN}
 	if ! use minimal ; then
-		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/lib/${PN}
+		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/$(get_libdir)/${PN}
 		if use doc ; then
-			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/$(get_libdir)/${PN}
 		fi
 		if use examples ; then
-			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/$(get_libdir)/${PN}
 		fi
 	fi
 	dodoc author.txt copyright.txt news.txt contrib.txt version.txt
diff --git a/sci-electronics/kicad/kicad-20070525.ebuild b/sci-electronics/kicad/kicad-20070525.ebuild
index f309d03f5839..5bd52d2ce6d5 100644
--- a/sci-electronics/kicad/kicad-20070525.ebuild
+++ b/sci-electronics/kicad/kicad-20070525.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070525.ebuild,v 1.7 2007/12/12 11:08:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070525.ebuild,v 1.8 2008/02/09 12:09:49 calchan Exp $
 
-inherit wxwidgets
+inherit wxwidgets multilib
 
 UPSTREAM_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 DESCRIPTION="Electronic schematic and PCB design tools."
@@ -56,33 +56,33 @@ src_compile() {
 
 src_install() {
 	# kicad doesn't use the autotools yet
-	exeinto /usr/lib/${PN}/linux
+	exeinto /usr/$(get_libdir)/${PN}/linux
 	doexe eeschema/eeschema || die "Installation failed"
 	doexe pcbnew/pcbnew || die "Installation failed"
 	doexe cvpcb/cvpcb || die "Installation failed"
 	doexe kicad/kicad || die "Installation failed"
 	doexe kicad/minizip/minizip || die "Installation failed"
 	doexe gerbview/gerbview || die "Installation failed"
-	exeinto /usr/lib/${PN}/linux/plugins
+	exeinto /usr/$(get_libdir)/${PN}/linux/plugins
 	doexe eeschema/plugins/netlist_form_pads-pcb || die "Installation failed"
 	newicon kicad_icon.png kicad.png
-	make_wrapper kicad "/usr/lib/${PN}/linux/kicad"
+	make_wrapper kicad "/usr/$(get_libdir)/${PN}/linux/kicad"
 	make_desktop_entry kicad Kicad kicad.png "Application;Engineering;Electronics"
 
 	# kicad requires everything to be in the same place
-	cp -pPR library "${D}"/usr/lib/${PN}
-	cp -pPR internat "${D}"/usr/lib/${PN}
-	cp -pPR template "${D}"/usr/lib/${PN}
-	cp -pPR help "${D}"/usr/lib/${PN}
+	cp -pPR library "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR internat "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR template "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR help "${D}"/usr/$(get_libdir)/${PN}
 	if ! use minimal ; then
-		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/lib/${PN}
+		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/$(get_libdir)/${PN}
 		if use doc ; then
-			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/$(get_libdir)/${PN}
 		fi
 		if use examples ; then
-			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/$(get_libdir)/${PN}
 		fi
 	fi
 	dodoc author.txt copyright.txt news.txt contrib.txt version.txt
diff --git a/sci-electronics/kicad/kicad-20070702.ebuild b/sci-electronics/kicad/kicad-20070702.ebuild
index d20487e2b334..3c20b42de346 100644
--- a/sci-electronics/kicad/kicad-20070702.ebuild
+++ b/sci-electronics/kicad/kicad-20070702.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070702.ebuild,v 1.4 2007/12/12 11:08:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070702.ebuild,v 1.5 2008/02/09 12:09:49 calchan Exp $
 
-inherit eutils wxwidgets
+inherit eutils wxwidgets multilib
 
 UPSTREAM_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 DESCRIPTION="Electronic schematic and PCB design tools."
@@ -57,33 +57,33 @@ src_compile() {
 
 src_install() {
 	# kicad doesn't use the autotools yet
-	exeinto /usr/lib/${PN}/linux
+	exeinto /usr/$(get_libdir)/${PN}/linux
 	doexe eeschema/eeschema || die "Installation failed"
 	doexe pcbnew/pcbnew || die "Installation failed"
 	doexe cvpcb/cvpcb || die "Installation failed"
 	doexe kicad/kicad || die "Installation failed"
 	doexe kicad/minizip/minizip || die "Installation failed"
 	doexe gerbview/gerbview || die "Installation failed"
-	exeinto /usr/lib/${PN}/linux/plugins
+	exeinto /usr/$(get_libdir)/${PN}/linux/plugins
 	doexe eeschema/plugins/netlist_form_pads-pcb || die "Installation failed"
 	newicon kicad_icon.png kicad.png
-	make_wrapper kicad "/usr/lib/${PN}/linux/kicad"
+	make_wrapper kicad "/usr/$(get_libdir)/${PN}/linux/kicad"
 	make_desktop_entry kicad Kicad kicad.png "Application;Engineering;Electronics"
 
 	# kicad requires everything to be in the same place
-	cp -pPR library "${D}"/usr/lib/${PN}
-	cp -pPR internat "${D}"/usr/lib/${PN}
-	cp -pPR template "${D}"/usr/lib/${PN}
-	cp -pPR help "${D}"/usr/lib/${PN}
+	cp -pPR library "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR internat "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR template "${D}"/usr/$(get_libdir)/${PN}
+	cp -pPR help "${D}"/usr/$(get_libdir)/${PN}
 	if ! use minimal ; then
-		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/lib/${PN}
-		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/lib/${PN}
+		cp -pPR "${WORKDIR}"/kicad/library "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/modules "${D}"/usr/$(get_libdir)/${PN}
+		cp -pPR "${WORKDIR}"/kicad/template "${D}"/usr/$(get_libdir)/${PN}
 		if use doc ; then
-			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/help "${D}"/usr/$(get_libdir)/${PN}
 		fi
 		if use examples ; then
-			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/lib/${PN}
+			cp -pPR "${WORKDIR}"/kicad/demos "${D}"/usr/$(get_libdir)/${PN}
 		fi
 	fi
 	dodoc author.txt copyright.txt news.txt contrib.txt version.txt