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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 18 insertions, 130 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/Manifest b/net-misc/apt-cacher-ng/Manifest
index d4eaa3c20208..1c9b7672df81 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -6,17 +6,15 @@ AUX cron.daily 459 RMD160 774e42915dc408831f088b87f8f5de9b15423e44 SHA1 09bae26f
 AUX initd 780 RMD160 740c4bd2eb8db1b6937ae912dfc8661b30553718 SHA1 87d529e43bff172aaeb48a9794310046faad633d SHA256 dbdbd14df1d3a83a887eb8f7d0d014efbad78e01ad6722627ca7c43fbe4025d5
 AUX logrotate 377 RMD160 ef3824ff3484b00195fad7153332ce33f702d937 SHA1 d5606fceb5f3296aff7a7111ffadb440761286f2 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b
 DIST apt-cacher-ng_0.6.10.orig.tar.xz 250264 RMD160 93e56317c5f5f151141704c0fd177380015c4912 SHA1 f6568778e8dd8d8680d963b98359ed40614d4ae3 SHA256 dfa1a55ac846eb00ee04f650c50140c43b9020a20e507fc50ec9389ef9fa6fd5
-DIST apt-cacher-ng_0.6.5.orig.tar.gz 293416 RMD160 d3b01ea1659536caab9e42c22a987bf0220635a5 SHA1 c21892827cf48961e82c1219e076f37459229c0a SHA256 9c997d014b57822a23263e38a81b7fa1b2708ffa380db4453b92e916b2761743
-DIST apt-cacher-ng_0.6.8.orig.tar.xz 246208 RMD160 c8c4eacc9069739802dbe9fcd000bcb17cdb80cf SHA1 04ba4d43c5a07ad4c7257cfbea1036e3a219fa25 SHA256 d47693a8f1eb12a2f61d0f7020431dffa74431e5b5ce50dc3368150ebfd752b4
+DIST apt-cacher-ng_0.6.11.orig.tar.xz 251384 RMD160 b1ffb7ade5f944f038e70e5bc7e87765ed2a4883 SHA1 53d74b4fac154ca9cc958f9dfb29667606bd48cd SHA256 3576ea1f5a6c07d48a5382bd58fff97cc738899b7deff1949c4acdc101a310d2
 EBUILD apt-cacher-ng-0.6.10.ebuild 2729 RMD160 e156434b919750965fc028f79a2cede69080fc1d SHA1 68b44cb8bdccc849603ac052fb53591b0541d122 SHA256 42e22b49f349994fe7fe67d209152117cd31c93fb028ef05e4e9a1b99b76602b
-EBUILD apt-cacher-ng-0.6.5.ebuild 2387 RMD160 73534be785f505520248c3a68c2743f60c1495e2 SHA1 71a2bd71132c6fa9b6708a5c03860038c4e0f28c SHA256 9ae926c1b69c8bbedc1b6bf52f44ec76d06d982da642ab96580b215f79daabdc
-EBUILD apt-cacher-ng-0.6.8.ebuild 2728 RMD160 ccb9e0033ceb1fd0b1ccef68837c79d7fa5e4aa1 SHA1 b95b548c05bc34c5b0c8d05329ed9d9a388cce5f SHA256 7b22291382b42ff673905fe4f91ff4c38cdfb59ee0ce0300fe4b1e988c63e7f0
-MISC ChangeLog 1073 RMD160 d0b96ef561ee252dc0b182463f292e25f09241fd SHA1 c141d66bf7f836dd7ad2d46e92f5cdc4b36022a1 SHA256 60739b5ac5097a4676bd35b2de9e45a7c2c62670ebd31f5897c573aae7ac04d6
+EBUILD apt-cacher-ng-0.6.11.ebuild 2332 RMD160 bef09632567b45a78be24917be97a5fd181ed395 SHA1 c4197ae3f4125799e8fa40aabe8ca8264074be10 SHA256 a8edd77b0bc4a099296131ac32d1188b2122671cca5ca57f27c1ddfaa140557a
+MISC ChangeLog 1341 RMD160 e35db9e71ca21537d6ed391d264128a25b41fe3e SHA1 18a4ae373cb1acb4d767176f32dbacdfcff85253 SHA256 66ab037adfa3158ee9b6b363b77da1e83c207d8db777b99d022b986a813839a7
 MISC metadata.xml 387 RMD160 24ae6a7aaedb132c13ffdd94fe518f7ddcec6a9e SHA1 24771fa9c7362e5c6ca75ccf0ecce3c5945735e0 SHA256 83e4af4a9dff85e9d5d58a7704abff4dad046540b992c819a8203d529673e6d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7dv14ACgkQVWmRsqeSphNB3wCfZk1pd5bhCB8MaT2wLC8BZjEc
-Fz0Ani/xn0IAZxaY5zL6GXLpb9PqMsr5
-=wbAj
+iEYEARECAAYFAk8If2UACgkQVWmRsqeSphPExACfWw+ADQvVpLvfdNwpssV/rp29
+nuMAn0hv20u5iG4X0T8zCIsIA9bF7aXV
+=p0Dg
 -----END PGP SIGNATURE-----
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}
-}