Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 20 insertions, 132 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 82acfb84a6ad..2409f57c6897 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.37 2013/12/21 15:11:33 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.38 2014/01/05 22:57:43 jer Exp $
+
+*apt-cacher-ng-0.7.25 (05 Jan 2014)
+
+  05 Jan 2014; Jeroen Roovers <jer@gentoo.org> -apt-cacher-ng-0.7.21.ebuild,
+  -apt-cacher-ng-0.7.22.ebuild, +apt-cacher-ng-0.7.25.ebuild:
+  Version bump.
 
   21 Dec 2013; Jeroen Roovers <jer@gentoo.org> apt-cacher-ng-0.7.24.ebuild,
   -files/apt-cacher-ng-0.7.19-gentoo.diff:
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 6380119bb53e..4320dd5c4003 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,18 +5,16 @@ AUX confd 90 SHA256 cabcc9da711514913e5136c82842c750bab8a9658aeeb88da5a266e0d69b
 AUX cron.daily 459 SHA256 6ec7ceeead17ef5a84d5ec5472d38810d9e1478213643da5f3fd9863dde40094 SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a WHIRLPOOL e9c69a8d21a38435522f02fd7ac4b2924ad641e2058a9bc3ae051f155eee500e33d116cf868328a665d082c616c42ba3e5de751437ba24eef193541975e792db
 AUX initd 830 SHA256 d9fd5c213c65f74779f444337fec93304771f4bd560baf712d1f6e7c04fdd1e1 SHA512 284592c02d32d4be7eefa4743e3e46782100bb101648de523f16defe944103d212315f9d3113c74706c355041005390b2e56bbe6486b83f16a013011fe76d9b2 WHIRLPOOL 6e0f81474025444124f762e3343c279ecd7af494b08f6fc0e02120a1f0864f945949df64558c27a5f21be48786e2d2202aba5a78a4b2282ed3035888e12ebd15
 AUX logrotate 377 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 WHIRLPOOL 80037bc359ffb860ce19e2493d10597f81e02138368ad2bce002da8f4a725cdeee61662478efff4755f0f8a0c9f376263fd6b56505eddddd5c18c1a33f7d22b8
-DIST apt-cacher-ng_0.7.21.orig.tar.xz 270088 SHA256 6685ef3348f931ca5a13fe73fd6c5c1531f48aed1c64287240a9ddf23d760be0 SHA512 119d0f183a9d7cf4cfaafdf9859b692e65e26e94818e8d1484b83e0d9fd6e6701eedb300227ad346448ffbcb93ea044e48b130607fb9374592c41680bdf128a3 WHIRLPOOL 2497bcc4c6fb18b3d5d58c7153b22b8dab2ae779b6d3e97f19281c952d28f48767f4b44bbcbbc6beeaa01d7fc6b133f3e6b073fa014792fabdd210dc09a4794b
-DIST apt-cacher-ng_0.7.22.orig.tar.xz 270044 SHA256 7b47dda64e6a2c36e83b0cb2a9d2deae6d969bb6f846ac5fa29f3c1267c24177 SHA512 3812de31e595c0cb735c62fa0d68b47a91a7c08d277a244b87ef367fb2b01a90bae09c3b4aaecbde49354e738c12c63d1e58d8fbda9bab63e06434b164e81c09 WHIRLPOOL 0a86afce6df5678f89f66a3ddc2bea406c496e16915e7b7a3414a96dba43f2c608f064bd5abcce1b49590d8c4f17bbad595700bca6bfba578e247097641e3519
 DIST apt-cacher-ng_0.7.24.orig.tar.xz 271996 SHA256 c02f65a0dce3d143ae6c5d49ef6ba75d78b2fcf94bcc856a78c7a406070ee5c7 SHA512 73cf876b2bf70da69b6419846f04332cec4238e5cda612d93dae7d270805e8f27de924aab707b475857ebd9b9990c6a89585196a59650001892e2887cc425861 WHIRLPOOL a7036884b46c041a7c9122f9bc91ab5d256721db1650e3e6b6c8fb9ce5f7a08aa2e1770206913e7049fe09e8d36a054b5f1764ccd357714c39ed48dab3c0b50d
