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

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 7 insertions, 111 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/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}
-}