Port USE='tools' fix into live ebuild. QA fixes: move AUTOTOOLS_IN_SOURCE_BUILD before inheriting apropriate eclass, correct src_prepare to call autotools-utils_src_prepare instead of plain eautoreconf, epatch_user in non-live ebuild

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 51 insertions, 29 deletions

diff --git a/dev-libs/libdivecomputer/ChangeLog b/dev-libs/libdivecomputer/ChangeLog
index 5d53169f170f..abb1d3dcf7f7 100644
--- a/dev-libs/libdivecomputer/ChangeLog
+++ b/dev-libs/libdivecomputer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libdivecomputer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.8 2014/02/16 12:52:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.9 2014/02/27 08:30:09 pinkbyte Exp $
+
+  27 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> libdivecomputer-0.4.1.ebuild,
+  libdivecomputer-9999.ebuild:
+  Port USE='tools' fix into live ebuild. QA fixes: move
+  AUTOTOOLS_IN_SOURCE_BUILD before inheriting apropriate eclass, correct
+  src_prepare to call autotools-utils_src_prepare instead of plain eautoreconf,
+  epatch_user in non-live ebuild
 
   16 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Fix maintainer's email address, fix spelling
diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest
index 2d42e193b96b..cfeedb49bcbb 100644
--- a/dev-libs/libdivecomputer/Manifest
+++ b/dev-libs/libdivecomputer/Manifest
@@ -6,18 +6,18 @@ DIST libdivecomputer-0.4.0.tar.gz 480856 SHA256 f3ec8f6de8201d509952b7697ce1db91
 DIST libdivecomputer-0.4.1.tar.gz 481798 SHA256 7d64032d2e5cd4d6315ebb7ed5bcccc9399166d40228ae2e96e435749b950a0a SHA512 a1104981b1820ea93c3b3e389e42996f9199c5a4c37daf16e9577d8fd29b21440521d1ea5f89ec2df2861b582fd2e748d35eb811ad0d484eacce7d13d39bf88f WHIRLPOOL 7bc1d3a856f3f41cd3126ea1df61ead93e549c39442355f7730c3f0db981e1663c1ca86ee0db0b850bc3af55af0694100a1df7ce0754af665be3dc3c9388e919
 EBUILD libdivecomputer-0.3.0.ebuild 1291 SHA256 328a38217ca1927d63e5ca9be2d1674a5f30a279ac0ceb06951479a306c2636d SHA512 cb241e1f677f4aa1d0c204ddf3b24b01458bd923b5a66df3a688b080265f364d1356512d1d25942e6cfb99b44ea0f8073df31731ef44935559dbdcf194abd664 WHIRLPOOL 61cd715d4d4148d1d9b0d5596946558877391104653a3edcf4c484289135d85122f39c5b05167aa6ecf668188ae0cd5b05d0600e82f522da41b92651b70b05f3
 EBUILD libdivecomputer-0.4.0.ebuild 1293 SHA256 2563dcb3b48bd186f172bc14e77ac3c00503fb20607bdba58d297aece1ae99c5 SHA512 4569aa82616f27335bd4321406da8effa004e3f774baf283b01cdf3a4890e47760f09c60931c2df3d7d9de1e8a20d2fa67a0b1ca022952a04eaf05a126a6d5ab WHIRLPOOL d8b3179c54a9c10dcc87969f0a7ed93a3e2745b1f630ff4801c27e52d687d3ca979e291febcc3458a7b8c2bd663dfc739233d8e14146eb4f9b72440bb985bb42
-EBUILD libdivecomputer-0.4.1.ebuild 1586 SHA256 77dce19463ee000180eded9ae01eff5802994c358f55e84e87d74a4c58c33794 SHA512 156821a03ad355a317047af4cfaeea5defc5814fbf7acb396dc6d7d9c1469256cc6494418bada2cacd29004707150a560c0ddcd1858ab51ba6409c4797599007 WHIRLPOOL 2a0fb5544dd39219e24ddad25d0d33559258f424e8982d2317a0307653ebba4807053224f18418b1c4c4fc4f3042339a3f74e5c3ba4fd3eabf00be2738a0cb41
-EBUILD libdivecomputer-9999.ebuild 1279 SHA256 fc518b80c4b8d02ff7e9cba81c3de6ff9783d67cd84d0cab0a579dcd745871cd SHA512 b5c4616e62a16df1227950c3b7a41603c6bacf7fb893e0bb73c52ef0f6267bfbb66a5873894656a6db4ea3405ea37a5559a7b74b3db6ea2e705d12aa32128956 WHIRLPOOL a0fa127d582be174290bae7e58535847dd677dd99f1eab304fa7bde6be38eac9271a5e97156ea374e1b5c61cc5a05bcb36c29ec99625bfd251de20a3b3031c52
-MISC ChangeLog 1743 SHA256 765212a5488caa8c4d7545a04194944b80f4315d4cc8af574ef894820b7282f8 SHA512 17f1d9b020106d98fe990957682d55381731fb1754d607e2f473fa5bd6fe80871ae030dbd2d92d856921b3a8155cac69d66263ca7a7262f9c9279f0594b842de WHIRLPOOL 9ad5b4b1bf3ab326ad885a6386d77b06b2e177cfb0ecde30fce5ccbaa73e35c2416e1b11e326dd2916b8de21a64ad866ff99180d482a438475b699ee9d8414a4
+EBUILD libdivecomputer-0.4.1.ebuild 1623 SHA256 12a0ab06a486fe78e30179179ef91e39779b5be85aec69b3a1d0675bc46e9956 SHA512 85f3ccbe298104b019c8c6096260bb770f1158667afd1e8e142348ef9e7691d5767619e22b033c5890bc97d002252f53ba5a3bd256720ae44aa2915476763d31 WHIRLPOOL 8158c0974c7eb07070d8a289c6822379e780e440bfc4710d2caf4081eb6baebde8b72d374cc2f42b0136a5f0022d8ab98c4663022fa6331def5b0d62519a750b
+EBUILD libdivecomputer-9999.ebuild 1622 SHA256 e513f3991fcf4db1248d8c102dfc0edf7031ba0e77a52e06f8cac5ffe1d4019b SHA512 ffd514e98bee3b9090e1a9c793387f71d35add90e33f5e00bc80b07e0c1431782ed7f16c9478958293c08bfc65e29981ce6af71e145bcba139147221b71dde54 WHIRLPOOL d951524d623f8b7bfac384468d3b6d75e286979b8453977f0342260ec0cc8a66cf35ac45c5e4d7a534cce67262a5b2304f6264c3503d218c0b80aa57930ed3fd
+MISC ChangeLog 2097 SHA256 61151d1876264350d2159d69c4ca3c1e225fce70030a677c26052e55b3b48636 SHA512 54973c673269b6ab9cc9034deab998acc260d7f75faa65da3aa8b8fb25a0adcc3313aed5ad188d62b762a8430d917ea16680188956a3f179edb5a757b0acfd0a WHIRLPOOL db7bce019e3cfb2c3fe9cacb4b28e618d0d710bd42164a16de6c984344947bee68e2df880b2944033dcf32d63883655161d9ddbb895c5cb18b30b5014a374264
 MISC metadata.xml 572 SHA256 33f1c2caad0efbb63eaf2a4dc419e74f826c887b9a63a1d6b0f6fd5cc0377c33 SHA512 c99b40f7eeb777de456c8d75491ebc869678de4e12d9a7f6bb96d9ffbcb83d4b66af613213b3616a5f6ebf139aad5e3152d0d4027a8ab46c4c1680263c7fda4e WHIRLPOOL 705c3d4c5750e9ba510bbfc7990530f7515d81ba09e79849050452ad85de8491ba4e5a47cacb88e77cfa69bec307271838edcfdf7c4d160fc6711eabceaed38a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTALSAAAoJECo/aRed9267agwIAKBinZiqVi77R8eT45KsylYm
