Massive ebuild improvements and clean up thanks to Paul Fertser <fercerpav@gmail.com> on bug #500350. No need for revbump as this will be removed soon in favor of final 0.8.0

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 84 insertions, 93 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 6f13abfda033..7f2daaf64fab 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.47 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.48 2014/05/03 22:18:55 hwoarang Exp $
+
+  03 May 2014; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
+  openocd-0.8.0_rc2.ebuild, openocd-9999.ebuild:
+  Massive ebuild improvements and clean up thanks to Paul Fertser
+  <fercerpav@gmail.com> on bug #500350. No need for revbump as this will be
+  removed soon in favor of final 0.8.0
 
 *openocd-0.8.0_rc2 (26 Apr 2014)
 
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 1c050b79b084..80dcc531a95d 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -8,26 +8,26 @@ DIST openocd-0.8.0-rc2.tar.gz 4821958 SHA256 369121a55d723694d6316798050e5160d95
 EBUILD openocd-0.5.0.ebuild 2261 SHA256 45b0475a335157c0466782d40cbf083db2d5616446c3c8ddc83509a8189e17f3 SHA512 a5203b267e8c9a9003f795509fba97d0840e6f374169f2bfb40c762acfb24e3bd9cbfcff7a06df9936aaf66b58ad1ea98ec07c1879cf356a3173e931e0c0bef9 WHIRLPOOL 0e34d928c2483adbdcf27692029710e36a6001c89952ca70198453fa0c9ebe7d505fd0c93c08148d2b08acc014b87788a4eec85e6bb96772fab7e50795d7e40e
 EBUILD openocd-0.6.1.ebuild 2755 SHA256 3dd0368f4a75c3c6af195e30f8fa081374aaf094ef0385d60d6b8ddac96c1a93 SHA512 a2c662e89aed2d19d9c172caeea64483402bac10c6a25bad85bf4d34d813b957bd0d657983015ccf97212a589275050f48429403092bae63b3cf5983090f02e6 WHIRLPOOL f15578a0ecef847137b06db9c7b570dcd59e73a5cec1dac4667501bce35e9400c64f29826e7eaba7c39912c3aaf232a2d59bca8a6da38b4790c8f9672bb403f7
 EBUILD openocd-0.7.0-r1.ebuild 3131 SHA256 0db9b11554b6004ca4c5dd425015ab769cf46a98b84f1a4a88cebdd7a27175a8 SHA512 ed410e29503fad36e06306ef618a811ca08c6a2c2cc45541f888fc0df7ba44e6014734c88547282082dbd24f171f1f65d1a4c7574bf79926a2ef385800404fd1 WHIRLPOOL d1b22471290a641bef62400e158ba175a6a680e8af43a2276169f2b24c25f833ba07245766e82fbc68bdfe1af12863ae21ce568b16a2ed4fedd0e8b90c591a50
