From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- dev-libs/libdivecomputer/Manifest | 10 ++- .../libdivecomputer/libdivecomputer-0.4.1.ebuild | 74 ---------------------- .../libdivecomputer/libdivecomputer-0.4.2.ebuild | 74 ---------------------- .../libdivecomputer/libdivecomputer-0.6.0.ebuild | 33 ++++++++++ .../libdivecomputer/libdivecomputer-9999.ebuild | 63 +++++------------- dev-libs/libdivecomputer/metadata.xml | 3 - 6 files changed, 54 insertions(+), 203 deletions(-) delete mode 100644 dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild delete mode 100644 dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild create mode 100644 dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild (limited to 'dev-libs/libdivecomputer') diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest index cd4c0e57a03d..d2bf6b71ed44 100644 --- a/dev-libs/libdivecomputer/Manifest +++ b/dev-libs/libdivecomputer/Manifest @@ -1,6 +1,4 @@ -DIST libdivecomputer-0.4.1.tar.gz 481798 BLAKE2B c4e132087f833dabc8504cd2cdacfe2c5fb29c208855d799cbb095a1ac3c75e7562136a5d47a8ff5717fa7241eec2114812c3c854cb950e0260f9111f873ad9d SHA512 a1104981b1820ea93c3b3e389e42996f9199c5a4c37daf16e9577d8fd29b21440521d1ea5f89ec2df2861b582fd2e748d35eb811ad0d484eacce7d13d39bf88f -DIST libdivecomputer-0.4.2.tar.gz 487401 BLAKE2B fb6abdf8ac4a6bc4ab121dfcf4e898aed65a3ab7e8692c4a9525c46e3f7c890eeeac88d4903d7192752175f7c964fd0135cf1d119ffc2a49d572e4abf72d906f SHA512 590aca350d86d17a889f47238ad46f0a6a1353b5f7ed67c64a9bae303a010ab042e94a73a36c6f05f2d03d10c80b1fae49431ad581b3024db83b81711d5d1048 -EBUILD libdivecomputer-0.4.1.ebuild 1479 BLAKE2B 60fc4c250cf16b8908cf52fbd2141001440f4ab84afa523d2f4520d44cb5fba409b848dcb03c1d6bb50bbe00d97ced46cc91e44eaa1748b0d71b3f987d418278 SHA512 21e604750a37e9e4d2bcf7378c18cefda7b3cfe1adbe467d72ff8f1cb36adc20654b99ffa8491bd8b1ab640c39b1a33dacf1f3590ba9c372ff1c58d90683baec -EBUILD libdivecomputer-0.4.2.ebuild 1479 BLAKE2B 60fc4c250cf16b8908cf52fbd2141001440f4ab84afa523d2f4520d44cb5fba409b848dcb03c1d6bb50bbe00d97ced46cc91e44eaa1748b0d71b3f987d418278 SHA512 21e604750a37e9e4d2bcf7378c18cefda7b3cfe1adbe467d72ff8f1cb36adc20654b99ffa8491bd8b1ab640c39b1a33dacf1f3590ba9c372ff1c58d90683baec -EBUILD libdivecomputer-9999.ebuild 1331 BLAKE2B 06c1a47003a8cc9a90cf73a19ca8f30417d147132ff02728d6c739057366ef2deed0a71c2329d5b7f65b38fdefc78a991d6a38b4ec551be2d913349e8054aae9 SHA512 81bd24c8afdf6a51219f31b258ca79acc52a1c95d999597085672ad9130094ecd757e6aa8ef4b824c14654202923d0c83c0793cc4175e90844f8aa0db0fd2b00 -MISC metadata.xml 578 BLAKE2B 8758cfa00c96cf28dc5eea77fa20cbda4b050d9b9f881696dff6a2680bae6cd3d553cb2028a6aa647c967e2b6d6e1b5563d2a648c701acaf6d23ac742bad0e1e SHA512 b468481446a9ae7690fb066d44723f9ed4caa27255220eb4c7ec75b320bdac20578a3dfe6eaf55a8e8bce6bfb47fa6fed314b2c50f672fc502f93060d34af818 +DIST libdivecomputer-0.6.0.tar.gz 680425 BLAKE2B 9ed951c6cdec07929ea7a9d3b842483ea1c88bff0171bfec1ec5a1a1d21a73580f70034856c97397bd21061d01967e14477ffabdf75b10bd6a736820b17e5b7f SHA512 b199d3e7e89fb2f79e4de5b54b086ae5f8b6bc08d02513e903e8fb008c1a453cf4cd4c4b7a94b1f7053ac53cc7b9085193b0ee0682318594c27ac2cb693c9b3f +EBUILD libdivecomputer-0.6.0.ebuild 747 BLAKE2B cc40bd672524a46c22b3dea373e556547a13637d062c4c3c0be86035da66360f33b69ff7973e613c0808a0d6b3d812093a608510ba89625b03afe31375ac3cd9 SHA512 3450f2d7fa03bfe00b9c04b522d94f10b0767fb0e61be4a01f06b0e30b23b38731bc404c0da1d1e2c07249d69fb4d8efe4284ad5afc925dd1d76b33119d56376 +EBUILD libdivecomputer-9999.ebuild 747 BLAKE2B cc40bd672524a46c22b3dea373e556547a13637d062c4c3c0be86035da66360f33b69ff7973e613c0808a0d6b3d812093a608510ba89625b03afe31375ac3cd9 SHA512 3450f2d7fa03bfe00b9c04b522d94f10b0767fb0e61be4a01f06b0e30b23b38731bc404c0da1d1e2c07249d69fb4d8efe4284ad5afc925dd1d76b33119d56376 +MISC metadata.xml 483 BLAKE2B 530cd37101a8b0f199376c57b83bf1d16098c11d13550a869573d7388125f290c8ab5070685fde6c937a5580d4fdbea6a6d6cb84b08c90875810b4b60f869339 SHA512 d8b8f22b939030536510dc41a6d6ef12b8863c8897e6213dd89076d01018d532f94e85c7b017095723fdcab259e24d2fff17820d212bdf27b57462f501056191 diff --git a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild deleted file mode 100644 index 36c4f31c9269..000000000000 --- a/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git" - GIT_ECLASS="git-2" - AUTOTOOLIZE=yes - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -AUTOTOOLS_IN_SOURCE_BUILD=1 -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" - -SLOT="0" -IUSE="usb +static-libs -tools" - -RDEPEND="usb? ( virtual/libusb:1 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - if [[ -n ${AUTOTOOLIZE} ]]; then - autotools-utils_src_prepare - else - epatch_user - 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/libdivecomputer-0.4.2.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild deleted file mode 100644 index 36c4f31c9269..000000000000 --- a/dev-libs/libdivecomputer/libdivecomputer-0.4.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git" - GIT_ECLASS="git-2" - AUTOTOOLIZE=yes - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -AUTOTOOLS_IN_SOURCE_BUILD=1 -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" - -SLOT="0" -IUSE="usb +static-libs -tools" - -RDEPEND="usb? ( virtual/libusb:1 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - if [[ -n ${AUTOTOOLIZE} ]]; then - autotools-utils_src_prepare - else - epatch_user - 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/libdivecomputer-0.6.0.ebuild b/dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild new file mode 100644 index 000000000000..0facf2467857 --- /dev/null +++ b/dev-libs/libdivecomputer/libdivecomputer-0.6.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/libdivecomputer/libdivecomputer" + inherit autotools git-r3 +else + SRC_URI="https://www.libdivecomputer.org/releases/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Library for communication with dive computers from various manufacturers." +HOMEPAGE="https://www.libdivecomputer.org" +LICENSE="LGPL-2.1" + +SLOT="0" +IUSE="bluetooth" + +RDEPEND="virtual/libusb:1 + bluetooth? ( net-wireless/bluez )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + [[ -v EGIT_REPO_URI ]] && eautoreconf +} + +src_configure() { + econf $(use_with bluetooth bluez) +} diff --git a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild index 05e2cc29858a..0facf2467857 100644 --- a/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild +++ b/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild @@ -1,62 +1,33 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.libdivecomputer.org/libdivecomputer.git" - GIT_ECLASS="git-2" - AUTOTOOLS_AUTORECONF=1 - KEYWORDS="" + EGIT_REPO_URI="https://github.com/libdivecomputer/libdivecomputer" + inherit autotools git-r3 else + SRC_URI="https://www.libdivecomputer.org/releases/${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -AUTOTOOLS_IN_SOURCE_BUILD=1 -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" +DESCRIPTION="Library for communication with dive computers from various manufacturers." +HOMEPAGE="https://www.libdivecomputer.org" LICENSE="LGPL-2.1" SLOT="0" -IUSE="usb +static-libs -tools" +IUSE="bluetooth" -RDEPEND="usb? ( virtual/libusb:1 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="virtual/libusb:1 + bluetooth? ( net-wireless/bluez )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -src_configure() { - autotools-utils_src_configure - - if ! use tools ; then - sed -i 's|examples||' Makefile || die "sed failed" - fi +src_prepare() { + default + [[ -v EGIT_REPO_URI ]] && eautoreconf } -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 +src_configure() { + econf $(use_with bluetooth bluez) } diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml index 93908aedd958..f4838fd208b4 100644 --- a/dev-libs/libdivecomputer/metadata.xml +++ b/dev-libs/libdivecomputer/metadata.xml @@ -12,7 +12,4 @@ Library for communication with dive computers from various manufacturers. - - Install tools that can be used to test the library. - -- cgit v1.2.3