summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-08-24 14:37:23 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-08-24 14:37:23 +0000
commitb2508bf47589b0967a1f08517d6cd36ab7b77ab1 (patch)
tree4056112d8dc814f62732b895d8c3cac8c450ffff /dev-libs/libdivecomputer
parentFix bug 482310, use the correct patch (diff)
downloadhistorical-b2508bf47589b0967a1f08517d6cd36ab7b77ab1.tar.gz
historical-b2508bf47589b0967a1f08517d6cd36ab7b77ab1.tar.bz2
historical-b2508bf47589b0967a1f08517d6cd36ab7b77ab1.zip
Version bump to 0.4.1. Fixed file collision with /usr/bin/nemo by prefixing the tools and bringing them under the 'tools' USE flag, which is disabled by default per upstream suggestion. Proxied commit for Martin Gysel (bearsh).
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'dev-libs/libdivecomputer')
-rw-r--r--dev-libs/libdivecomputer/ChangeLog10
-rw-r--r--dev-libs/libdivecomputer/Manifest22
-rw-r--r--dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild72
-rw-r--r--dev-libs/libdivecomputer/metadata.xml3
4 files changed, 96 insertions, 11 deletions
diff --git a/dev-libs/libdivecomputer/ChangeLog b/dev-libs/libdivecomputer/ChangeLog
index e28db12c3e0b..2c4d9093f2e7 100644
--- a/dev-libs/libdivecomputer/ChangeLog
+++ b/dev-libs/libdivecomputer/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/libdivecomputer
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.5 2013/07/09 14:25:53 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.6 2013/08/24 14:37:18 tomwij Exp $
+
+*libdivecomputer-0.4.1 (24 Aug 2013)
+
+ 24 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +libdivecomputer-0.4.1.ebuild,
+ metadata.xml:
+ Version bump to 0.4.1. Fixed file collision with /usr/bin/nemo by prefixing
+ the tools and bringing them under the 'tools' USE flag, which is disabled by
+ default per upstream suggestion. Proxied commit for Martin Gysel (bearsh).
09 Jul 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
Removed myself from metadata.xml to avoid duplication, as I am part of proxy-
diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest
index f91dde83c533..0109fd2a1caa 100644
--- a/dev-libs/libdivecomputer/Manifest
+++ b/dev-libs/libdivecomputer/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
DIST libdivecomputer-0.3.0.tar.gz 473927 SHA256 84a496dab7d6e5e88bcf197015e5fc3b568492545cb0b55b9007e13f5820a5c0 SHA512 8dd92aad735ad53f642e3e16e922108b842d13053a79617652424e26f030320117f12cb8184f8605cb0aa3c16430c28de9d39dc73e94a87b49dff7d05f177003 WHIRLPOOL 805bf22d38fa2c212d63b2a6c8826b522447b3933cb52bd39776f1565e9f984c7752de8e4c54878b7fb7273d7c2488fdf8c90dd1f400ab398b7fc82df6ceb577
DIST libdivecomputer-0.4.0.tar.gz 480856 SHA256 f3ec8f6de8201d509952b7697ce1db918532c750e0f7645582da6a9f0d9765b8 SHA512 f1fb3db83c1fb5cb2c4cb5f1170ae09b843cecad9f37f51f26a925772f334c05044b20c94667e15bea5d15ff537902418b4f7c5e3d2e74cf419e83a20e77ca41 WHIRLPOOL f1e7d0d3c442e43f309a14eb9832ff2e82ec3d5874d4872b6af55e81d0d51a3dcbd3be8e666d809046e9e956535a6ca070e1a200f6f11a47225c86f5926ace5a
+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 1221 SHA256 e952d8d5cd7f66aca5fbd1c2c4a4a7d77dbd455b1db77962d133a65519266c22 SHA512 8d92cf737c9a7f5227006808e0b6005923bc98ebcb9eddd725e9f6d3aeb768d8ae889453107dfb7ecd621ab76db8cfc721339accb20710f58ec60a9fd20942a9 WHIRLPOOL d0eb2101b3805c5e52885848beb698f5d43c5b13913b8a9b8a5b5148a363be430ebbe7b681de9f013d204369949c55905da24000bc31429e4bb836524536000a
-MISC metadata.xml 471 SHA256 f0276a81d78ab811be6a9ea9db54365906b17b6ffbe86f33200373394084407e SHA512 d948e8b3ee708946261947f32e6d8eb1754036d86e9808d81b6d877f23da9178521f0f6d4ddf3fac0795afdd40dbec9bd7fc34e77e188f858321ae3fe4487519 WHIRLPOOL f1ec02353f765ee6743e6cefc783976236349f30e82ef6fb0c6b26a173f48addd13e0ca38790229bb4bbea7fd69e8131203793d1d3300424522ebe388957abe1
+MISC ChangeLog 1588 SHA256 1894e7f59d4ac2556262a73eae5de6420e95976d4b682a6cf359de0e56fbbf6e SHA512 93f2439e7121e3d8093ab82b4c7c1711b7c1cda7c0a2c7c306af3d0413fe46fc4e477bbbafed0d86d47b744af6c97101fb207168e4dceefade2c6a695b6474da WHIRLPOOL fb160e7850d11f5794babf3c43ae3a2ac214203d149bcbc4055f81bf108b2dd20aa309d1ab8d82f3cb421f6d792dbb216373ba8c9dd6d993dc710c34ca018ef7
+MISC metadata.xml 570 SHA256 31c24b6cea9e0544248a52c0b0a641c5433247c5a1b7b97484bc0fa5a8384d1a SHA512 abc1a97ba1cada9d65ab9298df426183e0c58b4bb6889cd981668a3d7a0f0742d34bbc970a539e4c0985cbe62e991e6b0ed5932ca6b7bcf6d6e41813b6eff6b1 WHIRLPOOL 715d2d1debcf549df3db4c158c376dcad2f447ac4fe1f8f21e3fbaa30dffa56f13ae023fa0d66bc8bbee1abb4d578bab1e2657742c17c566d4326a0e33c4a943
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQEcBAEBCAAGBQJR3B11AAoJEJWyH81tNOV9xacH/jcGCrQgS6hrrJCpV3lZceZD
-98RD+ABO7xVgmlFHnQCxAs7xItkWd5lkKAz4pXkdOzDN67Run8ChSVjUvR5CZwLh
-+Fqj73dx+MygD/iDKxSsvQQ7MOoGjmvY7CO+5Uqen9QXoOSqQfnDO92CluAz7NpS
-xdpPf6Z4MJuDlXSregToSJDL4+fJqju9RE9UWw6GvGc1MTvNL0ZnZaGYEJs3VgDm
-ib/6tyRlj6ei8rgb+xePuR9iahmTPj+g8UjHKXW4nsxLEU04wxrMakClXpNPMWm/
-c2rhW6fu02kKc0FqvUkvVk5T1neUjT/Ji84kPzaptzSGjSj21n8+44X9GkbjyiU=
-=SX+Q
+iQEcBAEBCAAGBQJSGMUjAAoJEJWyH81tNOV9CAwIAJaSnSa9oclHyck751bSCiw0
+wIL4Sm43fR35d3lXgYRywZYvDog8c8nNBxcX+sazgVIIopFR6cEN78IZnAvJWwlt
+s4PT9fuKXG8StMcAXdCd2eNDzjrJ8RwSqqV455GQA/G6fs3gW5s4ZrtCmH4dOF9e
+2+0RZKb/ijtLZDymj4t4cHytBOmoO24YEeEovmo8s6N/gs5trVYWtNITKe9cs1mh
+3avXFadUKBaj1OpVTuUOKIAv5gB1vGnn10Pqc3BaOmrExHPbxbAKhaJCnJl3QDRf
+MuIdezLyM8W5/dBeRKXPeTi2gq9aOEESI/c+/Ly2oGy6FuCwefQiKV8vq7rQsFw=
+=ZCAT
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
new file mode 100644
index 000000000000..bd7b78acfe5d
--- /dev/null
+++ b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 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 $
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer"
+ GIT_ECLASS="git-2"
+ AUTOTOOLIZE=yes
+fi
+
+inherit eutils autotools-utils ${GIT_ECLASS}
+
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://www.divesoftware.org/libdc/releases/${P}.tar.gz"
+fi
+
+DESCRIPTION="Library for communication with dive computers from various manufacturers."
+HOMEPAGE="http://www.divesoftware.org/libdc"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="usb +static-libs -tools"
+
+RDEPEND="usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+ if [[ -n ${AUTOTOOLIZE} ]]; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ autotools-utils_src_configure
+
+ if ! use tools ; then
+ sed -i 's|examples||' Makefile || die "sed failed"
+ fi
+}
+
+src_compile() {
+ autotools-utils_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
+}
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index 9e30d9836e4f..0430be44a5d3 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -10,4 +10,7 @@
<longdescription lang="en">
Library for communication with dive computers from various manufacturers.
</longdescription>
+ <use>
+ <flag name="tools">Install tools that can be used to test the library.</flag>
+ </use>
</pkgmetadata>