From a17fbbf40c0271ecff95c9a2d5f8a6cd71796346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Thu, 7 Aug 2014 19:38:28 +0200 Subject: [PATCH] [media-sound/teamspeak-server-bin] bump to beta release, needs cleanup a bit but works, mysql useflag unmasked due to migration to mariadb --- media-sound/teamspeak-server-bin/Manifest | 4 ++-- .../{ts3db_mysql.ini => ts3db_mariadb.ini} | 0 ... teamspeak-server-bin-3.0.11_beta1.ebuild} | 24 ++++++++++++------- profiles/package.use.mask | 11 --------- 4 files changed, 17 insertions(+), 22 deletions(-) rename media-sound/teamspeak-server-bin/files/{ts3db_mysql.ini => ts3db_mariadb.ini} (100%) rename media-sound/teamspeak-server-bin/{teamspeak-server-bin-3.0.10.3.ebuild => teamspeak-server-bin-3.0.11_beta1.ebuild} (66%) delete mode 100644 profiles/package.use.mask diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest index 20e1fb8..6ca069e 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.0.10.3.tar.gz 4361521 SHA256 9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702 SHA512 8a5927c48ef84a1a513f576eae05e11c9c19ac3e84bc6e6a7f3d0f784cea5c94b90ed784f595d17aca0b835b8e2dfd6ef7c78a9f21b2392bc27140f81027f846 WHIRLPOOL 051f95b8102a22a4605c6e85e638ff6fe6c5738725bdb9863d8b7f9bc00083ac75899fb0131de40ed4c10a9594562fa964150d3fb24da8aa9cfd435db1fc7545 -DIST teamspeak3-server_linux-x86-3.0.10.3.tar.gz 4711772 SHA256 8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5 SHA512 0c5369aee91bed52276741fd40518f6036fd8db5358305c2dc5b8f898537dc2e1209ebef59c09840ff3c636d1b6aabe75bf0a874658e979a23034c97b20f8022 WHIRLPOOL 042f259576d46c3bea211832edab9ec7c323e721a6196c5f56c23d6f502ff9d9db053f004e07add092a8eec2a44909708155fb7ab241ef8173ca61b743be8198 +DIST teamspeak3-server_linux-amd64-3.0.11.tar.gz 5037796 SHA256 f624f521b9dc33299b1473f2cc60e574b0eb92452cc8fecfbe17a4d0ef1fc1ad SHA512 b9b65ea9a338ec9a5a072d63da486567fd930a5931cfd02e6334dbc95f6749147c6646789dd294f455efd04fb0e88ace4273208e1ad212268ddf004bc44b4b13 WHIRLPOOL 4e8a5d53029fa3f78acac9a590b6d8f5b459a3cd1b20e127dd17d718e32a595a5982d5b70a01d2560fe73ea022a5c78efbe540adfada385fc602934983b0bb3b +DIST teamspeak3-server_linux-x86-3.0.11.tar.gz 5191691 SHA256 fc31c367e1f7644321919d2c33b599b779f41e27f2503ccf3a2c9105127cc371 SHA512 3f70b2811bc1cbd567fdc3c695586f1dde1fd78f1a127d75b5407196537727e38e0cb201294e4c6337a483295ae0a0bade017a3dec5e544bf912d9a733159def WHIRLPOOL e646afe9e4f270e7baa4816490d78e8924a2c1f8a3c20f25da4bbac10f7e4dd8eca74a75fb6f1bbb78d1a3e5beb7a0568ac392fecc874bd29673eabf274675dc diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini similarity index 100% rename from media-sound/teamspeak-server-bin/files/ts3db_mysql.ini rename to media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11_beta1.ebuild similarity index 66% rename from media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild rename to media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11_beta1.ebuild index 95f2872..5303686 100644 --- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild +++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11_beta1.ebuild @@ -4,12 +4,16 @@ EAPI="5" -inherit eutils systemd user +inherit eutils systemd user versionator + +MY_PV="$(get_version_component_range 1-3)-Beta-1" DESCRIPTION="TeamSpeak Server - Voice Communication Software" HOMEPAGE="http://www.teamspeak.com/" -SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz ) - x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )" +#SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz ) +# x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )" +SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/${MY_PV}/teamspeak3-server_linux-amd64-$(get_version_component_range 1-3).tar.gz ) + x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/${MY_PV}/teamspeak3-server_linux-x86-$(get_version_component_range 1-3).tar.gz )" RESTRICT="fetch mirror strip" @@ -18,16 +22,18 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc pdf mysql tsdns" -DEPEND="mysql? ( =virtual/mysql-5.0 )" +DEPEND="mysql? ( >=virtual/mysql-5.5 )" RDEPEND="${DEPEND}" S="${WORKDIR}/teamspeak3-server_linux-${ARCH}" pkg_nofetch() { if use amd64 ; then - einfo "Please download teamspeak3-server_linux-amd64-${PV}.tar.gz" +# einfo "Please download teamspeak3-server_linux-amd64-${PV}.tar.gz" + einfo "Please download teamspeak3-server_linux-amd64-$(get_version_component_range 1-3).tar.gz" elif use x86 ; then - einfo "Please download teamspeak3-server_linux-x86-${PV}.tar.gz" +# einfo "Please download teamspeak3-server_linux-x86-${PV}.tar.gz" + einfo "Please download teamspeak3-server_linux-x86-$(get_version_component_range 1-3).tar.gz" fi einfo "from ${HOMEPAGE}?page=downloads and place this" einfo "file in ${DISTDIR}" @@ -52,8 +58,8 @@ src_install() { exeinto ${opt_dir} doexe *.sh doins *.so - # 'libmysqlclient.so.15' is hard-coded into the ts3-server binary :( - use mysql && dosym "${ROOT}"usr/$(get_libdir)/mysql/libmysqlclient.so ${opt_dir}/libmysqlclient.so.15 + # 'libmariadb.so.2' is hard-coded into the ts3-server binary :( + use mysql && doexe redist/libmariadb.so.2 doins -r sql # Install documentation and tsdns. @@ -74,7 +80,7 @@ src_install() { # Install the runtime FS layout. insinto /etc/teamspeak3-server doins "${FILESDIR}"/server.conf - use mysql && doins "${FILESDIR}"/ts3db_mysql.ini + use mysql && doins "${FILESDIR}"/ts3db_mariadb.ini keepdir /{etc,var/{lib,log,run}}/teamspeak3-server # Install the init script and systemd unit. diff --git a/profiles/package.use.mask b/profiles/package.use.mask deleted file mode 100644 index f52bcdf..0000000 --- a/profiles/package.use.mask +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# This file requires >=portage-2.1.1 -# New entries go on top. -# - -# Robert Förster (17 Jan 2014) -# this requires =mysql-5.0* which is masked in g-x86 -media-sound/teamspeak-server-bin mysql