Add openocd snapshot and refactor live ebuild. Bug #346473. Thanks to Peter Stuge <peter@stuge.se> for the initial ebuilds

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

5 files changed, 138 insertions, 31 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 8c56eec48d6b..f8758f249605 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.12 2011/03/14 19:36:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.13 2011/03/17 12:47:29 hwoarang Exp $
+
+*openocd-0.5.0_pre20110317 (17 Mar 2011)
+
+  17 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
+  +openocd-0.5.0_pre20110317.ebuild, openocd-9999.ebuild, metadata.xml:
+  Add openocd snapshot and refactor live ebuild. Bug #346473. Thanks to Peter
+  Stuge <peter@stuge.se> for the initial ebuilds
 
   14 Mar 2011; Sergei Trofimovich <slyfox@gentoo.org> openocd-9999.ebuild:
   Fixed build failure (now upstream uses submodules)
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 3b2af553b5bc..8447e4cc41c4 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
+DIST openocd-0.5.0_pre20110317.tar.gz 1466486 RMD160 2a72675b39f9274cf57fecc6b0ad247751e319df SHA1 4cab7c9f055436c8fac812eae597219271a99584 SHA256 d17e1cecfee7e2de6a8398e0387f5775daf35d02fa682186dbecc012d0735720
 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 1826 RMD160 e26ca70c6aa1b83460197518896fd08c57941b79 SHA1 2bacd5b041451db1ad190da812286be59b90b847 SHA256 12092488271bddfbc76b38f6d2c10ac1594d931e4a0298c1444dd0c3163634e1
-MISC ChangeLog 2308 RMD160 240fa422639d12fec626efafb79263572f6d761a SHA1 d0fae10e79de55c9bf446c8d555cac4919adad74 SHA256 673b5f160a5e14cc19999fe76d925168d539749eab1fafb254c98dd048310632
-MISC metadata.xml 605 RMD160 793b7084fd9451d746faf7c4a78601a6c181d484 SHA1 526fdefce5dde7e9d9e12c9c774678c2b21574d4 SHA256 10fde62d2a1f15b16e2709016bbbca445dbbe328e66cce3010cf73f35564591e
+EBUILD openocd-0.5.0_pre20110317.ebuild 2210 RMD160 eff63486913dd29afb15e486f987dd630f083982 SHA1 e007168ffae85a79e7afedc6031818a27ed45229 SHA256 ae30ae17b986f5fdd000de4b6fe9a29812d7be5a665ee58cc2a8c65506b4a577
+EBUILD openocd-9999.ebuild 2048 RMD160 7ef68a14da0b673a225539f1d8f26e95a5e14549 SHA1 9430289ddd969fb9fd8edd7707fe013e14c3febb SHA256 23cf988f5bb334a0379eb40dd624d18ca64c5614dd5b4b3c9b6d964d929bf4e0
+MISC ChangeLog 2605 RMD160 111cf4ac4b0975826daf4f8366f9b199d737e6d7 SHA1 9e756716557d06d174daeedc983eb290cde3e535 SHA256 9b589376da2816859edad81e44596854fb99edc9eebe5ff5646e69fcabd0c681
+MISC metadata.xml 861 RMD160 85f16b77d82cbee5527d02762a9c348235eb661c SHA1 c3992c830c95d43f7e3c5b9359b53b7fee63024c SHA256 0b06191bdf02a7370c900a5f4570c80432eb5b67ce7df3602f5ca0a7fe88a917
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNggLdAAoJEPqDWhW0r/LCor8P/1AmAZqEe/G9gExFeYX3iwSa
+u6J+OtwqASYxF1HvbTWRVdNi3ln/aMbPqkp5PECIlLNTFeGM8Hg3BwpcFIhJ5slm
+9IUuq1pwEBv8/z4ompaUT4CFc9uQviIjxLvsKiMSce0jR2D/TurANwgoaFE9F7c3
+sk+dlY0LLp0PSoaEd6OVYAufHvVRfM2zkwpIaGT+YuPPaxMleKFGl4ZW7uhs7Dhp
+FxWW3id4LoYbz1OGIP2ZfyZ1jpWYkXPawFoYhQXo5DHJye1tBPObP36GhFhjDw2S
+DGlLt0qs5OIn+HgfFSfj7IcCai8E+vbn+KkKGP1fTMqOu/TJ3FBNXzYjREmcjMqe
+XA+6GGL/Wx4DA8yRDlLEOP3ZdzoSYCTDffS4eLI99gkaTR7MCWYoiRkhW0xuTtRW
+z8SURFz7b7RLI9lIZlENb6z9qij2/dl9zjrp8bLEwoAID5hKiv9QCQyIo9OKEGDk
+Wsf/3U0lls9kLtlAyxfRqHL1WW9emTXZrvWayiH9W7B11OwDnfKkmBxWlSs7wQb8
+8NTsXxInyUZppV9lrU3pqz2kXn0eCoCE/KJbO1qjMuVGK8MLPWVzra/qghB1UKv8
+gwFeZvffsbTXHGPHRh2PAbK4sGFggrWyW7Bf4YrEjx49eOlwud2+Oof4iw03SdFI
+ZKxIR1A8mQ6Fn+Ryh+Pu
+=fryl
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index a6f0c64a88c6..e87232e172cd 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -7,9 +7,13 @@
 <name>Markos Chandras</name>
 </maintainer>
 <use>