-EBUILD openocd-0.8.0_rc2.ebuild 3191 SHA256 224ac17935586e13758aa9dd20d5f3e3b130c63c195c720b926789f4ca3a0bcf SHA512 7c43d71266dfa8a98f442e063fbea9a50aebedda15c2045118ad95a31f3a6a3c0d5af2d2c4a0fa5a8926409b366ca7017e37184106c2f5e333c86e2eb6952b0a WHIRLPOOL ffe8617a66277c1a29680ff0e3f75ba9d4d8dab3c67ccbba9fb498585bf127f57b6e61ea90b9c900ce67b5cb8b5f1df1739ace7ed158115517ab184a40aff930
-EBUILD openocd-9999.ebuild 3187 SHA256 1946c1a6141987628bb0c31bc1e905ce9e0f73ce0a0ebca58cd858d0c153d91a SHA512 bee7e095012871b441ea7da73233f2396ac2f94e41b3f7cf2b1560702b4e960d980f3416efcb49109413158a8d730dd701358318df94fe4b627f7012544110f5 WHIRLPOOL 6e6b46bbd98852cbfe64936563cfd555c0bba40b264fc46576ffb57581b7f9dbc1f79725315e35562e11aee9895ef7595c1625bba960fdcb82330c04b255bf8b
-MISC ChangeLog 7916 SHA256 825b8f796ff3cec59857be01a648cfd9e98d7f965c84f66bf5da4be4b0b0e7fb SHA512 731a26b787efbd77e7e0b6463b96f8d126ecb09f6b9076f2c7f283f42a93eea93af376836dbbbcc54a37872db3bd5cb44da72acc7e24df462a77d1e061cdc36f WHIRLPOOL c12b8689dcf51c5790435489a35c52df8748afce7c4b87aa3915db9201bd52994bec81729e1462e8644572befda05a7421c45952bb47b0c15a6873046c63ca97
-MISC metadata.xml 1013 SHA256 a7aa37bc193d23ea4b93db0604167339dee5df08803c2ddbab4defe1a02774e4 SHA512 19c05f0e39b9bd91812aafbdb085ad11630366cc8fab86b2933a3ca476638fa16a045a4e0d8af9df09ba5f58802d5c1994b6be9489792ca6de30dd32d479e000 WHIRLPOOL bd2a2115ae9d450c86aa81dde8eac90e35261a2ab4883507de99e675805218f7f9d15855f0362cc445a07845925bb9a2d759b3e6a424a2fdc1dda05d3628d5c7
+EBUILD openocd-0.8.0_rc2.ebuild 2786 SHA256 663db81ea7cc3644d9309f54782d7639682b6d9f94dbe7f48253e6deccbe9248 SHA512 658706c167933801a657e96a16556317c305f79dbcf7c8b466115be70bdf2fbad0cad5e473665f4888af8591bd9824ac390edb9455a64108b769b2d13d298b6c WHIRLPOOL bc449065afaa171174ee7e81f7e664f50dbc49b81aa1f68f4c567b51fd258977a7fc42b869b5d1ecf79af66e7ca857406cb014e04f1c7fee8afb4950d027e2c3
+EBUILD openocd-9999.ebuild 2782 SHA256 803a67722794b391d0985e9c2f9da92ab8f2c34ad7b32da97b8a812ffa99e567 SHA512 7c1e37f1fb806ce5ccd7349e80add8e851d59fc62380434ae86600445961fa125b04aafa408096e945dc9f8f64c4aca039963c78fdb89d391e162c6b225d9216 WHIRLPOOL 8536306a13a9a9dde75ff4ede47fef5c5bb4a6f8cf6f6404d40f854d8d28b1cc723b72b26b7f8fc7686fe930905c5bb31e20f031bf6ede04aada1100f6aa07cd
+MISC ChangeLog 8214 SHA256 fd7ad3c142e25face5c6cd9d9b720abdc2fa7ade0c425c507c7940cae8831705 SHA512 00ed07eb59d59c784b3c2cc201f6e75ac06911f94462c94259d1aac9e56dd2768bbd7e2bb31d9d8d484169c54fe51c60c092af99cc8fe3d0d2b62935b5312f29 WHIRLPOOL 8a501dea8b8ffa9aacbe29cbd8f3912e9bdb117a6656c0974c7a431dab104e313d5b1c2babe7139d1ea3cb63b09437c466976f2d7e089479a7a7c94dd8a61a8f
+MISC metadata.xml 1086 SHA256 4f018b4a2cf1297ce5f4f7d3d45e621d7b00c08d115f8ac1675abe2aca0e98d7 SHA512 0b543dc4eddb404e2fd99e31b753ab7c36dccb1953da6c5fcc0e5d9d71f8e3048e4a8d4d3e6101cca4b3618dbff3d8dbeffc3696a083927bb33f3b10a9abec6e WHIRLPOOL 9874834bb84f58125488f67d1a9f2524d4ede32d35ce681a1dc406252a2c6ac5d5ffd65943ad4613c4bc81df72f817ae10b8d2e2771b0cab6699e3367d4ddad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTW5eFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTZWr0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88hbgP/3dKzOd8DdZP9zV6gAmdpnbC
-1JMT/6dTI/DaLsQ7nNMQia9BJCUTumK0WLrfIp3f6zg9w09gbVrcb18vi5ahAfoY
-WMAGPVJ8ZHoyaTDeC8qBwI30GZS6RcU+g3XWlo2DzSwwJWf1WSkh8GYvAnkd+TP1
-fn3O3mkjDDtxjBcuyOz9xmIeTwmYyDYucgSkvSk38nRQheAGZtvhlm+VMkribpmp
-Oqnjh2Rs4r79WfmFPbc+z6DtqP28IvY9ntaGhGFxW72uDAmuRI2oulN1ULOQ/my3
-75KraeQVOvnyYWUa21yg8HxCgD3/Ju/nCwbpVHSAU7nREj9v08NNMqgJh3fsyNl4
-jij5k+Z0znBmnqEdP+JPwR7vWbH1ldfM/EwUs3GI5RRXhf5bl0nXQis6Tvl/i3xu
-KQ+eKroRkDQUQ1SDBbMycFcXY+RFHdoG7VLKxgFemjvVs86CYz2oFK+7RV0Eer07
-t1g1U0mkCKZanYZZotzDlVpBWDfIXLiFflRxLccsCZYUeLdvat7Q1IDj59bb+eBn
-br21/2d+jNffP6D2PpK+/hvVYzAmXciIFTat28zmiVhtnItRKNXqpVXpgAFmEiDg
-rbqP8SuPeulsioNHnnHKPgIfPsLsfKwuEB3MrkIQUkpLI3UQ3w09EOQtNpdTemw8
-hyVyohos/Q0FHZUjp93+
-=EIjq
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88n24QAIwkRYPT7aJZ4DHonIHLROSw
+9EM3uFDSQbZxPk7Fp32wMHs4WOWov98WZuVrdLs7cBw68/cDevxbEw8RPmlp4QW6
+xrXa7VR/ZbblkzZ6CnCkGialv2F5ABGTRt4JbOBpfCRVaQBXzsExvSRCdewmwPl/
+RnWMfqtrgnSSgCSN0aw7FhvUEK/cW9stYUVb55Baasx1gDPlr+bL+OYHDvWGDcHd
+MisptEzcddgN30FdS+KOElVEMAh8o/r124rsU1Ikx/EzXzrSSvSf+D4Nlzuhl/3p
+R01dfyxlkFcM09s4Bde/vpBaIIU4d15JfHKZe5ZL0njlwGAXIjMOkM/M85qt4yaY
+BvTn/Zfgbm9uuuwaJ258y6rKobp/XbHY9NtwrLAEwX4gjpgZ92QO80capLlMiSKd
+gVBfB6MefyhJiPto3JebkxALwFGueBFfsQc3jUwY4kHbhQle+OOEw1agC56xv6GF
+b5NfmGmiRUgSygBTNNisaUbHJlTFYO3XEOoBPw3qvzcFie4VbVBetA4Lky+5QLv0
+jA5kgHbwPX9NyIWGxPcOLL5iSzPVYPzgMFYVlqm8WtN6DkmVeoHOASrdD/Z/4+p4
+aqA/emiXnE/Q9itKgXYR5kfpr2Q8fL2p4HcVXHvw/9raxmmSjFrFwHV1I/iGpjv/
+C1lg4ZOVhYsx+H6trvN0
+=xsK0
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 8f16fe14a093..ae5bcfb9ea84 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -4,6 +4,7 @@
 <herd>dev-embedded</herd>
 <use>
   <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+  <flag name='cmsis-dap'>Support for CMSIS-DAP compliant adapters</flag>
   <flag name="dummy">Build the dummy port driver</flag>
   <flag name="minidriver">Build the dummy minidriver</flag>
   <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