-XizHV9yHTSxWpbrVLNzmk1Ls8siHqkCRnuBrVN0VFS8Cek77RCbcaWicntzIdjl4
-lOUXxRlSYbSzWapgI0piLgtGkaKkos1Od2pYCB5M5woWnW800uNGF3pW/4QDMYgM
-y797XETPRH/vF0yl2M+Zage8XLZ450KO47qWyFwcW8pcjGm67mtOftWladghkGf6
-VPELRMLwLH2N2RqWWgZGtveAQazOtMuq5uQGy4lOIDs7GsOK7qz10Nt/0YSVxh1q
-qsdSiqaieUd7aCBYyI3d76PcWLnpeg+fqmJ5Z/VhrW8VKOjZJnIheUc1z9QivOw=
-=tMRM
+iQEcBAEBCAAGBQJTDveNAAoJECo/aRed9267myIH/3OVAqc5kmSZLGTcCj+HvZvA
+h1wnqLEQa5GqghdKqcaqjVDFe5qKR9uzZtyg+4R4es92/hx+Kzh0XDzZmS/E7nng
+DvDYZVIv6KJIc1rmgNpribioEr5PDQ6zi57OptN7hz41IBq5IHGG25AXzUwdrg+s
+5xNJuUFGNtz1x5j7uxfl8hi9EAL84JO21EfTq95eqzMtB40wTYkalVZ5ysFvgxjZ
+PpWSZ/Bt5wkEK7N2YHP1qF40pqckfofZl18/51Cc/PnIuvgqJSDK/nOia3zGG91e
+xh0BXOREpPg9t+PWAzC/8qTNT2JZbU+QiOYffFDQ36/3Xzm+nHOuplhYu0P/CoE=
+=XYhw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
index bd7b78acfe5d..bb1924bb75d5 100644
--- a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
+++ b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild,v 1.1 2013/08/24 14:37:18 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild,v 1.2 2014/02/27 08:30:09 pinkbyte Exp $
 
 EAPI="5"
 
@@ -10,6 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	AUTOTOOLIZE=yes
 fi
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit eutils autotools-utils ${GIT_ECLASS}
 
 if [[ ${PV} = *9999* ]]; then
@@ -30,11 +31,11 @@ RDEPEND="usb? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 src_prepare() {
 	if [[ -n ${AUTOTOOLIZE} ]]; then
-		eautoreconf
+		autotools-utils_src_prepare
+	else
+		epatch_user
 	fi
 }
 
diff --git a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
index 9bcd39cbb14c..f54e6a02d946 100644
--- a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
+++ b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild,v 1.1 2013/03/28 18:43:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild,v 1.2 2014/02/27 08:30:09 pinkbyte Exp $
 
 EAPI="5"
 
@@ -10,6 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	AUTOTOOLIZE=yes
 fi
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit eutils autotools-utils ${GIT_ECLASS}
 
 if [[ ${PV} = *9999* ]]; then
@@ -22,30 +23,26 @@ DESCRIPTION="Library for communication with dive computers from various manufact
 HOMEPAGE="http://www.divesoftware.org/libdc"
 LICENSE="LGPL-2.1"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="usb examples +static-libs"
+IUSE="usb +static-libs -tools"
 
-RDEPEND="usb? ( virtual/libusb )"
+RDEPEND="usb? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 src_prepare() {
 	if [[ -n ${AUTOTOOLIZE} ]]; then
-		eautoreconf
+		autotools-utils_src_prepare
+	else
+		epatch_user
 	fi
 }
 
 src_configure() {
 	autotools-utils_src_configure
 
-	if use usb ; then
-		sed -i 's|#define HAVE_LIBUSB 1||' config.h || die "sed failed"
-	fi
-
-	if use examples ; then
+	if ! use tools ; then
 		sed -i 's|examples||' Makefile || die "sed failed"
 	fi
 }
@@ -56,4 +53,21 @@ src_compile() {
 
 src_install() {
 	autotools-utils_src_install
+
+	if use tools ; then
+		einfo "prefixing tools with 'dctool_'"
+		pushd "${D}/usr/bin/"
+		for file in * ; do
+			mv "${file}" "dctool_${file}" || die "prefixing tools failed"
+		done
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if use tools ; then
+		elog "The 'tools' USE flag has been enabled,"
+		elog "to avoid file collisions, all ${PN}"
+		elog "related tools have been prefixed with 'dctool_'"
+	fi
 }