Create /var/cache at run-time (bug #493154).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 161 insertions, 3 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 462f5329087d..9de2e636785e 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/apt-cacher-ng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.49 2014/10/21 18:05:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.50 2014/10/22 07:53:20 jer Exp $
+
+*apt-cacher-ng-0.8.0-r1 (22 Oct 2014)
+
+  22 Oct 2014; Jeroen Roovers <jer@gentoo.org> apt-cacher-ng-0.8.0.ebuild,
+  +apt-cacher-ng-0.8.0-r1.ebuild, +files/initd-r1:
+  Create /var/cache at run-time (bug #493154).
 
   21 Oct 2014; Jeroen Roovers <jer@gentoo.org> apt-cacher-ng-0.8.0.ebuild:
   Add >sys-devel/gcc-4.8 dependency.
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..5ab9c6474f7f
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0-r1.ebuild,v 1.1 2014/10/22 07:53:20 jer Exp $
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs user
+
+DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+HOMEPAGE="
+	http://www.unix-ag.uni-kl.de/~bloch/acng/
+	http://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) = 4 ]]; then
+		if [[ $(gcc-minor-version) -lt 8 ]]; then
+			die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+		fi
+	else
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
+	if use fuse; then
+		mycmakeargs="-DHAVE_FUSE_25=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_FUSE_25=no ${mycmakeargs}"
+	fi
+	if use tcpd; then
+		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+		dohtml doc/html/*
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild
index d30ab4d3f15d..8a6104cb9455 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild,v 1.2 2014/10/21 18:05:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.0.ebuild,v 1.3 2014/10/22 07:53:20 jer Exp $
 
 EAPI=5
 inherit cmake-utils eutils toolchain-funcs user
@@ -110,7 +110,6 @@ src_install() {
 	newins conf/acng.conf ${PN}.conf
 	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
 
-	dodir /var/cache/${PN}
 	dodir /var/log/${PN}
 	# Some directories must exists
 	keepdir /var/log/${PN}
diff --git a/net-misc/apt-cacher-ng/files/initd-r1 b/net-misc/apt-cacher-ng/files/initd-r1
new file mode 100644
index 000000000000..46bf90c0ecd7
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/initd-r1
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/files/initd-r1,v 1.1 2014/10/22 07:53:20 jer Exp $
+
+DAEMON="/usr/sbin/${RC_SVCNAME}"
+RUNDIR="/var/run/${RC_SVCNAME}"
+CACHEDIR="var/cache/${RC_SVCNAME}"
+PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
+SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
+DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting ${RC_SVCNAME}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
+	start-stop-daemon --start --exec ${DAEMON} \
+	    --user ${RC_SVCNAME} --group ${RC_SVCNAME} \
+	    --pidfile ${PIDFILE} \
+	    -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
+	    --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}