diff --git a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
index 669b130620ba..d2b12f45ed57 100644
--- a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.1 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.2 2014/05/03 22:18:55 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
@@ -47,28 +45,12 @@ src_prepare() {
 		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
 }
 
 src_configure() {
 	# Here are some defaults
 	local myconf=(
 		--enable-buspirate
-		--enable-ioutil
 		--disable-werror
 		--disable-internal-jimtcl
 		--enable-amtjtagaccel
@@ -77,12 +59,16 @@ src_configure() {
 		--enable-gw16012
 		--enable-oocd_trace
 		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
 	)
 
 	# Adapters requiring usb/libusb-1.X support
 	if use usb; then
 		myconf+=(
 			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
 			--enable-ti-icdi
 			--enable-ulink
 			--enable-osbdm
@@ -92,42 +78,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--disable-usb-blaster-2
+			--disable-ftdi
 			--disable-ti-icdi
 			--disable-ulink
 			--disable-osbdm
 			--disable-opendous
+			--disable-usbprog
+			--disable-jlink
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
 		)
 	fi
 
-	if use blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +126,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 592a7bf44d03..4f0590a97b75 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.33 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.34 2014/05/03 22:18:55 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
@@ -47,28 +45,12 @@ src_prepare() {
 		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
 }
 
 src_configure() {
 	# Here are some defaults
 	local myconf=(
 		--enable-buspirate
-		--enable-ioutil
 		--disable-werror
 		--disable-internal-jimtcl
 		--enable-amtjtagaccel
@@ -77,12 +59,16 @@ src_configure() {
 		--enable-gw16012
 		--enable-oocd_trace
 		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
 	)
 
 	# Adapters requiring usb/libusb-1.X support
 	if use usb; then
 		myconf+=(
 			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
 			--enable-ti-icdi
 			--enable-ulink
 			--enable-osbdm
@@ -92,42 +78,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--disable-usb-blaster-2
+			--disable-ftdi
 			--disable-ti-icdi
 			--disable-ulink
 			--disable-osbdm
 			--disable-opendous
+			--disable-usbprog
+			--disable-jlink
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
 		)
 	fi
 
-	if use blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +126,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }