From 69904209679a68298101fb555bcd1c058edb98e2 Mon Sep 17 00:00:00 2001
From: Alexys Jacob <ultrabug@gentoo.org>
Date: Fri, 7 Jun 2013 10:38:46 +0000
Subject: version bump, fix #468742, drop old

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
---
 sys-cluster/moosefs/ChangeLog                | 10 +++-
 sys-cluster/moosefs/files/mfs.initd          | 79 ----------------------------
 sys-cluster/moosefs/files/mfscgiserver.initd | 21 --------
 sys-cluster/moosefs/moosefs-1.6.25.ebuild    | 61 ---------------------
 sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild | 67 +++++++++++++++++++++++
 sys-cluster/moosefs/moosefs-1.6.26.ebuild    | 61 ---------------------
 sys-cluster/moosefs/moosefs-1.6.27.ebuild    | 67 +++++++++++++++++++++++
 7 files changed, 143 insertions(+), 223 deletions(-)
 delete mode 100644 sys-cluster/moosefs/files/mfs.initd
 delete mode 100755 sys-cluster/moosefs/files/mfscgiserver.initd
 delete mode 100644 sys-cluster/moosefs/moosefs-1.6.25.ebuild
 create mode 100644 sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
 delete mode 100644 sys-cluster/moosefs/moosefs-1.6.26.ebuild
 create mode 100644 sys-cluster/moosefs/moosefs-1.6.27.ebuild

(limited to 'sys-cluster')

diff --git a/sys-cluster/moosefs/ChangeLog b/sys-cluster/moosefs/ChangeLog
index 0142f20d9e06..6eb0d12e5b8b 100644
--- a/sys-cluster/moosefs/ChangeLog
+++ b/sys-cluster/moosefs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/moosefs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/ChangeLog,v 1.5 2013/01/21 12:56:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/ChangeLog,v 1.6 2013/06/07 10:38:45 ultrabug Exp $
+
+*moosefs-1.6.27 (07 Jun 2013)
+*moosefs-1.6.26-r1 (07 Jun 2013)
+
+  07 Jun 2013; Ultrabug <ultrabug@gentoo.org> -moosefs-1.6.25.ebuild,
+  -moosefs-1.6.26.ebuild, +moosefs-1.6.26-r1.ebuild, +moosefs-1.6.27.ebuild,
+  -files/mfs.initd, -files/mfscgiserver.initd:
+  version bump, fix #468742 thx to Marcin Grabowski, drop old
 
 *moosefs-1.6.26 (21 Jan 2013)
 
