Fix LICENSE, by Ulrich Müller (bug #446492).

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

4 files changed, 12 insertions, 118 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index ff0330c655b2..8c13f8540ebc 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/apt-cacher-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.18 2012/11/08 06:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.19 2012/12/08 16:25:28 jer Exp $
+
+  08 Dec 2012; Jeroen Roovers <jer@gentoo.org> -apt-cacher-ng-0.7.7-r1.ebuild,
+  apt-cacher-ng-0.7.10.ebuild:
+  Fix LICENSE, by Ulrich Müller (bug #446492).
 
 *apt-cacher-ng-0.7.10 (08 Nov 2012)
 
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 04cfc16f7e9b..69dd217ae109 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -6,15 +6,13 @@ AUX cron.daily 459 SHA256 6ec7ceeead17ef5a84d5ec5472d38810d9e1478213643da5f3fd98
 AUX initd 830 SHA256 d9fd5c213c65f74779f444337fec93304771f4bd560baf712d1f6e7c04fdd1e1 SHA512 284592c02d32d4be7eefa4743e3e46782100bb101648de523f16defe944103d212315f9d3113c74706c355041005390b2e56bbe6486b83f16a013011fe76d9b2 WHIRLPOOL 6e0f81474025444124f762e3343c279ecd7af494b08f6fc0e02120a1f0864f945949df64558c27a5f21be48786e2d2202aba5a78a4b2282ed3035888e12ebd15
 AUX logrotate 377 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 WHIRLPOOL 80037bc359ffb860ce19e2493d10597f81e02138368ad2bce002da8f4a725cdeee61662478efff4755f0f8a0c9f376263fd6b56505eddddd5c18c1a33f7d22b8
 DIST apt-cacher-ng_0.7.10.orig.tar.xz 258904 SHA256 d0dff968df6283a0c146d5b78a6b19f927e29570de8ad083f324c5020af97a65 SHA512 dab081be69382216a019b4eac78ed0319086b808a0ee6727f7d07be27952d13a477558193bee1a652f1e48886fbb7dc07dfac1122b1e5956d6e147b82bd3d76d WHIRLPOOL 759d600d480b4715bdf4d97f5b2741a589edf75cd913e2dd4a91a99873fc2cb6d6366a9d4873c32b70968f65ad6058ce3233ab90808b401eb7cebf761ae25119
-DIST apt-cacher-ng_0.7.7.orig.tar.xz 256848 SHA256 794e47ad073e1288903dc984b6ee3ee6a951919df31d577867c8678e305c85a9 SHA512 162661a02385264267dc022ffa6a91cc3f8750a30dd990c237054105072e00a72a8e3075e80e249dbd56ffaa7820b1dd50dace56f75bde4da32f5cf00bbe37ca WHIRLPOOL dbade92d41aeb633d50a03739a03534cd8e9005991e1fe05c4a110ee875307f8ca5d63604bf0361c34488738d1ee58a744b5561e02337b14a84f139458bb42af
-EBUILD apt-cacher-ng-0.7.10.ebuild 2293 SHA256 a5df6da60b5dd95c3f7300d87fc6dcf9fd365683464f5c1e275ff2bd74392f88 SHA512 3134ebad356180104cbb9de348818299cfb0b691bef18d3fb5fba4ebeba60765b0b56a6649e23ac3d258c33804384497b49bcf5077dd18015a04219f9d33894d WHIRLPOOL 0a7f517763df657e8bea575bec3d77b6f512e29c5a708f68adb7ca37937d3c977248dbf1c6a8d6b896f62ec142b882428be8402a2d13a726f5ab5cea0de3f83e
-EBUILD apt-cacher-ng-0.7.7-r1.ebuild 2295 SHA256 35155cd96e937de3611d5180b89c992a78096c5523fa021616e11be135cb5901 SHA512 a047a028cdf600b73a7e13396e908e0e86829d3e34a8c3233b6444d70509da83c775ea577d2483872fb1f0a7a8a5a56b50c6368bc6d97d537274e0bee914e681 WHIRLPOOL 5724a71408b18c9356365e7f2fbc57d6d797743ad227abd1f2d9f7512573e09c4e568e2d06af18882b4a6c47d24b3cd31b052039c132d201e23a72171e5f88d7
-MISC ChangeLog 3179 SHA256 03438b519353da688487d1b8627aad900b3207d653b981fab4ccf4c2d4c7d958 SHA512 781dca9faf4b8a3c1c4e77e02a65a7bd458f32fc2116db71e70931812fb61c8327b2550da68896b3171d0cf42167487a6434b68bffe97935b3588213810b2e8c WHIRLPOOL e2fce32003ebc3bcb395c5046e696b7ce1e7c057bcf3a5bd53348d3c00860dfcb57324e63275cb71fb7c682b5249b296c7fc544ec60a059ebdaa3601b8ceeea2
+EBUILD apt-cacher-ng-0.7.10.ebuild 2306 SHA256 f6220d07f545bb8c90d5f6d1ef11f582454b17aee2c6db1df46d200a45f31eaf SHA512 82dee77b98048c6767ff0a4ec5b03cbc4938bb5ba491fcc3d6fe8a5f7291587342d47f8557606ce3a1b23c7295ba561954339166c95ce94a0738513983914515 WHIRLPOOL fecd330d41fec98e1f3d2995a08882de36855b27eb00693faa9407508ba71d51bc844f62b70b7e17189e2a3e366c09499e3fa5a1d94549e5b980eae3f031168f
+MISC ChangeLog 3338 SHA256 d9d333d84fec2b084c467ba0244ae28a19a9915de469cb7dc837d9ee78fbff78 SHA512 f4e553112e06ddcb8e6110e4e9fb290ca24247ee37ca2c453d3f3b5fef7125fc2f9951ee68daed87fc9a6d5ac0f1ad3e77e07dc81235febfe461a865ed19e992 WHIRLPOOL 03bdbc672b6e7e30275c15e83da30494eb3329221e7b0372e656636a35cb3ec1752603c704510558b235a096fa69d79ed31c17430b8a0ddd312fb2c575caf369
 MISC metadata.xml 387 SHA256 83e4af4a9dff85e9d5d58a7704abff4dad046540b992c819a8203d529673e6d0 SHA512 5208a00d95e1f640eb0e10bd448f90465fa61eb3b9139406287af49b14511ead780a7bf613924b8e41dadba6fb1da2939683fe64ee97fb27ef2baaf494331c28 WHIRLPOOL e8fa3d5a1b746fb808e082eec20f734d4d309625f4f485df443f477a79d4f9fe358935cab369c7311f9432366a0e5fbf8ecb1a3377393ffc43922af265983de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCbVaMACgkQVWmRsqeSphNiQACfR+oWhNCyoyW/ZM6Jqqju2+By
-txMAni2ZWTZKDbbPE4n4F9X11s8uKgcX
-=v/Dz
+iEYEAREIAAYFAlDDafoACgkQVWmRsqeSphPEFQCfWPWdRbZ2cK8E7TIBe3F2eJyH
+KFEAnjNX8jHNHUDc3Nfbevf6m/axZiME
+=M7/E
 -----END PGP SIGNATURE-----
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.10.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.10.ebuild
index 1dc2725caa8c..63e4ed70f364 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.10.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.10.ebuild
@@ -1,6 +1,6 @@
 # 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.7.10.ebuild,v 1.1 2012/11/08 06:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.10.ebuild,v 1.2 2012/12/08 16:25:28 jer Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ 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/"
-LICENSE="as-is GPL-2"
+LICENSE="BSD-4 ZLIB public-domain"
 SLOT="0"
 SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
 
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild
deleted file mode 100644
index d858e25bd3b8..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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.7.7-r1.ebuild,v 1.2 2012/09/12 02:10:12 jer Exp $
-
-EAPI="4"
-
-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/"
-LICENSE="as-is GPL-2"
-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}
-}