-EBUILD apt-cacher-ng-0.7.21.ebuild 2358 SHA256 3041dfd6f5afa9c684f94b07dbf00ac0ff495cccb32f6c6151e5191f46bbb3ff SHA512 6e8e12dad7da8add692da7de8858fa8b65bb9da0b168dcdf561d43421d1e27a0eb81039d614dcbedb529b83b080f6785b90840211feb780199a60432937aa73e WHIRLPOOL fc91e46f989ce3bddae13be48a16c662d00bd65aa2d520cbd4ab7f3738b36b0c18d9471d95b2fbfba178b2b3325e01bdb4f14440327f8491efe40db3a8b0496d
-EBUILD apt-cacher-ng-0.7.22.ebuild 2358 SHA256 1b0505fc278e648a2d16ef63a31fb8d537a523eae8fff7972244d0a59c07bf1e SHA512 46e39961eb2e5fdaca8ccbf147efd6c87f464616330f60ff7821db25c9a03f610a19615210362fabb779455347d31a5a3697dff227d664b0b46b9959db3253ad WHIRLPOOL 548f986b3c1456ced13174fbe45055ab8695828fa037e047b233d0af287678dc865ba054c0bd41d3152cbdd77d97253bbb50dcfc1caa59d581dfe37deed38063
+DIST apt-cacher-ng_0.7.25.orig.tar.xz 271868 SHA256 736c65bc28123567a79b661267270aac0cfb579efff4daebfddc9b0764e3b432 SHA512 68f966c5fa9f41c099b869645b5af26d652c0a2abf9b419ebe7588efb82daf0eb2c21cd3584940347e6f0853bcce82a81515e2c0466fee8773ae001256a63f07 WHIRLPOOL 865d7c13375d7cc8ffbc345b2f6696f97c3e848c43ab04124dee3dfe46905600678be5c9f1cf8f472029bf74c5521555c5d057d14066a21692ceca571770dcd8
 EBUILD apt-cacher-ng-0.7.24.ebuild 2209 SHA256 685dade46496718543a6b474e3ae7c369f75cb3bb553746f370c387e95ca9123 SHA512 e1b82c4ebddc908c0e5124da1a763447c1fff35c7d03c9aebd37b01f0d10d59030235b04b43431786a8ff8ab9e23a6f2ebdebfbdba48f4a5c444f388ee90e319 WHIRLPOOL 5f44d13e483ee73b472539aebff737d7e3d0551c5d99d24007c62d90e0b32cc6091cc047a077af461eb7f2a11bba1686be2442cf4ae76127c3fc87e207d6100d
