Cleanup ebuild and add support for amd64 multilib by Jason.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

4 files changed, 40 insertions, 23 deletions

diff --git a/dev-embedded/libftd2xx/ChangeLog b/dev-embedded/libftd2xx/ChangeLog
index 52a3461375d3..02a9f54a4c6e 100644
--- a/dev-embedded/libftd2xx/ChangeLog
+++ b/dev-embedded/libftd2xx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/libftd2xx
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftd2xx/ChangeLog,v 1.2 2007/12/29 12:27:16 jurek Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftd2xx/ChangeLog,v 1.3 2008/10/26 20:03:14 vapier Exp $
+
+  26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  libftd2xx-0.4.13-r1.ebuild:
+  Cleanup ebuild and add support for amd64 multilib by Jason.
 
 *libftd2xx-0.4.13-r1 (29 Dec 2007)
 
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index 668f98b106e2..cef0c90012e5 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libftd2xx0.4.13.tar.gz 326281 RMD160 e054e79bdd67b9082cb9f225020f8c50dfed4d47 SHA1 184ec5e25a3c69b99f035c6658a283b175ec6f9b SHA256 57692d805a2446cc0332646c78caefa0ef8691686a7e636260efd05df23ff192
-EBUILD libftd2xx-0.4.13-r1.ebuild 1142 RMD160 0115ade284b5d03da33c4ecf70b67adda14b60b4 SHA1 9f6ab9997eb6d2ed775c36f8d4da3eb031d17d3e SHA256 23d1105f2e21a6ffdcbb4b51fc5f7dcb41fa7b75736f1fe9d55309ade1358b24
-MISC ChangeLog 539 RMD160 72df88e765b032c1a0b86b53c44c05d76d0461db SHA1 11d3200e6fa991ac55280aff94eaf0c9be7c658b SHA256 9de921b21ca2cae7376e00465b0262d75dae3226db089774246fe8566bf1d2c6
+EBUILD libftd2xx-0.4.13-r1.ebuild 1182 RMD160 6a37b0025b0fff4974635be49aebe692551387f4 SHA1 bfbfe666a4df009bbb1b7de0ece6f8bea30cdb68 SHA256 7f422229f588e264e7abd9cceed4bd7e20539f165540c190e778b9c9d041001f
+MISC ChangeLog 683 RMD160 500eac893126429285a5f4cbf9e344b67df74510 SHA1 49d31ea4896918d2da067744bacb3c4d21fa0ea9 SHA256 2289b20a20afb768b37034b5cdfbd28bd5b105ad7c661d8bd52484e44e75e783
 MISC metadata.xml 328 RMD160 355ac87e50e0f8962821a124a3b510662b480121 SHA1 23ebe418348a1ed7b22f0ad017158b5369863b74 SHA256 bf3cd9f1efc1c1c34a44e3e17cd7a6f16de070efa5712e047937c598abdfecf0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkEzQkACgkQ67wieSYcaxf6PACfXMkSvKbyjx0/jNvqQlqv7weD
+6dQAoIPo5D/QbjnDZcjhHA72QoEpipqV
+=jpf8
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild b/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild
index fb8f2057103f..6cbd7ccde257 100644
--- a/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild
+++ b/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild,v 1.1 2007/12/29 12:27:16 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftd2xx/libftd2xx-0.4.13-r1.ebuild,v 1.2 2008/10/26 20:03:14 vapier Exp $
 
 inherit multilib
 
@@ -12,32 +12,35 @@ SRC_URI="http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	has_multilib_profile && ABI="x86"
+}
+
 src_install() {
-	ftdifile="${PN}.so.${PV}"
-	ftdisym="${PN}.so.0 ${PN}.so"
+	local ftdifile="${PN}.so.${PV}"
+	local ftdisym="${PN}.so.0 ${PN}.so"
 
-	insinto /usr/include || die "insinto failed"
+	insinto /usr/include
 	doins ftd2xx.h || die "doins failed"
 	doins WinTypes.h || die "doins failed"
 
 	dolib.so ${ftdifile} || die "dolib.so failed"
-	for i in ${ftdisym}
-	do
+	local i
+	for i in ${ftdisym} ; do
 		dosym ${ftdifile} /usr/$(get_libdir)/${i}
 	done
 
-	if use examples; then
-		insinto /usr/share/doc/${PF} || die "insinto failed"
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
 		doins -r sample || die "doins failed"
-		insinto /usr/share/doc/${PF}/sample || die "insinto failed"
+		insinto /usr/share/doc/${PF}/sample
 		doins -r lib_table || die "doins failed"
 	fi
 
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 262ed5efb6a2..0880e2e420a6 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD openocd-9999.ebuild 1547 RMD160 4ef9fdf0187cd0ae57973b4a243e36221645fd75 SHA1 2a656299d250841e3088dfc4ce3e561f5428571b SHA256 0f99f17d620273b42272904ff51c52d11ddce6544fc10756b6e7645d28769cd9
-MISC ChangeLog 617 RMD160 41a11dfa26cb3151ba3a8bae757fcbab9a0f70cf SHA1 9f9e75682968c010c345571e9f390c52d2c8f3d7 SHA256 7c1172b52ad4a6444febe90f60f4c4fa8f1b8f84d479c36f8f12a636a8dd1b2a
+EBUILD openocd-9999.ebuild 1815 RMD160 284f28d114a9a6bec8cb86a82dbffbdd87d9560e SHA1 458192f85148eff62a7e4cc706e0603d81af62ce SHA256 99775d32f3d1c763b546e1bb819044abf0078e4823c6f693aecde3c25fec3bb6
+MISC ChangeLog 747 RMD160 4ee83cd67f854b68e9b5f3336586e80b2452bb13 SHA1 ffc26716d1537baf4225f6a0b30d1522c3bd0cd4 SHA256 d579879668096db27852b8f2696836ec5ffe8396de9e7e5f4243be14546e0a89
 MISC metadata.xml 515 RMD160 dc20f59bb785387a70cfdbd696c6f867ceb8bfe0 SHA1 9c3c91356fd1b1975f59a80c900132e5fd4a92df SHA256 3d98c84abc54e79e0b065416ae199a0bb562bfed1ee3ccf5b5f45158715e6364
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiYpDwACgkQOeoy/oIi7uwtQwCg3nVp0kQSFWf43gheemomD0q1
-0n8AoNHru27uVkBPDl7HY5/4NuZMHsUB
-=Y7om
+iEYEARECAAYFAkkEza0ACgkQ67wieSYcaxckCwCdH/MKEu16RaJpVI4PtpWfZUjR
+0o8An1gRNAemyHSdEdO7PvSP0e5rkkKE
+=qvhQ
 -----END PGP SIGNATURE-----