commit: 231fb625b51838efdee0e74e4e3cbc8b3a45e41c Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> AuthorDate: Fri May 4 08:50:20 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri May 11 08:53:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231fb625
media-sound/teamspeak-server-bin: Bump to version 3.1.3 Closes: https://bugs.gentoo.org/654236 Closes: https://github.com/gentoo/gentoo/pull/8223 Package-Manager: Portage-2.3.33, Repoman-2.3.9 media-sound/teamspeak-server-bin/Manifest | 4 +- media-sound/teamspeak-server-bin/metadata.xml | 11 +++-- ....2.ebuild => teamspeak-server-bin-3.1.3.ebuild} | 56 +++++++++++----------- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest index 7992b9433d4..69dcc27d260 100644 --- a/media-sound/teamspeak-server-bin/Manifest +++ b/media-sound/teamspeak-server-bin/Manifest @@ -1,2 +1,2 @@ -DIST teamspeak3-server_linux_amd64-3.1.2.tar.bz2 7816668 BLAKE2B 4421a439e07ce6dac2556a95818bae7be91622ceea5c597f1fd02ee13815f760086dea13a3ac11a55c928ccfc4b134bb97c0f3092def85ff765e311d6ef69459 SHA512 42993b4cc881ca2bc7d7deb5eaf4e7a9cc3be462abba0f174d6074f0ca18bf59cbe8607dac5a9750331d28ac1984527a8210f53cf6cf077be86b26d141c7bc78 -DIST teamspeak3-server_linux_x86-3.1.2.tar.bz2 7676301 BLAKE2B a4b7557e215612f11bd4ee892dff199d0017e6af7a24bc3dce83a4ac6ddbe807b3960b66c9948298c4463ad2d08aedf27468487f91b15d197d0e2c01b7771956 SHA512 04dce6831332e44ff0edfdc664f422616522bb342338a2b6bb2cd73aba5cc5965dfa4c77fa7c041c06727a3f50fd842142198fd99568c1db6c9810f07accdb48 +DIST teamspeak3-server_linux_amd64-3.1.3.tar.bz2 7818829 BLAKE2B 61f06e94c677c2569f3d5e13ba797f9aa04c750a4cb547edf98dfe5e461aa62a007220c695ec07ed5be26a20ed1c70192ff1bb46a881c1b60ba52cc5149a084c SHA512 732d3c9ad30796d1dc4028e953ff3e96835a3dc5f05389b44b1c35184dc07765bdd16a39f52d8f5a19a6f31a2a1035d8e3b39020178b4eab8837119fefbc0bab +DIST teamspeak3-server_linux_x86-3.1.3.tar.bz2 7676538 BLAKE2B 2f57bee0bfb1e7f643e92695c813ed2bbb0b080a76fa2a0eb2a1bdb288edcbbd93c1233a6a8be129473c397c7471554743f57f6ee37242e272db2ba4dfa2bc8d SHA512 050423ed4ef9eedcfb96499cddaf15405aaf4e15ace6d89eed55085f9173394b431ac12e9d226af015e5eddaa484e65f8b475bd04167d3311cb7e33d8c059a7d diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml index 67ae94b5f92..812b26bfd18 100644 --- a/media-sound/teamspeak-server-bin/metadata.xml +++ b/media-sound/teamspeak-server-bin/metadata.xml @@ -9,10 +9,13 @@ <email>proxy-ma...@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription>TeamSpeak Server (Voice Communication Software)</longdescription> + <longdescription> + TeamSpeak is a proprietary voice-over-Internet Protocol (VoIP) application + for audio communication between users on a chat channel, much like a telephone conference call. + Users typically use headphones with a microphone. + The server software allows users to connect and join chat channels. + </longdescription> <use> - <flag name="doc">Install TeamSpeak complete documentation.</flag> - <!-- <flag name="mysql">Install TeamSpeak MariaDB support.</flag> --> - <flag name="tsdns">Install TeamSpeak DNS.</flag> + <flag name="tsdns">Install TeamSpeaks own DNS service.</flag> </use> </pkgmetadata> diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild similarity index 69% rename from media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild rename to media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild index 5bbbf749cb0..aa03952e42e 100644 --- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild +++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild @@ -5,27 +5,27 @@ EAPI=6 inherit systemd user -DESCRIPTION="TeamSpeak is software for quality voice communication via the Internet" +DESCRIPTION="A server software for hosting quality voice communication via the internet" HOMEPAGE="https://www.teamspeak.com/"; SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )" LICENSE="LGPL-2.1 teamspeak3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc tsdns" -# IUSE="doc mysql tsdns" +KEYWORDS="-* ~amd64 ~x86" +IUSE="doc mysql tsdns" -# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0= -# <dev-libs/openssl-1.1:0= -# sys-libs/zlib )" +RDEPEND="mysql? ( <dev-libs/openssl-1.1:0= + sys-libs/zlib:= )" RESTRICT="mirror strip" S="${WORKDIR}/teamspeak3-server_linux" -QA_PREBUILT="opt/teamspeak3-server/libts3db_sqlite3.so - opt/teamspeak3-server/ts3server" +QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2 + opt/teamspeak3-server/libts3db_mariadb.so + opt/teamspeak3-server/libts3db_sqlite3.so + opt/teamspeak3-server/ts3server" pkg_setup() { enewgroup teamspeak @@ -43,7 +43,6 @@ src_unpack() { } src_install() { - # Accept license touch "${T%/}"/.ts3server_license_accepted || die insinto "/opt/teamspeak3-server" doins "${T}"/.ts3server_license_accepted @@ -68,19 +67,19 @@ src_install() { systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf - # Install optional mysql - # if use mysql; then - # insinto "/etc/teamspeak3-server" - # doins "${FILESDIR}/ts3server_mariadb.ini.sample" - # doins "${FILESDIR}/ts3db_mariadb.ini.sample" - # - # exeinto "/opt/teamspeak3-server" - # doexe "libts3db_mariadb.so" - # - # insinto "/opt/teamspeak3-server/sql" - # doins -r "sql/create_mariadb" - # doins -r "sql/updates_and_fixes" - # fi + if use mysql; then + insinto "/etc/teamspeak3-server" + doins "${FILESDIR}/ts3server_mariadb.ini.sample" + doins "${FILESDIR}/ts3db_mariadb.ini.sample" + + exeinto "/opt/teamspeak3-server" + doexe "libts3db_mariadb.so" + doexe "redist/libmariadb.so.2" + + insinto "/opt/teamspeak3-server/sql" + doins -r "sql/create_mariadb" + doins -r "sql/updates_and_fixes" + fi if use doc; then local HTML_DOCS=( "doc/serverquery/." ) @@ -110,12 +109,11 @@ src_install() { keepdir "/etc/teamspeak3-server" keepdir "/var/log/teamspeak3-server" - # Protect config - # if use mysql; then - # echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die - # else - echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die - # fi + if use mysql; then + echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die + else + echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die + fi doenvd "${T}"/99teamspeak3-server fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
