9 files changed, 54 insertions, 113 deletions
diff --git a/net-libs/xrootd/ChangeLog b/net-libs/xrootd/ChangeLog
index b8339421038d..215de64acc6d 100644
--- a/net-libs/xrootd/ChangeLog
+++ b/net-libs/xrootd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/xrootd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/ChangeLog,v 1.9 2012/09/29 23:38:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/ChangeLog,v 1.10 2012/12/05 18:19:15 bicatali Exp $
+
+*xrootd-3.2.6 (05 Dec 2012)
+
+  05 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +xrootd-3.2.6.ebuild,
+  -xrootd-3.2.2.ebuild, -xrootd-3.2.4.ebuild, files/cmsd.initd,
+  files/frm_purged.initd, files/frm_xfrd.initd, files/xrootd.initd,
+  metadata.xml, xrootd-3.2.1.ebuild:
+  Version bump. Transfering checks on /var/run and /var/spool at install time to
+  run-time (bug #445882)
 
 *xrootd-3.2.4 (29 Sep 2012)
 
diff --git a/net-libs/xrootd/files/cmsd.initd b/net-libs/xrootd/files/cmsd.initd
index 86b8e4b7bcd5..66912202824e 100644
--- a/net-libs/xrootd/files/cmsd.initd
+++ b/net-libs/xrootd/files/cmsd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/cmsd.initd,v 1.1 2011/12/19 19:36:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/cmsd.initd,v 1.2 2012/12/05 18:19:15 bicatali Exp $
 
 source /etc/conf.d/xrootd
 
@@ -11,6 +11,11 @@ depend() {
     provide root-file-server
 }
 
+start_pre() {
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
 start() {
     ebegin "Starting Cluster Management Service daemon"
     start-stop-daemon --start --quiet --user ${XROOTD_USER} \
diff --git a/net-libs/xrootd/files/frm_purged.initd b/net-libs/xrootd/files/frm_purged.initd
index daf455627f3f..ad3e7a8e46d8 100644
--- a/net-libs/xrootd/files/frm_purged.initd
+++ b/net-libs/xrootd/files/frm_purged.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_purged.initd,v 1.1 2011/12/19 19:36:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_purged.initd,v 1.2 2012/12/05 18:19:15 bicatali Exp $
 
 source /etc/conf.d/xrootd
 
@@ -11,6 +11,11 @@ depend() {
     provide root-file-server
 }
 
+start_pre() {
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
 start() {
     ebegin "Starting File Residency Manager purge daemon"
     start-stop-daemon --start --quiet --user ${XROOTD_USER} \
diff --git a/net-libs/xrootd/files/frm_xfrd.initd b/net-libs/xrootd/files/frm_xfrd.initd
index 580042248256..846c1820248f 100644
--- a/net-libs/xrootd/files/frm_xfrd.initd
+++ b/net-libs/xrootd/files/frm_xfrd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_xfrd.initd,v 1.1 2011/12/19 19:36:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/frm_xfrd.initd,v 1.2 2012/12/05 18:19:15 bicatali Exp $
 
 source /etc/conf.d/xrootd
 
@@ -11,6 +11,11 @@ depend() {
     provide root-file-server
 }
 
+start_pre() {
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
 start() {
     ebegin "Starting File Residency Manager transfer daemon"
     start-stop-daemon --start --quiet --user ${XROOTD_USER} \
diff --git a/net-libs/xrootd/files/xrootd.initd b/net-libs/xrootd/files/xrootd.initd
index cbc9122e1589..1685ccc5c009 100644
--- a/net-libs/xrootd/files/xrootd.initd
+++ b/net-libs/xrootd/files/xrootd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/xrootd.initd,v 1.1 2011/12/19 19:36:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/files/xrootd.initd,v 1.2 2012/12/05 18:19:15 bicatali Exp $
 
 depend() {
     need net
@@ -9,6 +9,11 @@ depend() {
     provide root-file-server
 }
 
+start_pre() {
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+    checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
 start() {
     ebegin "Starting extended ROOTD file server"
     start-stop-daemon --start --quiet --user ${XROOTD_USER} \
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 9185dde4a699..b629e537dcfd 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   XROOTD software framework is a fully generic suite for fast, low latency and
   scalable data access, which can serve natively any kind of data, organized as
   a hierarchical filesystem-like namespace, based on the concept of directory.
   It is usually used with <pkg>sci-physics/root</pkg> and its PROOF facilities
   for cluster computing in high energy physics.
 </longdescription>
-	<use>
-		<flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
-	</use>
+<use>
+  <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
+</use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-3.2.1.ebuild b/net-libs/xrootd/xrootd-3.2.1.ebuild
index ce2a7588a90c..8c1626312c5b 100644
--- a/net-libs/xrootd/xrootd-3.2.1.ebuild
+++ b/net-libs/xrootd/xrootd-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-3.2.1.ebuild,v 1.4 2012/07/09 06:20:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-3.2.1.ebuild,v 1.5 2012/12/05 18:19:15 bicatali Exp $
 
 EAPI=4
 
@@ -59,13 +59,9 @@ src_install() {
 	insinto /etc/xrootd
 	doins packaging/common/*.cfg
 
-	# create aux dirs and correct permissions so that xrootd
-	# will be happy as a non-priviledged user
-	fowners root:xrootd "${EPREFIX}"/etc/xrootd
-	keepdir "${EPREFIX}"/var/log/xrootd
-	keepdir "${EPREFIX}"/var/run/xrootd
-	keepdir "${EPREFIX}"/var/spool/xrootd
-	fowners xrootd:xrootd "${EPREFIX}"/var/{log,run,spool}/xrootd
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
 
 	local i
 	for i in cmsd frm_purged frm_xfrd xrootd; do
diff --git a/net-libs/xrootd/xrootd-3.2.2.ebuild b/net-libs/xrootd/xrootd-3.2.2.ebuild
deleted file mode 100644
index 286acf32c301..000000000000
--- a/net-libs/xrootd/xrootd-3.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-3.2.2.ebuild,v 1.2 2012/07/24 18:13:49 bicatali Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils
-
-DURI="http://xrootd.slac.stanford.edu/doc/prod"
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="${HOMEPAGE}/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse kerberos perl readline ssl"
-
-RDEPEND="!<sci-physics/root-5.32[xrootd]
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	kerberos? ( virtual/krb5 )
-	perl? (
-		dev-lang/perl
-		readline? ( dev-perl/Term-ReadLine-Perl )
-	)
-	readline? ( sys-libs/readline )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	perl? ( dev-lang/swig )"
-
-PATCHES=( "${FILESDIR}"/${P}-glibc216.patch )
-
-pkg_setup() {
-	enewgroup xrootd
-	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable fuse)
-		$(cmake-utils_use_enable kerberos KRB5)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable readline)
-		$(cmake-utils_use_enable ssl CRYPTO)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	# create aux dirs and correct permissions so that xrootd
-	# will be happy as a non-priviledged user
-	fowners root:xrootd "${EPREFIX}"/etc/xrootd
-	keepdir "${EPREFIX}"/var/log/xrootd
-	keepdir "${EPREFIX}"/var/run/xrootd
-	keepdir "${EPREFIX}"/var/spool/xrootd
-	fowners xrootd:xrootd "${EPREFIX}"/var/{log,run,spool}/xrootd
-
-	local i
-	for i in cmsd frm_purged frm_xfrd xrootd; do
-		newinitd "${FILESDIR}"/${i}.initd ${i}
-	done
-	# all daemons MUST use single master config file
-	newconfd "${FILESDIR}"/xrootd.confd xrootd
-
-	dodoc docs/ReleaseNotes.txt
-	use doc && dohtml -r doxydoc/html/*
-}
diff --git a/net-libs/xrootd/xrootd-3.2.4.ebuild b/net-libs/xrootd/xrootd-3.2.6.ebuild
index b2778d2027e7..075667880382 100644
--- a/net-libs/xrootd/xrootd-3.2.4.ebuild
+++ b/net-libs/xrootd/xrootd-3.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-3.2.4.ebuild,v 1.1 2012/09/29 23:38:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xrootd/xrootd-3.2.6.ebuild,v 1.1 2012/12/05 18:19:15 bicatali Exp $
 
 EAPI=4
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fuse kerberos perl readline ssl"
 
-RDEPEND="!<sci-physics/root-5.32[xrootd]
+RDEPEND="
+	!<sci-physics/root-5.32[xrootd]
 	sys-libs/zlib
 	fuse? ( sys-fs/fuse )
 	kerberos? ( virtual/krb5 )
@@ -31,7 +32,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	perl? ( dev-lang/swig )"
 
-pkg_setup() {
+ppkg_setup() {
 	enewgroup xrootd
 	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
 }
@@ -59,13 +60,9 @@ src_install() {
 	insinto /etc/xrootd
 	doins packaging/common/*.cfg
 
-	# create aux dirs and correct permissions so that xrootd
-	# will be happy as a non-priviledged user
-	fowners root:xrootd "${EPREFIX}"/etc/xrootd
-	keepdir "${EPREFIX}"/var/log/xrootd
-	keepdir "${EPREFIX}"/var/run/xrootd
-	keepdir "${EPREFIX}"/var/spool/xrootd
-	fowners xrootd:xrootd "${EPREFIX}"/var/{log,run,spool}/xrootd
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
 
 	local i
 	for i in cmsd frm_purged frm_xfrd xrootd; do