diff --git a/sys-cluster/moosefs/files/mfs.initd b/sys-cluster/moosefs/files/mfs.initd
deleted file mode 100644
index b08d50c5d5d1..000000000000
--- a/sys-cluster/moosefs/files/mfs.initd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-chkconfig() {
-	[ -z "${ROLES}" ] && { eerror "No role defined !"; return 1;}
-	for ROLE in ${ROLES}; do
-		if [ ! -f /etc/mfs/${ROLE}.cfg ]; then
-			eerror "Missing configuration file for role ${ROLE} !"
-			return 1
-		fi
-	done
-	return 0
-}
-
-autorestore() {
-	einfo "AUTORESTORE set, trying to restore metadata files"
-	mfsmetarestore -a &>/dev/null
-	return $?
-}
-
-start_role() {
-	local ROLE=$1
-	local RETURN=0
-
-	ebegin "${ROLE}"
-	start-stop-daemon -q --start --exec "${ROLE}" -- start >/dev/null
-	RETURN=$?
-	eend ${RETURN}
-
-	return ${RETURN}
-}
-
-start_roles() {
-	local RETURN=0
-
-	eindent
-	for ROLE in ${ROLES}; do
-
-		start_role ${ROLE} || RETURN=$?
-		eend ${RETURN}
-
-		if [ "${RETURN}" != "0" ] && [ "${ROLE}" == "mfsmaster" ] && [ ${AUTORESTORE} -eq 1 ]; then
-			eindent
-			autorestore && start_role ${ROLE}
-			RETURN=$?
-			eoutdent
-		fi
-
-		[ "${RETURN}" != "0" ] && break
-	done
-	eoutdent
-
-	return ${RETURN}
-}
-
-start() {
-	ebegin "Starting mfs node"
-	chkconfig && start_roles
-	eend $?
-}
-
-stop() {
-	local RETURN=0
-
-	ebegin "Stopping mfs node"
-	eindent
-	local REVERSE=$(echo ${ROLES} | tac -s' ')
-	for ROLE in ${REVERSE}; do
-		ebegin "${ROLE}"
-		start-stop-daemon -q --stop -n ${ROLE} || RETURN=$?
-		eend ${RETURN}
-	done
-	eoutdent
-
-	eend ${RETURN}
-}
diff --git a/sys-cluster/moosefs/files/mfscgiserver.initd b/sys-cluster/moosefs/files/mfscgiserver.initd
deleted file mode 100755
index 13d033de7cd5..000000000000
--- a/sys-cluster/moosefs/files/mfscgiserver.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-
-PIDFILE=/var/run/mfscgiserv.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting mfs CGI server"
-	start-stop-daemon --start --quiet --exec /usr/sbin/mfscgiserv \
-	--pidfile "${PIDFILE}" --make-pidfile --background \
-	-- -H ${BIND_HOST} -P ${BIND_PORT} -f
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mfs CGI server"
-	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/sys-cluster/moosefs/moosefs-1.6.25.ebuild b/sys-cluster/moosefs/moosefs-1.6.25.ebuild
deleted file mode 100644
index adefb87c8068..000000000000
--- a/sys-cluster/moosefs/moosefs-1.6.25.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/moosefs-1.6.25.ebuild,v 1.1 2012/07/02 13:51:07 ultrabug Exp $
-
-EAPI=4
-
-inherit eutils
-
-MY_P="mfs-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A filesystem for highly reliable petabyte storage"
-HOMEPAGE="http://www.moosefs.org/"
-SRC_URI="http://www.moosefs.org/tl_files/mfscode/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi +fuse static-libs"
-
-RDEPEND="
-	cgi? ( dev-lang/python )
-	fuse? ( >=sys-fs/fuse-2.6 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup mfs
-	enewuser mfs -1 -1 -1 mfs
-}
-
-src_prepare() {
-	# rename dist config files
-	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
-}
-
-src_configure() {
-	local myopts=""
-	use fuse || myopts="--disable-mfsmount"
-	econf \
-		--sysconfdir=/etc/mfs \
-		--with-default-user=mfs \
-		--with-default-group=mfs \
-		$(use_enable cgi mfscgi) \
-		$(use_enable cgi mfscgiserv) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}/mfs.initd" mfs
-	newconfd "${FILESDIR}/mfs.confd" mfs
-	if use cgi; then
-		newinitd "${FILESDIR}/mfscgiserver.initd" mfscgiserver
-		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
-	fi
-
-	chown -R mfs:mfs "${D}/var/lib/mfs" || die
-	chmod 750 "${D}/var/lib/mfs" || die
-}
diff --git a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
new file mode 100644
index 000000000000..5152eda7d069
--- /dev/null
+++ b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild,v 1.1 2013/06/07 10:38:45 ultrabug Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1
+
+MY_P="mfs-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A filesystem for highly reliable petabyte storage"
+HOMEPAGE="http://www.moosefs.org/"
+SRC_URI="http://pro.hit.gemius.pl/hitredir/id=p4CVHPOzkVa0JJIK.m0Ee6dyHZEgoQb1KaiPmVK29EX.M7/url=moosefs.org/tl_files/mfscode/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgi +fuse static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	cgi? ( dev-lang/python )
+	fuse? ( >=sys-fs/fuse-2.6 )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup mfs
+	enewuser mfs -1 -1 -1 mfs
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# rename dist config files
+	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
+}
+
+src_configure() {
+	local myopts=""
+	use fuse || myopts="--disable-mfsmount"
+	econf \
+		--sysconfdir=/etc/mfs \
+		--with-default-user=mfs \
+		--with-default-group=mfs \
+		$(use_enable cgi mfscgi) \
+		$(use_enable cgi mfscgiserv) \
+		$(use_enable static-libs static) \
+		${myopts}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}/mfs.initd-r1" mfs
+	newconfd "${FILESDIR}/mfs.confd" mfs
+	if use cgi; then
+		python_fix_shebang "${D}"/usr/sbin/mfscgiserv
+		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
+		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
+	fi
+
+	chown -R mfs:mfs "${D}/var/lib/mfs" || die
+	chmod 750 "${D}/var/lib/mfs" || die
+}
diff --git a/sys-cluster/moosefs/moosefs-1.6.26.ebuild b/sys-cluster/moosefs/moosefs-1.6.26.ebuild
deleted file mode 100644
index d666a7098cdd..000000000000
--- a/sys-cluster/moosefs/moosefs-1.6.26.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/moosefs-1.6.26.ebuild,v 1.1 2013/01/21 12:56:41 ultrabug Exp $
-
-EAPI=4
-
-inherit eutils
-
-MY_P="mfs-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A filesystem for highly reliable petabyte storage"
-HOMEPAGE="http://www.moosefs.org/"
-SRC_URI="http://www.moosefs.org/tl_files/mfscode/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi +fuse static-libs"
-
-RDEPEND="
-	cgi? ( dev-lang/python )
-	fuse? ( >=sys-fs/fuse-2.6 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup mfs
-	enewuser mfs -1 -1 -1 mfs
-}
-
-src_prepare() {
-	# rename dist config files
-	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
-}
-
-src_configure() {
-	local myopts=""
-	use fuse || myopts="--disable-mfsmount"
-	econf \
-		--sysconfdir=/etc/mfs \
-		--with-default-user=mfs \
-		--with-default-group=mfs \
-		$(use_enable cgi mfscgi) \
-		$(use_enable cgi mfscgiserv) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}/mfs.initd-r1" mfs
-	newconfd "${FILESDIR}/mfs.confd" mfs
-	if use cgi; then
-		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
-		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
-	fi
-
-	chown -R mfs:mfs "${D}/var/lib/mfs" || die
-	chmod 750 "${D}/var/lib/mfs" || die
-}
diff --git a/sys-cluster/moosefs/moosefs-1.6.27.ebuild b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
new file mode 100644
index 000000000000..86b455d2dc53
--- /dev/null
+++ b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/moosefs/moosefs-1.6.27.ebuild,v 1.1 2013/06/07 10:38:45 ultrabug Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1
+
+MY_P="mfs-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A filesystem for highly reliable petabyte storage"
+HOMEPAGE="http://www.moosefs.org/"
+SRC_URI="http://pro.hit.gemius.pl/hitredir/id=.WCbG2t.7Ln5k1s3Q9xPg8cPfX.wVMc5kyXfrKcJTDH.c7/url=moosefs.org/tl_files/mfscode/${MY_P}-1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgi +fuse static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	cgi? ( dev-lang/python )
+	fuse? ( >=sys-fs/fuse-2.6 )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup mfs
+	enewuser mfs -1 -1 -1 mfs
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# rename dist config files
+	sed -i 's@\.cfg\.dist@\.cfg@g' mfsdata/Makefile.in || die
+}
+
+src_configure() {
+	local myopts=""
+	use fuse || myopts="--disable-mfsmount"
+	econf \
+		--sysconfdir=/etc/mfs \
+		--with-default-user=mfs \
+		--with-default-group=mfs \
+		$(use_enable cgi mfscgi) \
+		$(use_enable cgi mfscgiserv) \
+		$(use_enable static-libs static) \
+		${myopts}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}/mfs.initd-r1" mfs
+	newconfd "${FILESDIR}/mfs.confd" mfs
+	if use cgi; then
+		python_fix_shebang "${D}"/usr/sbin/mfscgiserv
+		newinitd "${FILESDIR}/mfscgiserver.initd-r1" mfscgiserver
+		newconfd "${FILESDIR}/mfscgiserver.confd" mfscgiserver
+	fi
+
+	chown -R mfs:mfs "${D}/var/lib/mfs" || die
+	chmod 750 "${D}/var/lib/mfs" || die
+}
-- 
cgit v1.2.3-65-gdbad