diff options
| author |   Stuart Hickinbottom <stuart@hickinbottom.com> | 2017-04-26 20:33:20 +0100 |
|---|---|---|
| committer | Stuart Hickinbottom <stuart@hickinbottom.com> | 2017-04-26 20:33:20 +0100 |
| commit | 4a127db8f60c6428c1100dcaabadc3f20f615608 (patch) | |
| tree | aea790a98f27fb9b500812dcbbd5196c7508b074 | |
| parent | Official release for logitechmediaserver-bin-7.9.0 (diff) | |
| parent | Minor lms bump for PR from lmiphay (diff) | |
| download | squeezebox-4a127db8f60c6428c1100dcaabadc3f20f615608.tar.gz squeezebox-4a127db8f60c6428c1100dcaabadc3f20f615608.tar.bz2 squeezebox-4a127db8f60c6428c1100dcaabadc3f20f615608.zip | |
Merge branch 'release/lms-7.9.0-lmiphay'lms-7.9.0-lmiphay
Minor bump to include some changes from a PR from @lmiphay.
4 files changed, 19 insertions, 16 deletions
diff --git a/media-sound/logitechmediaserver-bin/Manifest b/media-sound/logitechmediaserver-bin/Manifest index abc4d86..e41a6ec 100644 --- a/media-sound/logitechmediaserver-bin/Manifest +++ b/media-sound/logitechmediaserver-bin/Manifest @@ -13,7 +13,7 @@ AUX logitechmediaserver-bin-7.9.0-uuid-gentoo.patch 525 SHA256 d6e2aa6a0be007b77 AUX logitechmediaserver-bin-9999-client-playlists-gentoo.patch 395 SHA256 6ffa1ba22f6e519c02abafd4ae16055a4cb555af113bbac25f3a30d0a85f8845 SHA512 45ee8ee475b5dc798081608c95a8c0fffa4e4f5e4b03c53f38288fc534bf9818d6c7b8829fbbef2e5e5d8790922a7f77b557277ffda863ba20c937c795fefc4a WHIRLPOOL 481f9451a125119edf92e9e5f413628b3bdfb698b27271ccc36d033f91c538f1ac0796f5dc0117cfcb80ae0bfbbc6d8b3fea62985fcce1a1900ae0f8e631be4b AUX logitechmediaserver-bin-9999-uuid-gentoo.patch 525 SHA256 032f9edec613661f691797934cf73191c8ac94269cff59773c365f20603f01c4 SHA512 4c8a65893842aa9c0be21b3ad59fcf9f350e4c1b169099f4ffafe18b298ee7860693d529a3a7d81d7f4251bad5904f975e26e5fc2a33312003354bdda3e4bb87 WHIRLPOOL e74772fec480bc46d73073d5ce11e6052758ef20f636e99a74498ae3fe624b96241f3df7d36f63a94b34dbfc3017385872ada16698c6ff6c6f4c33e471c88348 AUX logitechmediaserver.conf.d 477 SHA256 4a2a77f66f35e6ea9867784de04c7552cfe36d9d583bf423ab2e871f85606713 SHA512 686c00e7a28df15369aad74d46700d5a943bf539a57828f83e313d82014c8610c41481aff2678908f90f6bf702c0ac5408bfc7909b155c21ddc5fec21fccac28 WHIRLPOOL 615d2acdeb804507082fe858925a16c228e7d07199ead5443219a5a78c891ae035b7e9046e9a4487e8c838f288d8421fd3cc642a38a0ee21ed3d919c3f673df3 -AUX logitechmediaserver.init.d 1137 SHA256 e4b6730b87ebafb71aa88d54df10ef6b58826bb3f1cb6f63def7df5cdee02066 SHA512 821b4f86d5adb5de425419ce69648787c20fef684b7475111da42b1705609cb1d775a41151188c4e7b0d4ede969dde9de4ae56ac2a073e0b20a98cfb3ea064a1 WHIRLPOOL e037a88bd293a72a18a432922470737349ddc282f518dcde40f28e7dd1e39e054a55868977e30cb63f1379edb7f14f8bb318c0d74818c6d54e5b52674485c5d2 +AUX logitechmediaserver.init.d 1127 SHA256 ba1578dc7879dda6aa3120f870bf55e2a5a5f9b0df8730e562c0fcc9f93be930 SHA512 ae2d5580a4706703927cd6a05aa64f3e5fa2a7bd2260885591323266f1fb127e5ef30cb94f5ced2313aabc0d59f9df06178301266d71978561b86419c4d86ae4 WHIRLPOOL f8cb59de1d7cc8951a5ea4aa05d35da59eae19b2db0371f82e32d506f62b8776cc498b08037197365e0d8cc81edb0ab416a583a881044074c21430d17bf3a5ce AUX logitechmediaserver.logrotate.d 347 SHA256 82fd4cdb8537b610ec220545afc606c4b39481d449c08215073732fa27a247d0 SHA512 5787166d7318e494c574e965f47f6074805371283f5fd33955e02302ba43ffc64b2aa18f1c5a081d23ba49fb76cf512cfd966e5d68496fa54c05f911bab422b6 WHIRLPOOL 297329d107bc41846a4cc617c5cb05983e2839372b2684801d01ecea171d7a31603659d539e19b31559338de1702334d053c174acab697eda3d5f09e01c0efc5 AUX logitechmediaserver.service 505 SHA256 b3042d06c4ed0217888d3d94ac78825b47bf2f667a6662c98781bd1fcc3781f4 SHA512 e07226d91a9806ff2c57e5868ef1cabbcda3bd90df0de3447071ee5d9b9b014a15c4b85885c0682b556addb8a103daf2a60a0d06539ea64decb75e7b84ad957b WHIRLPOOL 3a6846ccbd14ce5a167e72cbf97c9c316e99ff77f6c690887861e61376c3fdb975008be2f625ec946e01feab567fd21b35bad5b8331a699502f3243a67a9dc4b DIST 46bfa033e5ab0f431f84613f31d8431da048da86.zip 64431952 SHA256 879dbc9d7fe5d80b72ae5ddd24a7070d57bf6c1f3a50adbb8d37384c85fa1a85 SHA512 3dfe0ebe5af6143bae6512ba2525a3f3e1e80e29e1aadb54b65f51a22d7d06353dc7df9f38f36744e5c406ea15564b12e876992e8a04746b3948e59c99260700 WHIRLPOOL 2146c2475039c07c751db9cb0036aa079eb071fdac3deacc1eea167be446d8d7e5984de8d00174a7220f04aafcfad9ee343db87bdf44507d41d853413d011a47 @@ -21,6 +21,6 @@ DIST logitechmediaserver-7.8.0.tgz 122208430 SHA256 57dd70095538c35f6bbd1eac2d2b DIST logitechmediaserver-7.9.0.tgz 155537396 SHA256 601c2535b18c633b41f57c64d5d74bc7b10a761dfe46b677fa1004d6f28d84a1 SHA512 2422c65fdcbc33e7ee2592a389176532dffc991cd445ee3dda1b4f6a0f76f783d8ccd29e09ecfa50957813b876c275fcde7c207d787dbfa6f633b8da7d4e9ea8 WHIRLPOOL 2ac11a92f8394889660cdc5213d9d05abd24169d5c087639869873c3da739ba62c61519a027c45cd8e2bb97ae0c0913a74cfc78aa227c939f86f0e92534c089f EBUILD logitechmediaserver-bin-7.8.0.ebuild 59386 SHA256 144a6b787dca8dfede89bbf49da886c19a4cf74be84b09aaf32c8c1f7b6a39a7 SHA512 a08acb18f364b04610002a03c6e0c177beefaaef53282f14ebf955ff96c1634dbf4c14d6eca9c65158162a06d9727ae6b44231e76b7dd7a7c4c4f5f43eb7bb48 WHIRLPOOL d3b0b8c2facaf6928b4342b53688744a163da211193d30167489c4c24fbe1f4a301269f1eec3581044d14735df322ab3429b8499e2f54ebd998fb8ef8e381da4 EBUILD logitechmediaserver-bin-7.8.1_pre20140927.ebuild 62107 SHA256 957effdd84c53c92ca69ac33ecb385d16cb0f78bfb1dca674bc0507af668d480 SHA512 9a466c576582d226bc90b9f793000aaf317e42654a871cff6d2fd8bf149471a0fb728b866103489cab4fdcf536dbd94e1e496eb78512cb196246d6e754f74cb4 WHIRLPOOL 2d1c237193a5386e70c029d3fce55cdc8063c32d37f8b273689d2a34ba0a251750e611828a9db646d878dd709825422b0f0861ba36cc52891a0e11bad8209fbf -EBUILD logitechmediaserver-bin-7.9.0.ebuild 67982 SHA256 ac267cb201e456d662b6181400d50f00d16e2bb97d8375baec3a2722112fbd89 SHA512 aae0ff2bf218ae0e69991dbcf8fc2b01c5f82485434764ab13626787a1d5f3ea533fb40f35ff422a2f94a518b589ce060ca90506ba5ab8c6037d854e13687b43 WHIRLPOOL e081692d917b8e41622e7a09f11dfd573c57b134720e8b4ab740b7a30b3ed2dc88be351c7a31515942f43dae7bcb84e75e89ab114be3d3189d39492f89395853 -EBUILD logitechmediaserver-bin-9999.ebuild 8732 SHA256 937567e73b6fc5282b48e5284ca45d539ad190a57ba83b3507a64accff63e6de SHA512 bc2cd0e4253343edba107e5a4979e871af847a4a2a336374bcc9ce0d07207052cb831fd3bf242dcd4bc08f53c0afec269cd67845263988c81d97077271da5f98 WHIRLPOOL 9bebf7b888643ffd77e9d5cefc93e6e53bcc23525260f0276585d7625fc9f6ec4efdee8f2292a32d73b7a6c543bf598061fe424c946a40c165f6dd242a25eafd +EBUILD logitechmediaserver-bin-7.9.0.ebuild 68107 SHA256 9d84d4f8f1b927c559285a5640a2076cd349fdb46ec9641e65067323907bf800 SHA512 5820c089ce1ac74815cf568beb765fb160cb5ccecd0eca11af0921ce87c2410fdcda902f62c7abcc91d6bdf4604f4567144ec48760ecd98a1a2900d14959efef WHIRLPOOL cd0564867a7bce0fd7d361adbc566c79287827901bbae6419ded5a6ce7e14d945af3f887773a2a0813b1d718e52aea093d89bf220ec112979290d6d81eb13932 +EBUILD logitechmediaserver-bin-9999.ebuild 8857 SHA256 5f48d19c9eb64eb2cc3039ad91ba3348ff40ac4d55deebc2a460db019109de2c SHA512 dce0e853e7cff53b615f244bd701ad1629f79adc6562252e28c57fe2b695fa8232f4f48dacfe65480428608b68c96fea84e430590a465c18319a0bca63a8a351 WHIRLPOOL 737538e9facf754e51ae7fdf8040b7c805fa7acaf8b7064be7f0f40da2fbd4b14254ec38adb8658f22400a15c02f65bbf75f93fc99f915d756f10c669ac07133 MISC metadata.xml 696 SHA256 fbdc4cc9be99f9293be5c7527ea8f5662c87e79d8f2408d53b5137e340edf763 SHA512 50a24dec62483c8ab21de63397a113b7ae218ea3fb5f454aecb7c647ecf336dfc0e4d276f594e5dd036f8851fad9a28c2077bf10f94ee0de591cafbb9f3a80e2 WHIRLPOOL c569ea771de1dacfc99c2495d8a4872ac95ede6e75b593fe2f893cbcf476d32d5daedeec9685ad7c84734fb1bbf421523ecd1ac9d8e1500886275ea90179dbb7 diff --git a/media-sound/logitechmediaserver-bin/files/logitechmediaserver.init.d b/media-sound/logitechmediaserver-bin/files/logitechmediaserver.init.d index eadbe72..284df12 100755 --- a/media-sound/logitechmediaserver-bin/files/logitechmediaserver.init.d +++ b/media-sound/logitechmediaserver-bin/files/logitechmediaserver.init.d @@ -1,7 +1,6 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header$ # These fit the Logitech Media Server ebuild and so shouldn't need to be # changed; user-servicable parts go in /etc/conf.d/logitechmediaserver. diff --git a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.9.0.ebuild b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.9.0.ebuild index 97e21b5..35ef5a5 100644 --- a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.9.0.ebuild +++ b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.9.0.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header$ -EAPI="5" +EAPI="6" MY_PN="${PN/-bin}" @@ -17,8 +16,8 @@ elif [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="public/7.9" EGIT_REPO_URI="https://github.com/Logitech/slimserver.git" HOMEPAGE="http://github.com/Logitech/slimserver" - S="${WORKDIR}/slimserver" - INHERIT_VCS="git-2" + S="${WORKDIR}/${PN}-${PV}" + INHERIT_VCS="git-r3" else MY_PV="${PV/_*}" MY_P="${MY_PN}-${MY_PV}" @@ -35,6 +34,7 @@ fi inherit ${INHERIT_VCS} eutils user systemd DESCRIPTION="Logitech Media Server (streaming audio server)" +HOMEPAGE="http://github.com/Logitech/slimserver" LICENSE="${PN}" RESTRICT="bindist mirror" SLOT="0" @@ -742,6 +742,8 @@ src_prepare() { # Apply patches to make LMS work on Gentoo. epatch "${FILESDIR}/${P}-uuid-gentoo.patch" epatch "${FILESDIR}/${P}-client-playlists-gentoo.patch" + (cd Bin && rm -rf arm*-linux i86pc-solaris* sparc-linux powerpc-linux) + eapply_user } src_install() { diff --git a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-9999.ebuild b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-9999.ebuild index 110f286..eade86a 100644 --- a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-9999.ebuild +++ b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header$ -EAPI="5" +EAPI="6" MY_PN="${PN/-bin}" @@ -17,8 +16,8 @@ elif [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="public/7.9" EGIT_REPO_URI="https://github.com/Logitech/slimserver.git" HOMEPAGE="http://github.com/Logitech/slimserver" - S="${WORKDIR}/slimserver" - INHERIT_VCS="git-2" + S="${WORKDIR}/${PN}-${PV}" + INHERIT_VCS="git-r3" else MY_PV="${PV/_*}" MY_P="${MY_PN}-${MY_PV}" @@ -35,6 +34,7 @@ fi inherit ${INHERIT_VCS} eutils user systemd DESCRIPTION="Logitech Media Server (streaming audio server)" +HOMEPAGE="http://github.com/Logitech/slimserver" LICENSE="${PN}" RESTRICT="bindist mirror" SLOT="0" @@ -95,6 +95,8 @@ src_prepare() { # Apply patches to make LMS work on Gentoo. epatch "${FILESDIR}/${P}-uuid-gentoo.patch" epatch "${FILESDIR}/${P}-client-playlists-gentoo.patch" + (cd Bin && rm -rf arm*-linux i86pc-solaris* sparc-linux powerpc-linux) + eapply_user } src_install() { |