Clean up.

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

3 files changed, 13 insertions, 12 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 0a0a1e6446a0..8d33cc0da50d 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.31 2013/12/05 02:45:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.32 2013/12/05 12:03:19 jer Exp $
+
+  05 Dec 2013; Jeroen Roovers <jer@gentoo.org> apt-cacher-ng-0.7.20-r1.ebuild,
+  files/apt-cacher-ng-0.7.19-gentoo.diff:
+  Clean up.
 
 *apt-cacher-ng-0.7.20-r1 (05 Dec 2013)
 
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.20-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.20-r1.ebuild
index 1eaa69d9494a..68578eb5b00b 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.20-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.20-r1.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.20-r1.ebuild,v 1.1 2013/12/05 02:45:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.20-r1.ebuild,v 1.2 2013/12/05 12:03:19 jer Exp $
 
 EAPI=5
-inherit cmake-utils user eutils
+inherit cmake-utils eutils user
 
 DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
 HOMEPAGE="
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
index 63831a89ef2e..bb7a202773f5 100644
--- 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
@@ -11,9 +11,8 @@ the output list understandable.
 
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/acng.conf apt-cacher-ng-0.7.19/conf/acng.conf
---- apt-cacher-ng-0.7.19.orig/conf/acng.conf	2013-07-28 11:09:43.000000000 -0700
-+++ apt-cacher-ng-0.7.19/conf/acng.conf	2013-12-03 19:55:07.000000000 -0800
+--- 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
@@ -22,17 +21,15 @@ diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/acng.conf apt-cacher-
  
  # 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,
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default apt-cacher-ng-0.7.19/conf/backends_gentoo.default
---- apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default	1969-12-31 16:00:00.000000000 -0800
-+++ apt-cacher-ng-0.7.19/conf/backends_gentoo.default	2013-12-03 19:46:38.000000000 -0800
+--- 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/
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh
---- apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh	1969-12-31 16:00:00.000000000 -0800
-+++ apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh	2013-12-04 18:20:07.000000000 -0800
+--- 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