-MISC ChangeLog 6302 SHA256 1d55819cda4e0879a1d87ec583cd9d0a841fb6eb73e75835502b3620e08f4d75 SHA512 a25355e1483b0e6b4409912232878c542965f035bbb1507b3a41ae9fdffff82472cc0e5591aaf848220ad12fd1dd9b64941932c08af064b28421a9539579a175 WHIRLPOOL a216c71fb28c389436d71623f9687e1fb00a29580e045856e821e2aa1206ee53a7a12064628e3df71fa84fc8a37103e57ed8cd9c92f8c8dedb94a1fd97ed76c8
+EBUILD apt-cacher-ng-0.7.25.ebuild 2209 SHA256 3671a435872cc4926e0896d619ec5d8c05482878b3e6efd41508edbee412e175 SHA512 4445865d4f4c76fbb1d1e8296199c64b6173686359e2745231abe2eff7981830180a8f85cde0c17c5da879103198008aca12439436149cea80840d4eb7c5e614 WHIRLPOOL b9ec5436dea0a5b54d11aaced453cdb5a33c7572b894d4a34f592b025f9feea4b89c32f70a0ae371a0acb351d17bf206e52f4aeeb1eddffd1683fe4a6d972bf9
+MISC ChangeLog 6495 SHA256 8cc9e44750088090d10be3d835f2dbf701eb36ce6abf63c010084104ecf97a68 SHA512 7dbc8c3414e54d4bdfbab090863827453a16db8561114a6dc9ef006dcb9c191ca59fe9ffaf31b623e0dbf205510a6e8589f72071c317a5cdb4e2893f853aab05 WHIRLPOOL ea947affb7754a6a3c90c03b4717eff4c7512d5754d0778e60db93daff5c2e99b5d0488e1dd73e88666838d1eafb0f7b47bf0f27fabcc89b919264c628fdf4e6
 MISC metadata.xml 387 SHA256 83e4af4a9dff85e9d5d58a7704abff4dad046540b992c819a8203d529673e6d0 SHA512 5208a00d95e1f640eb0e10bd448f90465fa61eb3b9139406287af49b14511ead780a7bf613924b8e41dadba6fb1da2939683fe64ee97fb27ef2baaf494331c28 WHIRLPOOL e8fa3d5a1b746fb808e082eec20f734d4d309625f4f485df443f477a79d4f9fe358935cab369c7311f9432366a0e5fbf8ecb1a3377393ffc43922af265983de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK1r6YACgkQVWmRsqeSphODyQCfYhr8QamcVSKi2zBUOukcT8oV
-GGgAni+nAv0nYv2fiMflyJyeK9Raen2T
-=UL/l
+iEYEAREIAAYFAlLJ42gACgkQVWmRsqeSphPvmwCfVGJ8xoUovKjRHwQZ385VnrqP
+swEAmgPz3vGS2mCGeA4WZqhFW39l7yiZ
+=r9L2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.22.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.22.ebuild
deleted file mode 100644
index a1455e00dce5..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.22.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 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.7.22.ebuild,v 1.2 2013/12/10 10:52:49 jer Exp $
-
-EAPI=5
-inherit cmake-utils 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 lzma tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/cmake
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	lzma? ( app-arch/xz-utils )
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-	dev-lang/perl
-"
-
-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
-	if use lzma; then
-		mycmakeargs="-DHAVE_LZMA=yes ${mycmakeargs}"
-	else
-		mycmakeargs="-DHAVE_LZMA=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 ${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
-	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}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN} \
-		/var/cache/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.21.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.25.ebuild
index 50dd54872716..8894e3051ec8 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.21.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.7.21.ebuild,v 1.2 2013/12/10 10:52:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.25.ebuild,v 1.1 2014/01/05 22:57:43 jer Exp $
 
 EAPI=5
-inherit cmake-utils user
+inherit cmake-utils eutils user
 
 DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
 HOMEPAGE="
@@ -15,23 +15,22 @@ SLOT="0"
 SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse lzma tcpd"
+IUSE="doc fuse tcpd"
 
 COMMON_DEPEND="
 	app-arch/bzip2
+	app-arch/xz-utils
 	sys-libs/zlib
 "
 DEPEND="
 	${COMMON_DEPEND}
-	app-arch/xz-utils
 	dev-util/cmake
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	lzma? ( app-arch/xz-utils )
+	dev-lang/perl
 	fuse? ( sys-fs/fuse )
 	tcpd? ( sys-apps/tcp-wrappers )
-	dev-lang/perl
 "
 
 pkg_setup() {
@@ -47,11 +46,6 @@ src_configure(){
 	else
 		mycmakeargs="-DHAVE_FUSE_26=no ${mycmakeargs}"
 	fi
-	if use lzma; then
-		mycmakeargs="-DHAVE_LZMA=yes ${mycmakeargs}"
-	else
-		mycmakeargs="-DHAVE_LZMA=no ${mycmakeargs}"
-	fi
 	if use tcpd; then
 		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
 	else