Version bump. Install more files into /etc/apt-cacher-ng by Bruce Guenter (bug #396535).

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 12 insertions, 122 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 58ee1593b13f..921980acc447 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/apt-cacher-ng
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.6 2011/12/06 07:08:08 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.7 2012/01/07 17:22:35 jer Exp $
+
+*apt-cacher-ng-0.6.11 (07 Jan 2012)
+
+  07 Jan 2012; Jeroen Roovers <jer@gentoo.org> -apt-cacher-ng-0.6.5.ebuild,
+  -apt-cacher-ng-0.6.8.ebuild, +apt-cacher-ng-0.6.11.ebuild:
+  Version bump. Install more files into /etc/apt-cacher-ng by Bruce Guenter
+  (bug #396535).
 
 *apt-cacher-ng-0.6.10 (06 Dec 2011)
 
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.8.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.11.ebuild
index 03e1027f0332..c91e99f75a98 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.8.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.11.ebuild
@@ -1,6 +1,6 @@
-# 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-misc/apt-cacher-ng/apt-cacher-ng-0.6.8.ebuild,v 1.1 2011/10/17 18:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.11.ebuild,v 1.1 2012/01/07 17:22:35 jer Exp $
 
 EAPI="4"
 
@@ -95,17 +95,7 @@ src_install() {
 	# default configuration
 	insinto /etc/${PN}
 	newins conf/acng.conf ${PN}.conf
-	newins conf/report.html report.html
-	newins conf/deb_mirrors.gz deb_mirrors.gz
-	newins conf/debvol_mirrors.gz debvol_mirrors.gz
-	newins conf/ubuntu_mirrors ubuntu_mirrors
-	newins conf/archlx_mirrors archlx_mirrors
-	newins conf/sfnet_mirrors sfnet_mirrors
-	newins conf/cygwin_mirrors cygwin_mirrors
-	newins conf/security.conf security.conf
-	newins conf/maint.html maint.html
-	newins conf/userinfo.html userinfo.html
-	newins conf/style.css style.css
+	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
 
 	dodir /var/cache/${PN}
 	dodir /var/log/${PN}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.5.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.5.ebuild
deleted file mode 100644
index d420041d544e..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.6.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 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.6.5.ebuild,v 1.1 2011/08/16 21:00:31 jer Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils
-
-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/"
-LICENSE="as-is"
-SLOT="0"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-"
-
-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_26=yes ${mycmakeargs}"
-	else
-		mycmakeargs="-DHAVE_FUSE_26=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 ${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 expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins conf/acng.conf ${PN}.conf
-	newins conf/report.html report.html
-	newins conf/deb_mirrors.gz deb_mirrors.gz
-	newins conf/debvol_mirrors.gz debvol_mirrors.gz
-	newins conf/ubuntu_mirrors ubuntu_mirrors
-	newins conf/archlx_mirrors archlx_mirrors
-	newins conf/sfnet_mirrors sfnet_mirrors
-	newins conf/cygwin_mirrors cygwin_mirrors
-	newins conf/security.conf security.conf
-	newins conf/maint.html maint.html
-	newins conf/userinfo.html userinfo.html
-	newins conf/style.css style.css
-
-	dodir /var/cache/${PN}
-	dodir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN} \
-		/var/cache/${PN} \
-		/var/run/${PN}
-}