Remove USE=lzma: we install it already to unpack the tarball, and USE=-lzma is broken in this release.

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

3 files changed, 11 insertions, 56 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index a195e138c56a..82acfb84a6ad 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2013/12/20 14:13:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.37 2013/12/21 15:11:33 jer Exp $
+
+  21 Dec 2013; Jeroen Roovers <jer@gentoo.org> apt-cacher-ng-0.7.24.ebuild,
+  -files/apt-cacher-ng-0.7.19-gentoo.diff:
+  Remove USE=lzma: we install it already to unpack the tarball, and USE=-lzma
+  is broken in this release.
 
 *apt-cacher-ng-0.7.24 (20 Dec 2013)
 
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.24.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.24.ebuild
index 52de180716cd..08b37cf73075 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.24.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.24.ebuild
@@ -1,9 +1,9 @@
 # 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.24.ebuild,v 1.1 2013/12/20 14:13:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.24.ebuild,v 1.2 2013/12/21 15:11:33 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
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff b/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff
deleted file mode 100644
index bb7a202773f5..000000000000
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Support Gentoo mirrors in apt-cacher-ng
-
-Please note the use of a script to build the gentoo_mirrors file live; this
-should probably be done when each release is being built.
-
-The geo-balanced http://distfiles.gentoo.org/ mirror is NOT included in the
-mirrors3.xml source, so it gets added manually.
-
-The first 3 sed expresssions aren't actually required, but are useful in making
-the output list understandable.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---- a/conf/acng.conf	2013-07-28 11:09:43.000000000 -0700
-+++ b/conf/acng.conf	2013-12-03 19:55:07.000000000 -0800
-@@ -44,6 +44,7 @@
- Remap-fedora:  file:fedora_mirrors # Fedora Linux
- Remap-epel:   file:epel_mirrors # Fedora EPEL
- Remap-slrep:  file:sl_mirrors # Scientific Linux
-+Remap-gentoo: file:gentoo_mirrors.gz http://distfiles.gentoo.org/ /gentoo ; file:backends_gentoo # Gentoo Archives
- 
- # This is usually not needed for security.debian.org because it's always the
- # same DNS hostname. However, it might be enabled in order to use hooks,
---- a/conf/backends_gentoo.default	1969-12-31 16:00:00.000000000 -0800
-+++ b/conf/backends_gentoo.default	2013-12-03 19:46:38.000000000 -0800
-@@ -0,0 +1,4 @@
-+# This is a configuration file. All lines starting with # are ignored.
-+
-+# gentoo mirrors use geodns to dispatch to the nearest location
-+http://distfiles.gentoo.org/
---- a/conf/gentoo_mirrors.sh	1969-12-31 16:00:00.000000000 -0800
-+++ b/conf/gentoo_mirrors.sh	2013-12-04 18:20:07.000000000 -0800
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+# This fetchs the live Gentoo mirrors list
-+# robbat2@gentoo.org - 2013/Dec/03
-+OUTFILE=/etc/apt-cacher-ng/gentoo_mirrors
-+wget --save-headers -q http://www.gentoo.org/main/en/mirrors3.xml -O - \
-+	|sed -n \
-+	-e '/^[A-Z]/{s,^,#,g;p}' \
-+	-e '/<mirrorgroup/{s,^,\n#,g;p}' \
-+	-e '/<name/{s,^,#,g;p}' \
-+	-e '/<uri/{/protocol="http"/{s/.*<uri[^>]\+>//g;s/<\/uri>//g;p}}' \
-+	| gzip -9 >${OUTFILE}.gz