summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/Manifest.gzbin61921 -> 61912 bytes
-rw-r--r--media-sound/clementine/Manifest3
-rw-r--r--media-sound/clementine/clementine-1.3.1_p20190609.ebuild176
-rw-r--r--media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch34
-rw-r--r--media-sound/lollypop/Manifest2
-rw-r--r--media-sound/lollypop/lollypop-1.1.0.ebuild60
-rw-r--r--media-sound/murmur/Manifest8
-rw-r--r--media-sound/murmur/files/murmur.logrotate2
-rw-r--r--media-sound/murmur/murmur-1.3.0_rc1.ebuild150
-rw-r--r--media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild (renamed from media-sound/murmur/murmur-1.3.0_rc2.ebuild)27
-rw-r--r--media-sound/murmur/murmur-9999.ebuild34
11 files changed, 258 insertions, 238 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 635f3d56c27c..7701c58d2b98 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f9bf7cd492e4..2980d9cbb009 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,7 @@
+AUX clementine-1.3.1_p20190609-fix-restore-from-systray.patch 1235 BLAKE2B 9904a6df024998d4268ca952fc2c17cebec01873b93aa141ac6db193e1a69481d4f7f5f02cf9fec6174eb390fce66b443ef86de8b2379c6c9192c6d5eed5edd8 SHA512 86be2b64b38347d5f0bd086dd35970d6f2c1fcffe315a116d68251193e91a05a0fe02f029d558290d4ebc09175067f0f2bb4e59bb58984150d52d219a8c9503e
DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
+DIST clementine-1.3.1_p20190609.tar.gz 8516585 BLAKE2B a02e473703da5cfa3a7fb702f3ff90f3aa0fd97faf8b10b2c080b4a9a052f514f67fe40dcd0fd435c1681bd8749b0f4d731b21e4b842979e9dbe516cf7a19e76 SHA512 d72d29a01920bfe74d1a51b419cdbb5bd096cfd816edec4e7325bf43cc5b75a893c273b131539ae362f2a804cbb4ca57002737e4833ef6e5c1adc1b7f142dd57
EBUILD clementine-1.3.1_p20190127.ebuild 5043 BLAKE2B 4d6c2113a990744bb310f7d2ef0c20e24554fc64a5df1546a11cad449a689f5aa2515508dd30cf77b9294eb2b880980f24a5e3b22dd8ca6521c752939eafabb2 SHA512 ca57e01f9fbce22460f1d52a01fbc641afbe2a6981f04544e21fd4a35fc8a16c36313b86637e5bd7ce1b0aa87eeb32178acd92266c47f8c50666a0f4f93e1143
+EBUILD clementine-1.3.1_p20190609.ebuild 5108 BLAKE2B 062c21a837d595d1a45a82306330c39a35137acf0d703ea107ebe9b2dd1cc3abbf41cbb28dd8e68f7eb4d85506102be585bdf3f9339621c89133bc3e99f6a51b SHA512 06fbd7be87b7e7266141a505606d6f54e103ee9554094d46023e5fea168390ed4dab18402c128eb33454dd0aee637b6497647fabd0d7adc6e6bdef8835268f0d
EBUILD clementine-9999.ebuild 4974 BLAKE2B e25668017fc68c1443848e9677e44672109522bf4e1a6ca806dffbb262f063b430eb31af17c36e349b872f32d7a1b05b5989f457dcaced6cc913ac61121c64d7 SHA512 e3e1d1e24f2290281644313c5c29a531b53d80c5f22c09e87e8f3f5119bb56540844020fce471bbd4070bbb55f08229c35c2b0b0e7d736b0b49c6b12cf34a1c7
MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
new file mode 100644
index 000000000000..a4d5f63d5bb0
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+ EGIT_BRANCH="qt5"
+ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+ inherit git-r3
+else
+ COMMIT=9af827b6acaabb2331246f58436cd34b11548b6c
+ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN^}-${COMMIT}"
+fi
+inherit cmake-utils flag-o-matic l10n virtualx xdg
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+BDEPEND="
+ >=dev-cpp/gtest-1.8.0
+ dev-qt/linguist-tools:5
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ dev-qt/qttest:5
+ gnome-base/gsettings-desktop-schemas
+ )
+"
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+)]
+ dev-db/sqlite:=
+ dev-libs/crypto++:=[asm]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwidgets:5
+ media-libs/chromaprint:=
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ >=media-libs/taglib-1.11.1_p20181028
+ sys-libs/zlib
+ virtual/glu
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+ moodbar? ( sci-libs/fftw:3.0 )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ projectm? (
+ media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0
+ virtual/opengl
+ )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+ mms? ( media-plugins/gst-plugins-libmms:1.0 )
+ mtp? ( gnome-base/gvfs[mtp] )
+ udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ dev-qt/qtopengl:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ box? ( dev-cpp/sparsehash )
+ dropbox? ( dev-cpp/sparsehash )
+ googledrive? ( dev-cpp/sparsehash )
+ pulseaudio? ( media-sound/pulseaudio )
+ seafile? ( dev-cpp/sparsehash )
+ skydrive? ( dev-cpp/sparsehash )
+"
+
+RESTRICT="test"
+
+DOCS=( Changelog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-fix-restore-from-systray.patch" )
+
+src_prepare() {
+ l10n_find_plocales_changes "src/translations" "" ".po"
+
+ cmake-utils_src_prepare
+ # some tests fail or hang
+ sed -i \
+ -e '/add_test_file(translations_test.cpp/d' \
+ tests/CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory tests
+ fi
+
+ rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+ # spotify is not in portage
+ local mycmakeargs=(
+ -DBUILD_WERROR=OFF
+ # force to find crypto++ see bug #548544
+ -DCRYPTOPP_LIBRARIES="cryptopp"
+ -DCRYPTOPP_FOUND=ON
+ # avoid automagically enabling of ccache (bug #611010)
+ -DCCACHE_EXECUTABLE=OFF
+ -DENABLE_BREAKPAD=OFF #< disable crash reporting
+ -DENABLE_DEVICEKIT=OFF
+ -DENABLE_GIO=ON
+ -DENABLE_SPOTIFY_BLOB=OFF
+ -DUSE_SYSTEM_GMOCK=ON
+ -DUSE_SYSTEM_PROJECTM=ON
+ -DBUNDLE_PROJECTM_PRESETS=OFF
+ -DLINGUAS="$(l10n_get_locales)"
+ -DENABLE_BOX="$(usex box)"
+ -DENABLE_AUDIOCD="$(usex cdda)"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+ -DENABLE_DROPBOX="$(usex dropbox)"
+ -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_LIBGPOD="$(usex ipod)"
+ -DENABLE_LIBLASTFM="$(usex lastfm)"
+ -DENABLE_MOODBAR="$(usex moodbar)"
+ -DENABLE_LIBMTP="$(usex mtp)"
+ -DENABLE_VISUALISATIONS="$(usex projectm)"
+ -DENABLE_SEAFILE="$(usex seafile)"
+ -DENABLE_SKYDRIVE="$(usex skydrive)"
+ -DENABLE_LIBPULSE="$(usex pulseaudio)"
+ -DENABLE_UDISKS2="$(usex udisks)"
+ -DENABLE_WIIMOTEDEV="$(usex wiimote)"
+ )
+
+ use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${CMAKE_BUILD_DIR}" || die
+ virtx emake test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+ elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+ elog "depending on your preferences"
+}
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch b/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
new file mode 100644
index 000000000000..9f27e219e89d
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
@@ -0,0 +1,34 @@
+From 1bf633e71b7b5d8e5965971036d66e1d18552b49 Mon Sep 17 00:00:00 2001
+From: Michael Niggli <m.niggli@gmail.com>
+Date: Fri, 31 May 2019 17:04:46 +0200
+Subject: [PATCH] Fix blank window when restoring from systray
+
+This applies the fix qBittorrent used for this same issue:
+https://github.com/qbittorrent/qBittorrent/issues/9240,
+so credit goes to those guys
+---
+ src/ui/mainwindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
+index 2944d46ec..ad603fd64 100644
+--- a/src/ui/mainwindow.cpp
++++ b/src/ui/mainwindow.cpp
+@@ -1441,7 +1441,7 @@ void MainWindow::closeEvent(QCloseEvent* event) {
+ keep_running = s.value("keeprunning", tray_icon_->IsVisible()).toBool();
+
+ if (keep_running && event->spontaneous()) {
+- event->accept();
++ event->ignore();
+ SetHiddenInTray(true);
+ } else {
+ Exit();
+@@ -1454,7 +1454,7 @@ void MainWindow::SetHiddenInTray(bool hidden) {
+ // Some window managers don't remember maximized state between calls to
+ // hide() and show(), so we have to remember it ourself.
+ if (hidden) {
+- hide();
++ QTimer::singleShot(0, this, &QWidget::hide);
+ } else {
+ if (was_maximized_)
+ showMaximized();
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 9c7d800fe92a..1582dfdbdc57 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,7 +1,5 @@
DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.0.tar.xz 456100 BLAKE2B 328940422280b812ac8a677d4053ffd319f405bf26a6d4b84b80d6c9e3447e7e47003818c7e201d56f06a1ae1e339594dc455d267e1f44ccc3d22fff78249bb0 SHA512 f11651982bafae70a4451baa752ae21ed05c8f3c10c57e556ff2ad58d4d5c89f291c74e7b82b0a221d400484992526d9d5ee4f51f2428c725cf488b80f774f05
DIST lollypop-1.1.4.2.tar.xz 458120 BLAKE2B 2609e46c2a379bb5f2522291bca3b01e53ffaa8d15636f54eac1f067cd8711adcd38bde27b65f77ecc9ddc8e21ac974debded486d32c64bdc2c52d3d529d2d1d SHA512 8bea35b79ebfa723664558370f946def4d0ec493241f9409d0d00679d38a9d01dfe35438f3f865c08ebbff1d809aba17b92e174261f791c7c778a775dc60945d
EBUILD lollypop-1.0.12.ebuild 1366 BLAKE2B 76d3c0beb3b38f86ce5c68f3f1ffd5fb9bd8becca0ecd60fc45cd288f2b8945f2de0cbb630cc493fb8051ef589b6e7568279fda523448e6804eabdccf0e98023 SHA512 d6a6592473fd8ade16b8a13baa11307fd4ad9eda4889612d535a0b88b566366e8baccf380c7ca97686a46d839df5463756aa14ee5065f4ac75af616c9e5130a1
-EBUILD lollypop-1.1.0.ebuild 1367 BLAKE2B b1a1a2fd05ec6df8208b9329c464fc99f6ae205c9aa0c1681daef7e406c0cb647688e911cf3fbfb7ec864f1fc9edf05e8965226fd86de0f16645acddd679f882 SHA512 9d58b41629671bad12f91c25136f632ad633f808b1a7fd901d4d212cb769f57869f87ef5dffc66bf4564d7811c43ec5edd091b60547c300a7d0f71c4fef51b36
EBUILD lollypop-1.1.4.2.ebuild 1367 BLAKE2B 116d9d23a7f3f26f3b6a5e1324103a698c5c69aaccb31f84ff7a6df8fff7395d8ee2e1c9adefc45a770e642c3bfc35b031941fc433d523e8c8adfe9fa6bd72c5 SHA512 563d54270ef3e69ea4a206b3f23381f090cd55860b91964a03274f73369473183adcf5c8114f03cb8674cf1966e2091ece3fda8f37cac29c89d90479c572edb1
MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.0.ebuild b/media-sound/lollypop/lollypop-1.1.0.ebuild
deleted file mode 100644
index ccafb82635e5..000000000000
--- a/media-sound/lollypop/lollypop-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="dd514380c92e2f2e6ef20d366ccb96a5"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="${PYTHON_DEPS}
- dev-libs/appstream-glib[introspection]
- dev-libs/glib:2
- dev-libs/gobject-introspection[cairo]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/gnome-common
- x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
- dev-python/pkgconfig[${PYTHON_USEDEP}]
- dev-util/desktop-file-utils
- dev-util/itstool
- dev-util/intltool
-"
-RDEPEND="${DEPEND}
- app-crypt/libsecret[introspection]
- dev-libs/totem-pl-parser
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/dbus-python
- dev-python/pillow[${PYTHON_USEDEP}]
- >=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
- media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_gconf_install
- gnome2_schemas_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_gconf_uninstall
- gnome2_schemas_update
- xdg_desktop_database_update
-}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index f78e732337af..da50c5ab091f 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,12 +1,10 @@
AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
-AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc38fd9786f82cd2c1574759a5b11e7265bd5658e9f48fd0012746659facff7a8790ff6aed47a54ec04a SHA512 89f105c11da6da67d5e84faac2124840e0c447df492a80b71c277a2e3c9197d747bc31de0a26c80b79384838f1e0a20811fe1ffa66c74f3192eec1164f3f1911
+AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
-DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
-EBUILD murmur-1.3.0_rc1.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
-EBUILD murmur-1.3.0_rc2.ebuild 3269 BLAKE2B bcd647020380b09193036e30fa1fd86b2fe3fcd240b883fc1a7a20fc3aa0a041048632ce16605c1bc107bcf1b1ed923fc16e5f058b11fcc2864736d1e99b419a SHA512 4fed1a225e332f40df397838032f2ec64533a03f0ff34882cf3e752d86c50392b289bcbcd2fa25b4d8c71cf490319a68b37029e67088ecda4a48e21310ae5249
-EBUILD murmur-9999.ebuild 3269 BLAKE2B bcd647020380b09193036e30fa1fd86b2fe3fcd240b883fc1a7a20fc3aa0a041048632ce16605c1bc107bcf1b1ed923fc16e5f058b11fcc2864736d1e99b419a SHA512 4fed1a225e332f40df397838032f2ec64533a03f0ff34882cf3e752d86c50392b289bcbcd2fa25b4d8c71cf490319a68b37029e67088ecda4a48e21310ae5249
+EBUILD murmur-1.3.0_rc2-r1.ebuild 3565 BLAKE2B 4b8282c64999cf70a51fe234d23e0737b2c710984d188c733a97a90109120af9705eb21eef2a66da118043b64b6541fe372cabe92737f0981e5a9760d6cb6833 SHA512 b6fe723f3cf2e6468a47f2ffc0102d54f6fbc7cf374e5e97eaaa7e0853162f0604cf1b0db34e0b9c009f661a09c95ff0358cfd9dbf808ce9238c94b1f7f8ded3
+EBUILD murmur-9999.ebuild 3701 BLAKE2B 28c17e4ef71a4f38835fe66270873494718662321e7138e87c3d03017baa12da60eb5758274ca41b5860be0a13f500ae5b4a3edd735f3077fdf2b3029c88a36a SHA512 29c3ea8aea5c6a3da86d487a90a9fbf0d765ae31a73723e7b585f41fa36a5535605ec0efbbf4f0a3664d5e9bdd614d93cabf1220611981cf3e22acd0d5daa9ba
MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate
index c6ca48bbfb57..a82cb1a336c4 100644
--- a/media-sound/murmur/files/murmur.logrotate
+++ b/media-sound/murmur/files/murmur.logrotate
@@ -3,6 +3,6 @@
notifempty
sharedscripts
postrotate
- /etc/init.d/murmur reload > /dev/null
+ test -r /run/murmur/murmur.pid && kill -HUP $(cat /run/murmur/murmur.pid) &>/dev/null
endscript
}
diff --git a/media-sound/murmur/murmur-1.3.0_rc1.ebuild b/media-sound/murmur/murmur-1.3.0_rc1.ebuild
deleted file mode 100644
index 4ee163ac142e..000000000000
--- a/media-sound/murmur/murmur-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd user readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
- EGIT_SUBMODULES=( '-*' )
-else
- MY_PN="mumble"
- if [[ "${PV}" == *_pre* ]] ; then
- MY_P="${MY_PN}-${PV}"
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
- else
- MY_PV="${PV/_/-}"
- MY_P="${MY_PN}-${MY_PV}"
- SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_PN}-${PV/_*}"
- fi
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
- >=dev-libs/openssl-1.0.0b:0=
- >=dev-libs/protobuf-2.2.0:=
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- || (
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtsql:5[mysql]
- )
- dev-qt/qtxml:5
- sys-apps/lsb-release
- >=sys-libs/libcap-2.15
- dbus? ( dev-qt/qtdbus:5 )
- ice? ( dev-libs/Ice:= )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.41.0
-"
-BDEPEND="
- virtual/pkgconfig"
-
-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} || die
-}
-
-src_configure() {
- myuse() {
- [[ -n "${1}" ]] || die "myconf: No use flag given."
- use ${1} || echo "no-${1}"
- }
- local conf_add=(
- no-client
- $(myuse dbus)
- $(usex debug 'symbols debug' release)
- $(myuse ice)
- $(myuse pch)
- $(usex zeroconf '' no-bonjour)
- )
-
- eqmake5 main.pro -recursive \
- CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
- dodoc README CHANGES
-
- docinto scripts
- dodoc -r scripts/server
- docompress -x /usr/share/doc/${PF}/scripts
-
- local dir=release
- if use debug; then
- dir=debug
- fi
-
- dobin "${dir}"/murmurd
-
- insinto /etc/murmur/
- doins scripts/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/media-sound/murmur/murmur-1.3.0_rc2.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
index cfce5144e23e..0a7f6b035c25 100644
--- a/media-sound/murmur/murmur-1.3.0_rc2.ebuild
+++ b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
@@ -72,10 +72,20 @@ pkg_setup() {
src_prepare() {
default
+ if [[ "${PV}" == *9999 ]] ; then
+ pushd scripts &>/dev/null || die
+ ./mkini.sh || die
+ popd &>/dev/null || die
+ fi
+
sed \
-e 's:mumble-server:murmur:g' \
-e 's:/var/run:/run:g' \
- -i "${S}"/scripts/murmur.{conf,ini} || die
+ -i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+ # Adjust systemd service file to our config location #689208
+ sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+ -i scripts/${PN}.service || die
}
src_configure() {
@@ -103,15 +113,12 @@ src_install() {
dodoc -r scripts/server
docompress -x /usr/share/doc/${PF}/scripts
- local dir=release
- if use debug; then
- dir=debug
- fi
-
+ local dir="$(usex debug debug release)"
dobin "${dir}"/murmurd
- insinto /etc/murmur/
- doins scripts/murmur.ini
+ local etcdir="/etc/murmur"
+ insinto ${etcdir}
+ newins scripts/${PN}.ini.system ${PN}.ini
insinto /etc/logrotate.d/
newins "${FILESDIR}"/murmur.logrotate murmur
@@ -134,8 +141,8 @@ src_install() {
# 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
+ fowners root:murmur ${etcdir}/murmur.ini
+ fperms 640 ${etcdir}/murmur.ini
doman man/murmurd.1
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index cfce5144e23e..e0d9d8f503ee 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -54,6 +54,13 @@ DEPEND="${RDEPEND}
BDEPEND="
virtual/pkgconfig"
+if [[ "${PV}" == *9999 ]] ; then
+ # Required for the mkini.sh script which calls perl multiple times
+ BDEPEND+="
+ dev-lang/perl
+ "
+fi
+
DOC_CONTENTS="
Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
Please execute:\n
@@ -72,10 +79,20 @@ pkg_setup() {
src_prepare() {
default
+ if [[ "${PV}" == *9999 ]] ; then
+ pushd scripts &>/dev/null || die
+ ./mkini.sh || die
+ popd &>/dev/null || die
+ fi
+
sed \
-e 's:mumble-server:murmur:g' \
-e 's:/var/run:/run:g' \
- -i "${S}"/scripts/murmur.{conf,ini} || die
+ -i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+ # Adjust systemd service file to our config location #689208
+ sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+ -i scripts/${PN}.service || die
}
src_configure() {
@@ -103,15 +120,12 @@ src_install() {
dodoc -r scripts/server
docompress -x /usr/share/doc/${PF}/scripts
- local dir=release
- if use debug; then
- dir=debug
- fi
-
+ local dir="$(usex debug debug release)"
dobin "${dir}"/murmurd
- insinto /etc/murmur/
- doins scripts/murmur.ini
+ local etcdir="/etc/murmur"
+ insinto ${etcdir}
+ newins scripts/${PN}.ini.system ${PN}.ini
insinto /etc/logrotate.d/
newins "${FILESDIR}"/murmur.logrotate murmur
@@ -134,8 +148,8 @@ src_install() {
# 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
+ fowners root:murmur ${etcdir}/murmur.ini
+ fperms 640 ${etcdir}/murmur.ini
doman man/murmurd.1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 07:49:46 +0000