From: Jeroen Roovers <jer@gentoo.org>
Date: Sat, 26 Sep 2015 05:15:17 +0000 (+0200)
Subject: net-misc/apt-cacher-ng: Version bump.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5befcd1c1ce45aae17c9afa036030e9a6165e41e;p=gentoo.git

net-misc/apt-cacher-ng: Version bump.

Package-Manager: portage-2.2.20.1
---

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 0fda26e7c198..e71af6ce8c50 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,3 +1,2 @@
-DIST apt-cacher-ng_0.8.3.orig.tar.xz 294116 SHA256 d86a6616b56094b6888a10ff40ae374beac2bc3525ab7b9e7159c4f4dfd00c49 SHA512 dbccec0ba44af34870bdf5650ae594552a7816d1203210f9a09826c0dec6d74f24c07bd0d18ab3df6f9068f15c601e54aa0892e68f6bfca4b59ae300c4313210 WHIRLPOOL 0fee51e0834f1e18ff020c933a52c7745fd23ccb3cde50ea71a10662643ccf55710f77314c344e18b07b534c9346bb010b14229fd9cf9afc0202a53baad2e84f
-DIST apt-cacher-ng_0.8.4.orig.tar.xz 297168 SHA256 efa8c0e9300f7dda5e1a52d30aaad8c3b2c3ef9e45b0e8592797b40f2e433214 SHA512 b564cc81bfc45e35d77d32216212608ee5adc3bcd49a61212c825b381507cda1912e15d9f5e177042d6c5e87991288ad4ad10972f1e400d4d85c5c6cc8a8d07c WHIRLPOOL cdccf30a574d3a400ea1b40e8ef2fc6d0ac5e214981951746fd684dd8abcf4a1a11047f8396977bc126dd7096c319e50304eec19ddf90d82dfe9ac7ab9c9482b
 DIST apt-cacher-ng_0.8.5.orig.tar.xz 303260 SHA256 f4e80adb02ad68a5f79a23335f1cc1e6b8a610b2c70749d9a1ce44171766775c SHA512 6c39ff8a37f074c1e2befc4acfa9685b2349cd364bdf808862bb77bbefa4bcf5bebf3dca3924cd55132d7c29aa0a55c553f483c763ccd46c3dbad8f1da3ab58e WHIRLPOOL 3530e6ffe6553753603751b8e5994b030dc2faa24cdb3ff98f21328e25070ba8750e17e040e4bcc0a40a589037441f645d9553837d1ed4de41c8e3e58c460e18
+DIST apt-cacher-ng_0.8.6.orig.tar.xz 295760 SHA256 255b742d3551fcbfa71b6df4d8892038934812425222a15d085436a4a76b8400 SHA512 e9b8c8cd1c1c1eee3a090599cc3735317c9062d9c8032ac1ab9657793921ab250b3200ec2e1a265a26097655ae88b5cff0e62f7d36483eaa19a1246aac58837d WHIRLPOOL efbeab3503dd3eefb9b6bdd1a54151ea8811f2bc9ed70b498dbe1169a45b7e17dbdafaa73da8b3b7d3448f47f5ace78443ecc3b253a4f68eaea1ffc0c84d3328
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild
deleted file mode 100644
index 0d437886948e..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild
similarity index 95%
rename from net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild
rename to net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild
index 0d437886948e..885013a952ad 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.6.ebuild
@@ -107,8 +107,8 @@ src_install() {
 
 	# default configuration
 	insinto /etc/${PN}
-	newins conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
+	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
 
 	keepdir /var/log/${PN}
 	# Some directories must exists