From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- net-analyzer/multimon-ng/Manifest | 6 ++-- .../multimon-ng/multimon-ng-1.0.0-r1.ebuild | 38 ---------------------- net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild | 32 ++++++++++++++++++ net-analyzer/multimon-ng/multimon-ng-9999.ebuild | 26 ++++++--------- 4 files changed, 45 insertions(+), 57 deletions(-) delete mode 100644 net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild create mode 100644 net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild (limited to 'net-analyzer/multimon-ng') diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest index af63bbdb5c3c..c25e23e8e7c0 100644 --- a/net-analyzer/multimon-ng/Manifest +++ b/net-analyzer/multimon-ng/Manifest @@ -1,4 +1,4 @@ -DIST multimon-ng-1.0.0.tar.gz 67095 BLAKE2B 4859a03e3b07ebe95232233832dc45d070010c38de8ef687db561d57137d7bcef7b469da618f450954819e21715e00e46df1d51b44ee86f84c4ac105f4cf00c9 SHA512 0fa475c7908bc24a9558c5a7e0aa4737fca117ff323a012b4316ad02840eb97f917a02d1daec50645729c2ca834068467ddc409cbc36af9cd5ffb9e8f6e5e3e9 -EBUILD multimon-ng-1.0.0-r1.ebuild 875 BLAKE2B e08e18a21b6b7f89144084f6d3a9c4831fd79452d39a380c6951f13e09db8917b30d861994924038bb7610fa3f8df02a5ac26989f6d6b49e458bc0f3a27057e1 SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3 -EBUILD multimon-ng-9999.ebuild 875 BLAKE2B e08e18a21b6b7f89144084f6d3a9c4831fd79452d39a380c6951f13e09db8917b30d861994924038bb7610fa3f8df02a5ac26989f6d6b49e458bc0f3a27057e1 SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3 +DIST multimon-ng-1.1.4.tar.gz 2426821 BLAKE2B 36f5eda463afc08ed6848d86b27ccbe27897327ea585b4b42210b13a2ac17ec8b215f239cc626f3151f6ca029897f40db333285b5442c85112b338c78a854adc SHA512 575e920b3738ab00da2cecdea8a1b1fb809ea7870e0aae7a5f8940ae8eee70af202e062d4a624d9de677135a7561daed60f264c6047b58f348405cb2bd06b21a +EBUILD multimon-ng-1.1.4.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4 +EBUILD multimon-ng-9999.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4 MISC metadata.xml 432 BLAKE2B 18d6a22e90f20d23e46aa7f0c0875dc156ba6d0b141b2ac98674b44d05166bc9f48a74f2d885723b5e7838fd2f710488aace8e7c9927a3bd14103101729ec111 SHA512 f61a6ec965782d81ba149cd16df61d7334a8775a2624ba38408e7ca9660df9d69e40817eecfd17db5b819a68e178648ed440e69278223665e51c98a7c2535230 diff --git a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild deleted file mode 100644 index 6ba3057182a6..000000000000 --- a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit qt4-r2 - -DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" -HOMEPAGE="https://github.com/EliasOenal/multimonNG" - -if [[ ${PV} == 9999* ]]; then - inherit git-2 - EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git" - KEYWORDS="" -else - SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/multimonNG-${PV} - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="pulseaudio" - -DEPEND="pulseaudio? ( media-sound/pulseaudio ) - dev-qt/qtcore:4 - x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_prepare() { - if use !pulseaudio; then - sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die - fi - qt4-r2_src_prepare -} -src_install() { - dobin ${PN} -} diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild new file mode 100644 index 000000000000..669915a3a1f0 --- /dev/null +++ b/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" +HOMEPAGE="https://github.com/EliasOenal/multimon-ng" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" + KEYWORDS="" +else + SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="pulseaudio X" + +DEPEND="pulseaudio? ( media-sound/pulseaudio ) + X? ( x11-libs/libX11 )" +RDEPEND="${DEPEND}" + +src_prepare() { + use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt + use X && sed -i '/find_package( X11 )/d' CMakeLists.txt + cmake-utils_src_prepare +} diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild index 6ba3057182a6..669915a3a1f0 100644 --- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild +++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild @@ -1,38 +1,32 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit qt4-r2 +inherit cmake-utils DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" -HOMEPAGE="https://github.com/EliasOenal/multimonNG" +HOMEPAGE="https://github.com/EliasOenal/multimon-ng" if [[ ${PV} == 9999* ]]; then - inherit git-2 - EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git" + inherit git-r3 + EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" KEYWORDS="" else SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/multimonNG-${PV} KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-2" SLOT="0" -IUSE="pulseaudio" +IUSE="pulseaudio X" DEPEND="pulseaudio? ( media-sound/pulseaudio ) - dev-qt/qtcore:4 - x11-libs/libX11" + X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" src_prepare() { - if use !pulseaudio; then - sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die - fi - qt4-r2_src_prepare -} -src_install() { - dobin ${PN} + use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt + use X && sed -i '/find_package( X11 )/d' CMakeLists.txt + cmake-utils_src_prepare } -- cgit v1.2.3