commit: ca35690759de9af60e467999e97a33999e33e574
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 17:00:11 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 07:27:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca356907
profiles: Last-rited media-sound/mu{mble,rmur}, net-analyzer/ostinato
Closes: https://bugs.gentoo.org/644374
Closes: https://bugs.gentoo.org/656826
Closes: https://bugs.gentoo.org/655382
Package-Manager: Portage-2.3.41, Repoman-2.3.9
media-sound/mumble/Manifest | 1 -
.../files/mumble-1.2.4-speech-dispatcher.patch | 49 --------
media-sound/mumble/mumble-1.2.19.ebuild | 122 -------------------
media-sound/murmur/Manifest | 1 -
.../files/murmur-1.2.17-ice-3.6.3-compat.patch | 11 --
media-sound/murmur/murmur-1.2.19.ebuild | 130 ---------------------
net-analyzer/ostinato/Manifest | 3 -
net-analyzer/ostinato/ostinato-0.5.1.ebuild | 25 ----
net-analyzer/ostinato/ostinato-0.8.ebuild | 25 ----
net-analyzer/ostinato/ostinato-0.9.ebuild | 27 -----
profiles/package.mask | 6 -
11 files changed, 400 deletions(-)
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
deleted file mode 100644
index 723cab8c1ec..00000000000
--- a/media-sound/mumble/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B
7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe
SHA512
f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
diff --git a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
deleted file mode 100644
index 3a2c21675a5..00000000000
--- a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <mik...@krautz.dk>
-Date: Thu, 6 Jun 2013 22:17:31 +0200
-Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
-
-Based on initial patch by Timo Gurr <timo.g...@gmail.com>
----
- src/mumble/TextToSpeech_unix.cpp | 6 +++++-
- src/mumble/mumble.pro | 7 ++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/mumble/TextToSpeech_unix.cpp
b/src/mumble/TextToSpeech_unix.cpp
-index d0fbb82..6443c07 100644
---- a/src/mumble/TextToSpeech_unix.cpp
-+++ b/src/mumble/TextToSpeech_unix.cpp
-@@ -33,7 +33,11 @@
- #include "TextToSpeech.h"
-
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+# ifdef USE_SPEECHD_PKGCONFIG
-+# include <speech-dispatcher/libspeechd.h>
-+# else
-+# include <libspeechd.h>
-+# endif
- #endif
-
- #include "Global.h"
-diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
-index 04f5a36..ff3c02f 100644
---- a/src/mumble/mumble.pro
-+++ b/src/mumble/mumble.pro
-@@ -279,7 +279,12 @@ dbus {
-
- speechd {
- DEFINES *= USE_SPEECHD
-- LIBS *= -lspeechd
-+ system(pkg-config --atleast-version=0.8 speech-dispatcher) {
-+ DEFINES *= USE_SPEECHD_PKGCONFIG
-+ PKGCONFIG *= speech-dispatcher
-+ } else {
-+ LIBS *= -lspeechd
-+ }
- }
-
- directsound {
---
-1.8.1.6
-
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild
b/media-sound/mumble/mumble-1.2.19.ebuild
deleted file mode 100644
index 381385109b5..00000000000
--- a/media-sound/mumble/mumble-1.2.19.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib qmake-utils
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
-HOMEPAGE="https://wiki.mumble.info";
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz";
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech
zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
- !libressl? ( >=dev-libs/openssl-1.0.0b:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/protobuf-2.2.0:=
- >=media-libs/libsndfile-1.0.20[-minimal]
- >=media-libs/opus-1.0.1
- >=media-libs/speex-1.2.0
- media-libs/speexdsp
- sys-apps/lsb-release
- x11-libs/libX11
- x11-libs/libXi
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4[sqlite]
- dev-qt/qtsvg:4
- dev-qt/qtxmlpatterns:4
- alsa? ( media-libs/alsa-lib )
- dbus? ( dev-qt/qtdbus:4 )
- g15? ( app-misc/g15daemon )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- speech? ( app-accessibility/speech-dispatcher )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local conf_add
-
- if has_version '<=sys-devel/gcc-4.2'; then
- conf_add="${conf_add} no-pch"
- else
- use pch || conf_add="${conf_add} no-pch"
- fi
-
- use alsa || conf_add="${conf_add} no-alsa"
- use dbus || conf_add="${conf_add} no-dbus"
- use debug && conf_add="${conf_add} symbols debug" ||
conf_add="${conf_add} release"
- use g15 || conf_add="${conf_add} no-g15"
- use oss || conf_add="${conf_add} no-oss"
- use portaudio || conf_add="${conf_add} no-portaudio"
- use pulseaudio || conf_add="${conf_add} no-pulseaudio"
- use speech || conf_add="${conf_add} no-speechd"
- use zeroconf || conf_add="${conf_add} no-bonjour"
-
- eqmake4 "${S}/main.pro" -recursive \
- CONFIG+="${conf_add} \
- bundled-celt \
- no-bundled-opus \
- no-bundled-speex \
- no-embed-qt-translations \
- no-server \
- no-update" \
- DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
- newdoc README.Linux README
- dodoc CHANGES
-
- local dir
- if use debug; then
- dir=debug
- else
- dir=release
- fi
-
- dobin "${dir}"/mumble
- dobin scripts/mumble-overlay
-
- insinto /usr/share/services
- doins scripts/mumble.protocol
-
- domenu scripts/mumble.desktop
-
- insinto /usr/share/icons/hicolor/scalable/apps
- doins icons/mumble.svg
-
- doman man/mumble-overlay.1
- doman man/mumble.1
-
- insopts -o root -g root -m 0755
- insinto "/usr/$(get_libdir)/mumble"
- doins "${dir}"/libmumble.so.${PV}
- dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
- doins "${dir}"/libcelt0.so.0.{7,11}.0
- doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
- echo
- elog "Visit http://mumble.sourceforge.net/ for futher configuration
instructions."
- elog "Run mumble-overlay to start the OpenGL overlay (after starting
mumble)."
- echo
-}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
deleted file mode 100644
index 723cab8c1ec..00000000000
--- a/media-sound/murmur/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B
7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe
SHA512
f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
diff --git a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
deleted file mode 100644
index a8ad91e4493..00000000000
--- a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mumble-1.2.17/src/murmur/murmur.pro 2016-09-24 14:37:47.000000000
+0200
-+++ mumble-1.2.17.new/src/murmur/murmur.pro 2016-10-21 13:52:31.470049513
+0200
-@@ -74,7 +74,7 @@
- win32 {
- slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\"
${QMAKE_FILE_NAME}
- } else {
-- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice
-I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/
-I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
-+ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice
-I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/
-I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/
-I/usr/share/Ice-3.5.1/slice/ -I/usr/share/Ice-3.6.3/slice/ ${QMAKE_FILE_NAME}
- }
- slice.input = SLICEFILES
- slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/murmur-1.2.19.ebuild
b/media-sound/murmur/murmur-1.2.19.ebuild
deleted file mode 100644
index 6f1603e9893..00000000000
--- a/media-sound/murmur/murmur-1.2.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd user readme.gentoo-r1
-
-MY_P="mumble-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
-HOMEPAGE="https://wiki.mumble.info";
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND=">=dev-libs/openssl-1.0.0b:0=
- >=dev-libs/protobuf-2.2.0:=
- sys-apps/lsb-release
- >=sys-libs/libcap-2.15
- dev-qt/qtcore:4[ssl]
- || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
- dev-qt/qtxmlpatterns:4
- dbus? ( dev-qt/qtdbus:4 )
- ice? ( dev-libs/Ice:= )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.41.0
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.17-ice-3.6.3-compat.patch
-)
-
-DOC_CONTENTS="
- Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
- Please execute:\n
- murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
- chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
- to set the build-in 'SuperUser' password before starting murmur.
- Please restart dbus before starting murmur, or else dbus
- registration will fail.
-"
-
-pkg_setup() {
- enewgroup murmur
- enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
- default
-
- sed \
- -e 's:mumble-server:murmur:g' \
- -e 's:/var/run:/run:g' \
- -i "${S}"/scripts/murmur.{conf,ini.system} || die
-}
-
-src_configure() {
- local conf_add
-
- use dbus || conf_add="${conf_add} no-dbus"
- use debug && conf_add="${conf_add} symbols debug" ||
conf_add="${conf_add} release"
- use ice || conf_add="${conf_add} no-ice"
- use pch || conf_add="${conf_add} no-pch"
- use zeroconf || conf_add="${conf_add} no-bonjour"
-
- eqmake4 main.pro -recursive \
- CONFIG+="${conf_add} no-client"
-}
-
-src_install() {
- dodoc README CHANGES
-
- docinto scripts
- dodoc scripts/*.php scripts/*.pl
-
- local dir
- if use debug; then
- dir=debug
- else
- dir=release
- fi
-
- dobin "${dir}"/murmurd
-
- insinto /etc/murmur/
- newins scripts/murmur.ini.system murmur.ini
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/murmur.logrotate murmur
-
- insinto /etc/dbus-1/system.d/
- doins scripts/murmur.conf
-
- insinto /usr/share/murmur/
- doins src/murmur/Murmur.ice
-
- newinitd "${FILESDIR}"/murmur.initd-r1 murmur
- newconfd "${FILESDIR}"/murmur.confd murmur
-
- if use dbus; then
- systemd_newunit "${FILESDIR}"/murmurd-dbus.service
"${PN}".service
- systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles
"${PN}".conf
- else
- systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service
"${PN}".service
- fi
-
- keepdir /var/lib/murmur /var/log/murmur
- fowners -R murmur /var/lib/murmur /var/log/murmur
- fperms 750 /var/lib/murmur /var/log/murmur
-
- # Fix permissions on config file as it might contain passwords.
- # (bug #559362)
- fowners root:murmur /etc/murmur/murmur.ini
- fperms 640 /etc/murmur/murmur.ini
-
- doman man/murmurd.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 22111433f3b..44c30549ab5 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,4 +1 @@
-DIST ostinato-0.8.tar.gz 424104 BLAKE2B
5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7
SHA512
ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
-DIST ostinato-0.9.tar.gz 413756 BLAKE2B
cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d
SHA512
a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B
69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf
SHA512
7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
-DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B
207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952
SHA512
d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
diff --git a/net-analyzer/ostinato/ostinato-0.5.1.ebuild
b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
deleted file mode 100644
index ab172d3770c..00000000000
--- a/net-analyzer/ostinato/ostinato-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org";
-SRC_URI="https://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
- net-libs/libpcap
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
- eqmake4 PREFIX=/usr ost.pro
-}
diff --git a/net-analyzer/ostinato/ostinato-0.8.ebuild
b/net-analyzer/ostinato/ostinato-0.8.ebuild
deleted file mode 100644
index 3642909eb53..00000000000
--- a/net-analyzer/ostinato/ostinato-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org";
-SRC_URI="https://bintray.com/pstavirs/ostinato/download_file?file_path=${PN}-src-${PV}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-libs/protobuf:=
- net-libs/libpcap
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
- eqmake4 PREFIX=/usr ost.pro
-}
diff --git a/net-analyzer/ostinato/ostinato-0.9.ebuild
b/net-analyzer/ostinato/ostinato-0.9.ebuild
deleted file mode 100644
index 12457724076..00000000000
--- a/net-analyzer/ostinato/ostinato-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="https://ostinato.org";
-SRC_URI="https://github.com/pstavirs/ostinato/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#https://github.com/pstavirs/ostinato/issues/173
-# libpcap dep is versioned to pull in the fix for #602098
-DEPEND="dev-libs/protobuf:=
- >=net-libs/libpcap-1.8.1-r2
- dev-qt/qtscript:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
- eqmake4 PREFIX="${ED}/usr" ost.pro
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 59ef5e0ae28..64276a12759 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -204,12 +204,6 @@ app-crypt/gkeys-gen
=dev-qt/qtxmlpatterns-4.8.7
app-eselect/eselect-qtgraphicssystem
-# Andreas Sturmlechner <ast...@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Bugs #644360, #644374, #656826, #655382
-<media-sound/mumble-1.3
-<media-sound/murmur-1.3
-<net-analyzer/ostinato-0.9_p20180522
-
# Thomas Deutschmann <whi...@gentoo.org> (23 Jun 2018)
# Doesn't pass QA full boot test
=sys-kernel/ck-sources-4.16.17