+  <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+  <flag name='versaloon'></flag>
   <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>
   <flag name='parport'>Enable support for parport JTAG devices</flag>
   <flag name='presto'>Enable support for AXIS PRESTO devices</flag>
+  <flag name='segger'>Enable support for the Segger J-Link JTAG</flag>
+  <flag name='versaloon'>Enable building support for the Versallon-lInk JTAG</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild
new file mode 100644
index 000000000000..62fef32aaec5
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild
@@ -0,0 +1,75 @@
+# 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.5.0_pre20110317.ebuild,v 1.1 2011/03/17 12:47:29 hwoarang Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+if [[ ${PV} == "9999" ]] ; then
+	inherit git
+	KEYWORDS=""
+	EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
+RESTRICT="strip" # includes non-native binaries
+
+# libftd2xx is the default because it is reported to work better.
+DEPEND="dev-lang/jimtcl
+	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_prepare() {
+		[[ ${PV} != "9999" ]]  && sed -i -e "/@include version.texi/d" doc/${PN}.texi
+		AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_configure() {
+	if use usb;then
+		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
+			--enable-vsllink --enable-arm-jtag-ew"
+	fi
+	[[ ${PV} != "9999" ]] && myconf="${myconf} --enable-maintainer-mode"
+	# add explicitely the path to libftd2xx
+	use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	econf \
+		--disable-werror \
+		--disable-internal-jimtcl \
+		--enable-amtjtagaccel \
+		--enable-ep93xx \
+		--enable-at91rm9200 \
+		--enable-gw16012 \
+		--enable-oocd_trace \
+		$(use_enable blaster usb_flaster_libftdi) \
+		$(use_enable ftdi ft2232_libftdi) \
+		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable parport) \
+		$(use_enable presto presto_ftd2xx) \
+		$(use_enable segger jlink) \
+		$(use_enable versal0on vsllink) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+	prepstrip "${D}"/usr/bin
+}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index f1328f661838..d946fa1e5766 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,17 +1,17 @@
 # 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-9999.ebuild,v 1.11 2011/03/14 19:36:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.12 2011/03/17 12:47:29 hwoarang Exp $
 
-EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
-EGIT_HAS_SUBMODULES=YES
-inherit eutils
+EAPI="2"
+
+inherit autotools eutils
 if [[ ${PV} == "9999" ]] ; then
-	inherit git autotools
-	#KEYWORDS=""
-	SRC_URI=""
+	inherit git
+	KEYWORDS=""
+	EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
@@ -19,11 +19,12 @@ HOMEPAGE="http://openocd.berlios.de/web/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ftd2xx ftdi parport presto usb"
+IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
 RESTRICT="strip" # includes non-native binaries
 
 # libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( dev-libs/libusb )
+DEPEND="dev-lang/jimtcl
+	usb? ( dev-libs/libusb )
 	presto? ( dev-embedded/libftd2xx )
 	ftd2xx? ( dev-embedded/libftd2xx )
 	ftdi? ( dev-embedded/libftdi )"
@@ -36,39 +37,37 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-	fi
+src_prepare() {
+		AT_NO_RECURSIVE=yes eautoreconf
 }
 
-src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		myconf="${myconf} --enable-maintainer-mode"
+src_configure() {
+	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 \
+		--disable-internal-jimtcl \
 		--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 blaster usb_flaster_libftdi) \
 		$(use_enable ftdi ft2232_libftdi) \
 		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable parport) \
+		$(use_enable presto presto_ftd2xx) \
+		$(use_enable segger jlink) \
+		$(use_enable versal0on vsllink) \
 		${myconf}
-	emake || die "Error in emake!"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
 	prepstrip "${D}"/usr/bin
 }