gentoo resync : 10.11.2019

3 files changed, 102 insertions, 5 deletions

diff --git a/dev-perl/MogileFS-Server/Manifest b/dev-perl/MogileFS-Server/Manifest
index 4d9c5448998a..bbb15099ee57 100644
--- a/dev-perl/MogileFS-Server/Manifest
+++ b/dev-perl/MogileFS-Server/Manifest
@@ -1,4 +1,6 @@
 AUX MogileFS-Server-2.720.0-gentoo-init-conf.patch 3945 BLAKE2B 590164b44c6f166950a7625b669a5ad94891b70d078b9c3780ed4385536cd124c6aefdca3aa29c2127cda61987f8b19e1ba5c59f48ee01d50d46060a1b2fd5f9 SHA512 e8a294dcea44a25f2128d199b3e202a799ed4fc8716ae1e99606ccee900a8d1ecb4a5dff7a5369038bf936bc40fcb2e0dae104a1a0d4415eb49dfbd47aa69a09
 DIST MogileFS-Server-2.72.tar.gz 200057 BLAKE2B 835a7799389e536b42ed000b8ce07225609501ee6a4c002253a0018d0b17c815e8825a56f78ee0c0604d57cafea45ac044fda4e6e6bc33e0b60b8ed5b51a7e10 SHA512 4076ba33123c984f9d7c56db7d308b4d857e852caa8d811d86ed551b9ab74a6dfc93b034d034ec2802376035799860c613aef2bdd3898c1225e37727fda34ade
-EBUILD MogileFS-Server-2.720.0-r1.ebuild 1983 BLAKE2B 10713fd1c36cf707c657b88d2592bcc07503ab6178006c9594233a7f9f9887c746d84702d3f9c7984c7d03dadc0e44347b30f7cf235725d99c7ee2cb4ad8444f SHA512 4fd691e7bc7d2fc49aa95471badefdd973ba7f4f53e7a1f1a4505e46b1c8f42e2b9a4b29560a50ac7020d59d2e065072f79d65ffc2b154fbc19b18b1783ef154
+DIST MogileFS-Server-2.73.tar.gz 202285 BLAKE2B bd7032a507df8eba7e8c48205a8d76e66a85e28a2223bce47a1753c38d700a5e8b3ab72e5bffd592d1aec4918374e57d3bf882b911f3d5fb6d1f403a4d32275f SHA512 9d5f67334d1877e9a6e63abb728a9d00b93f35579057102b9601a9c65bd3ff8438090e560ddefaec04ce24d4d2c9a7554d7ea2595b5e4ba6f4f2c4554ccac268
+EBUILD MogileFS-Server-2.720.0-r1.ebuild 2432 BLAKE2B 222e0b5258434290740b1d3c25cf40dbad15a632094f638f1e5f765742faa525ae01f564dd7d974b9a4b1be38ad3669e5068ac0f674407d52f8547c836632b03 SHA512 355e78ed91e1148e9f668c4e64e60d0fc52dbad1c2a882a3d3995a64b95a15bdb0e2ef1192a320c903685cace7a15d055a776ee8f3a63b150d8917b2c612843e
+EBUILD MogileFS-Server-2.730.0.ebuild 2432 BLAKE2B 222e0b5258434290740b1d3c25cf40dbad15a632094f638f1e5f765742faa525ae01f564dd7d974b9a4b1be38ad3669e5068ac0f674407d52f8547c836632b03 SHA512 355e78ed91e1148e9f668c4e64e60d0fc52dbad1c2a882a3d3995a64b95a15bdb0e2ef1192a320c903685cace7a15d055a776ee8f3a63b150d8917b2c612843e
 MISC metadata.xml 4549 BLAKE2B eb81910b09295bbf72b0afc491e873184f7d6c247cc439c3df52dcdbab00af94b336491c218ef31e232fecdc5f3b89f44a233f6911c818b1c96e651c817f6336 SHA512 406e5860c1e43a71c2e101891b83986bdb9b604d5a92e021abdb1b28900b05bc51a81551ee8d535e31fc78b29e0de34fd956f4ccd3743ccf5d749600e0594bce
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
index 691d30b4fd8f..8d2a778a8ff5 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,9 @@ inherit user perl-module
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
 
-IUSE="mysql sqlite postgres"
+IUSE="mysql +sqlite test postgres"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( sqlite ) || ( mysql sqlite postgres )"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
@@ -35,9 +37,9 @@ RDEPEND="dev-perl/Net-Netmask
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo-init-conf.patch"
+	"${FILESDIR}/${PN}-2.720.0-gentoo-init-conf.patch"
 )
-DIST_TEST="do"
+DIST_TEST="never verbose"
 
 MOGILE_USER="mogile"
 
@@ -75,3 +77,10 @@ pkg_postinst() {
 	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
 	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
 }
+
+src_test() {
+	# these need to be in the env and the makeopts
+	export MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite TMPDIR="${T}/mogile"
+	#perl-module_src_test
+	make -j1 test TEST_VERBOSE=1 MOGTEST_DBUSER=${MOGTEST_DBUSER} MOGTEST_DBNAME=${MOGTEST_DBNAME} MOGTEST_DBTYPE=${MOGTEST_DBTYPE} TMPDIR="${TMPDIR}"
+}
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
new file mode 100644
index 000000000000..8d2a778a8ff5
--- /dev/null
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DORMANDO
+DIST_VERSION=${PV%0.0}
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+
+IUSE="mysql +sqlite test postgres"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( sqlite ) || ( mysql sqlite postgres )"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.610.0
+		>=dev-perl/Sys-Syscall-0.220.0
+		>=dev-perl/Perlbal-1.790
+		>=dev-perl/IO-AIO-4
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.170.0
+		>=dev-perl/MogileFS-Utils-2.280.0
+		dev-perl/Cache-Memcached
+		dev-perl/DBI
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.720.0-gentoo-init-conf.patch"
+)
+DIST_TEST="never verbose"
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_install() {
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${S}"/gentoo/conf.d/mogilefsd mogilefsd
+	newinitd "${S}"/gentoo/init.d/mogilefsd mogilefsd
+
+	newconfd "${S}"/gentoo/conf.d/mogstored mogstored
+	newinitd "${S}"/gentoo/init.d/mogstored mogstored
+
+	newinitd "${S}"/gentoo/init.d/mogautomount mogautomount
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/mogdata
+
+	diropts -m 755 -o root
+	dodir /etc/mogilefs
+
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${S}"/gentoo/conf/mogilefsd.conf mogilefsd.conf
+	newins "${S}"/gentoo/conf/mogstored.conf mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}
+
+src_test() {
+	# these need to be in the env and the makeopts
+	export MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite TMPDIR="${T}/mogile"
+	#perl-module_src_test
+	make -j1 test TEST_VERBOSE=1 MOGTEST_DBUSER=${MOGTEST_DBUSER} MOGTEST_DBNAME=${MOGTEST_DBNAME} MOGTEST_DBTYPE=${MOGTEST_DBTYPE} TMPDIR="${TMPDIR}"
+}