Detect ftd2xx library correctly. Bug #355563. Version bump thanks to Stephen Bridges <widget@stdin.co.uk>. Bug #320045

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

5 files changed, 185 insertions, 9 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 988363108e0d..75de78970bf6 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/openocd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.10 2010/03/07 04:44:21 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.11 2011/02/22 17:09:37 hwoarang Exp $
+
+*openocd-0.4.0 (22 Feb 2011)
+*openocd-0.3.1-r1 (22 Feb 2011)
+
+  22 Feb 2011; Markos Chandras <hwoarang@gentoo.org> +openocd-0.3.1-r1.ebuild,
+  +openocd-0.4.0.ebuild, metadata.xml:
+  Detect ftd2xx library correctly. Bug #355563. Version bump thanks to Stephen
+  Bridges <widget@stdin.co.uk>. Bug #320045
 
   07 Mar 2010; Mike Frysinger <vapier@gentoo.org> openocd-0.3.1.ebuild,
   openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 793aa5f36971..5c5065e610af 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST openocd-0.3.1.tar.gz 1584527 RMD160 fba1c2db055cce7652afa28773be3162b46eb204 SHA1 ccc543d44a65e9d5e6ae44145c6dca8c59b43f2e SHA256 d88be375e346c6b19f23ca82ae20497bdb1bf88a05eba3e6ed7d2cff8c1916b4
+DIST openocd-0.4.0.tar.gz 1705028 RMD160 69ce61cec0aebce1300f44af029bf644194ebce9 SHA1 890171d6ffbfc4cfb45040548ffe1422cc07ae6b SHA256 fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194
+EBUILD openocd-0.3.1-r1.ebuild 1904 RMD160 ba160e287185b1277fbed6afc8736fd1b520efad SHA1 b29a411e9074b591ac591d537f801a8a8855522a SHA256 9a5d9edd130996698147b5945f7f5c4d3349d6ca466846112260e8022eab8896
 EBUILD openocd-0.3.1.ebuild 1802 RMD160 f9e6ae3182f6fb11b042933fc763f6aa26f7ca67 SHA1 763da8c126fd0c3019b255ffee58b3bac197d9ab SHA256 4988ea6435eb1b04588ac54e1b5a6ef036d7b7525ba6fb9068459fadd8b6d747
+EBUILD openocd-0.4.0.ebuild 2017 RMD160 f8289aedfb820cbfbf66c526500cd4f6b0b2e45c SHA1 e35962eac8bd903a79333630e1125f792ee22f5f SHA256 a968d282985dd47a42d6f45beb82254e8f5d07596a8223d8e3a898f368ea6972
 EBUILD openocd-9999.ebuild 1802 RMD160 d932e22737e8901ddb28b7fd86b9ff2f84928efb SHA1 46a96f3ac3c06c62dea66bce592b94ea5aee4e19 SHA256 09fd2e28011e4122c88a22a17d84dd90f08b34082a0a02cf46662f1ad9793eac
-MISC ChangeLog 1875 RMD160 033580b0665fd6148a88b37582eced88a53a1609 SHA1 226631fb12c09f070fa17657eaeaedd419a7a853 SHA256 a233984138ca20ea311f90abe61b693d7d6063eb8a44e7e5e0cf5ab80965ca00
-MISC metadata.xml 514 RMD160 76bbd3e76a0366d922fbd8397d3aaf3eb79defff SHA1 0187884b641f16ad466a2e90f7ef2ac098c0bf14 SHA256 8eef0b8622a31dc3dde67db2e0e2056bf403a0312758defad6f3154baec62b64
+MISC ChangeLog 2181 RMD160 8bba6aad0cd96e31ea9474ceb0cb241863165d62 SHA1 65ae1cfd40ff682e3fbabd4db74c04ab0604498d SHA256 d1bb8c19966f7bd5f6a1bc835ab6e46c79aed3090ecc3741e04e0c52fc605eea
+MISC metadata.xml 605 RMD160 793b7084fd9451d746faf7c4a78601a6c181d484 SHA1 526fdefce5dde7e9d9e12c9c774678c2b21574d4 SHA256 10fde62d2a1f15b16e2709016bbbca445dbbe328e66cce3010cf73f35564591e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkuTLy0ACgkQTwhj9JtAlp5c2wD+JRUqgfqGg46uoZtXWgI+TzCq
-Xkm2mxm78ZVAzxlnprQBAJhSZAj2YJsr4hs4jZHZkvzy++g3+evy8cyePBw/l2aT
-=Ijt9
+iQIcBAEBCgAGBQJNY+3TAAoJEPqDWhW0r/LCnzkP/1Xqze5QauyORQbIjauU2plq
+WGK9xlsAZu7C4rWVN/oiwGy2+29bPlvnVbWrZEIEkIpJ3ecQkl2wzqgyDGvlDJFD
+rGGdF3LCzl4EOq8WOx00VREK1eIEE5YEKXh2K0C5KtxejdD+tHN4AJowsc0td5RP
+PYJliktW4E9LCnZWxHIfYPPfJdjv+iObSPvh4jFSOZbieXPany5OKctjWnjA6aV+
+pgdNxBZu5Lttn7KQyyy4+g7Lg1JCG0ihX/mJgQV7tiDa7qFHJuMWcsHeaNyOaaYu
+yn4qBeOHSc4woGrvaPLsABujboe/l+LUQV35RXyJs/As4+CcpKeqlcAlYzsxm5HF
+rHkgjYDQX7zuDXQjN0AqV/oMJkWUEu/Lrxos4uKuma07JYCPopd0PdswTDu537P7
+b7hiIKsirn25rBXUSyzkekjt2PFxzlrbmLR66HEPYxkJM+0CkASYfWNmVD5Q/7CB
+w1YxmLHuquHTuQa/F86UpbNtkDpvRZVhG3dYCN/5yYNlKdVrmat7yv9BNOQQDqNq
+LXfx6N+pd30sHxheHUobX1Xa42iom8lAfu4IyUcW8FeGF9NQD6PsTTPg9xYhXPPM
+Z5p+u6rDf2Lnnsd7cued+fp36iP2woSJ30I71sKgJiqUCRM6FwO2E40jHtNcr+y3
+7H98FnKojEJFe3Di5c9g
+=3gcc
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 2ae09d7212da..a6f0c64a88c6 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
 <use>
   <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
   <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
diff --git a/dev-embedded/openocd/openocd-0.3.1-r1.ebuild b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..e681f6854b5b
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.1 2011/02/22 17:09:37 hwoarang Exp $
+
+EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	inherit git autotools
+	#KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ftd2xx ftdi parport presto usb"
+RESTRICT="strip" # includes non-native binaries
+
+# libftd2xx is the default because it is reported to work better.
+DEPEND="usb? ( dev-libs/libusb )
+	presto? ( dev-embedded/libftd2xx )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	ftdi? ( dev-embedded/libftdi )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use ftdi && use ftd2xx ; then
+		ewarn "You can only use one FTDI library at a time, so picking"
+		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${A}
+	fi
+}
+
+src_compile() {
+	if [[ ${PV} == "9999" ]] ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+	# add explicitely the path to libftd2xx
+	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	econf \
+		--disable-werror \
+		--enable-amtjtagaccel \
+		--enable-ep93xx \
+		--enable-at91rm9200 \
+		--enable-gw16012 \
+		--enable-oocd_trace \
+		$(use_enable usb usbprog) \
+		$(use_enable parport) \
+		$(use_enable presto presto_ftd2xx) \
+		$(use_enable ftdi ft2232_libftdi) \
+		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		${myconf}
+	emake || die "Error in emake!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	prepstrip "${D}"/usr/bin
+}
diff --git a/dev-embedded/openocd/openocd-0.4.0.ebuild b/dev-embedded/openocd/openocd-0.4.0.ebuild
new file mode 100644
index 000000000000..32707f91fd0a
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.4.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.1 2011/02/22 17:09:37 hwoarang Exp $
+
+EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	inherit git autotools
+	#KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ftd2xx ftdi parport presto usb"
+RESTRICT="strip" # includes non-native binaries
+
+# libftd2xx is the default because it is reported to work better.
+DEPEND="usb? ( dev-libs/libusb )
+	presto? ( dev-embedded/libftd2xx )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	ftdi? ( dev-embedded/libftdi )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use ftdi && use ftd2xx ; then
+		ewarn "You can only use one FTDI library at a time, so picking"
+		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${A}
+	fi
+}
+
+src_compile() {
+	if [[ ${PV} == "9999" ]] ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+	if use usb;then
+		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
+			--enable-vsllink --enable-arm-jtag-ew"
+	fi
+	# add explicitely the path to libftd2xx
+	use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	econf \
+		--disable-werror \
+		--enable-amtjtagaccel \
+		--enable-ep93xx \
+		--enable-at91rm9200 \
+		--enable-gw16012 \
+		--enable-oocd_trace \
+		$(use_enable parport) \
+		$(use_enable presto presto_ftd2xx) \
+		$(use_enable ftdi ft2232_libftdi) \
+		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		${myconf}
+	emake || die "Error in emake!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	prepstrip "${D}"/usr/bin
+}