5 files changed, 20 insertions, 105 deletions
diff --git a/dev-perl/AppConfig/AppConfig-1.66.ebuild b/dev-perl/AppConfig/AppConfig-1.66.ebuild
index ea5739e95b53..ff2a8f0babc3 100644
--- a/dev-perl/AppConfig/AppConfig-1.66.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.66.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.66.ebuild,v 1.6 2008/10/27 16:22:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.66.ebuild,v 1.7 2009/08/16 08:13:24 tove Exp $
 
+EAPI=2
+
+MODULE_AUTHOR=ABW
 inherit perl-module eutils
 
 DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments."
-SRC_URI="mirror://cpan/authors/id/A/AB/ABW/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/~abw/"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
-PATCHES="${FILESDIR}/blockdiffs.patch"
 
-SRC_TEST="do"
+DEPEND=">=dev-perl/File-HomeDir-0.57"
+RDEPEND="${DEPEND}"
 
-DEPEND=">=dev-perl/File-HomeDir-0.57
-	virtual/perl-Test-Simple
-	dev-lang/perl"
+PATCHES=( "${FILESDIR}/blockdiffs.patch" )
+SRC_TEST="do"
diff --git a/dev-perl/AppConfig/ChangeLog b/dev-perl/AppConfig/ChangeLog
index 00661d367e22..b0264bd52cfe 100644
--- a/dev-perl/AppConfig/ChangeLog
+++ b/dev-perl/AppConfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/AppConfig
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/ChangeLog,v 1.62 2009/05/02 12:07:34 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/ChangeLog,v 1.63 2009/08/16 08:13:24 tove Exp $
+
+  16 Aug 2009; Torsten Veller <tove@gentoo.org> AppConfig-1.66.ebuild,
+  -files/blocksep.patch, -files/blockwhitespace.patch:
+  Cleanup. Remove old patch
 
   02 May 2009; Torsten Veller <tove@gentoo.org> -AppConfig-1.56-r2.ebuild:
   Cleanup
diff --git a/dev-perl/AppConfig/Manifest b/dev-perl/AppConfig/Manifest
index c2f98b8f071c..caab93eeb6b2 100644
--- a/dev-perl/AppConfig/Manifest
+++ b/dev-perl/AppConfig/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX blockdiffs.patch 3583 RMD160 0708818800a524a15655ba7b93d85b38696ec27f SHA1 5239877d7f37a20ba857d7e62d6da1888d5765c8 SHA256 0f9d22dd2105e74932a622e8d9497e999dc8da263055a76f76a852936ecae415
-AUX blocksep.patch 3053 RMD160 a446e9a4c65659384bd5bc0e5274a09b5926f289 SHA1 85c41e65c1b8cdfbf405848c5c4a138b9db38c8a SHA256 0c0b43c1c046abca35599badf6325505df9ff2b6ec15dae85c375fcc98777a3d
-AUX blockwhitespace.patch 479 RMD160 f48b5d7a6a883f86eb6b6b4738622eb007ea6c4b SHA1 3c08cddfec6fb36eed8a68ac664075aac7d139d4 SHA256 414bdf264c4d6b8ad2b2af888d4293ed3c2405f8856899019fddfa173429bede
 DIST AppConfig-1.66.tar.gz 63521 RMD160 172ea4493291722cd5acd414395fa1d96597dd84 SHA1 177d362530b532ee70dd59ab899eb83664b7bbda SHA256 8b402de20569e6499e55bd36bd2264d964a41218f75fde6ac29902d16fd23bdc
-EBUILD AppConfig-1.66.ebuild 752 RMD160 a27dd8026a9c892375a7f56c0e67f9f244a1456a SHA1 fb7239e3b58d49bba9b09a9be2bccb93277e7f74 SHA256 f76832c1c611b977c71cbac2522885938bc96440e402d33a3b28cbe85545598a
-MISC ChangeLog 6759 RMD160 7569cbacd9c7eb1784390201d2c26d09d3261de6 SHA1 50edc39e40ba27dcf06682932c53879489e87758 SHA256 661afacbbfe562771baa735ca3da6690689d6ecfdf2f6dd940879d3fb31e08f7
+EBUILD AppConfig-1.66.ebuild 595 RMD160 546f58e56ce6c75acbd7af3eb7c2474f69343809 SHA1 b86e7ae97a7eac9063fb93df53d12b546706b1f0 SHA256 d059832517398397545ffb073f22d1c20efc3ef5c14d29fb2b83d4677620226d
+MISC ChangeLog 6914 RMD160 f2f368d8a9d2f7d7a8bebbe0abb139767fc0cc01 SHA1 3f4a1e84c1edf45c9e99615a8ced4e613b9f27e6 SHA256 bcc5278d552ee69decb39229ba100068a5499b22326c564e7ffeff05ada9f130
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn8N5AACgkQV3J2n04Eauw6rwCgqVo7p/LRBFDy1ju8C2+mDEF8
-ChIAoIbGnY4hCZwt+IvyKCPPyo6l3+je
-=e4Ms
+iEYEARECAAYFAkqHv6oACgkQV3J2n04EauyNmQCg1XAifGoBOFslm/xZMVj3Zi4j
+A9YAniQ5EzUh7Cz4t1dliifXcm/fWGLk
+=Jd0z
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/AppConfig/files/blocksep.patch b/dev-perl/AppConfig/files/blocksep.patch
deleted file mode 100644
index b9affd8a7211..000000000000
--- a/dev-perl/AppConfig/files/blocksep.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -burN AppConfig-1.56.orig/lib/AppConfig/File.pm AppConfig-1.56/lib/AppConfig/File.pm
---- AppConfig-1.56.orig/lib/AppConfig/File.pm	2004-02-04 02:28:28.000000000 -0800
-+++ AppConfig-1.56/lib/AppConfig/File.pm	2004-05-28 15:08:31.432761817 -0700
-@@ -44,6 +44,7 @@
-         STATE    => $state,                # AppConfig::State ref
-         DEBUG    => $state->_debug(),      # store local copy of debug 
-         PEDANTIC => $state->_pedantic,     # and pedantic flags
-+        BLOCKSEP => $state->_blocksep,     # and block separator
-     };
- 
-     bless $self, $class;
-@@ -87,7 +88,7 @@
-     my $flag;
- 
-     # take a local copy of the state to avoid much hash dereferencing
--    my ($state, $debug, $pedantic) = @$self{ qw( STATE DEBUG PEDANTIC ) };
-+    my ($state, $debug, $pedantic, $blocksep) = @$self{ qw( STATE DEBUG PEDANTIC BLOCKSEP ) };
- 
-     # we want to install a custom error handler into the AppConfig::State 
-     # which appends filename and line info to error messages and then 
-@@ -201,7 +202,7 @@
- 		$flag = $1;
- 
- 		# $variable gets any $prefix 
--		$variable = $prefix . '_' . $variable
-+		$variable = $prefix . $blocksep . $variable
- 		    if length $prefix;
- 
- 		# if the variable doesn't exist, we call set() to give 
-diff -burN AppConfig-1.56.orig/lib/AppConfig/State.pm AppConfig-1.56/lib/AppConfig/State.pm
---- AppConfig-1.56.orig/lib/AppConfig/State.pm	2004-02-04 02:11:23.000000000 -0800
-+++ AppConfig-1.56/lib/AppConfig/State.pm	2004-05-28 14:42:23.588164697 -0700
-@@ -57,7 +57,7 @@
- 
- # internal values that AUTOLOAD should provide access to
- my %METHFLAGS;
--   @METHFLAGS{ qw( PEDANTIC ) } = ();
-+   @METHFLAGS{ qw( PEDANTIC BLOCKSEP ) } = ();
- 
- # variable attributes that may be specified in GLOBAL;
- my @GLOBAL_OK = qw( DEFAULT EXPAND VALIDATE ACTION ARGS ARGCOUNT );
-@@ -98,6 +98,7 @@
-         PEDANTIC   => 0,       # return immediately on parse warnings
-         EHANDLER   => undef,   # error handler (let's hope we don't need it!)
-         ERROR      => '',      # error message
-+        BLOCKSEP   => '_',     # separator between [block] and variable name
-     };
- 
-     bless $self, $class;
-@@ -509,8 +510,8 @@
-         };
-             
- 	
--        # CASE, CREATE and PEDANTIC are stored as they are
--        $opt =~ /^CASE|CREATE|PEDANTIC$/i && do {
-+        # CASE, CREATE, PEDANTIC and BLOCKSEP are stored as they are
-+        $opt =~ /^CASE|CREATE|PEDANTIC|BLOCKSEP$/i && do {
-             $self->{ uc $opt } = $cfg->{ $opt };
-             next;
-         };
-@@ -1020,6 +1021,13 @@
- DEBUG (and also PEDANTIC) values of the state at that time.  Subsequent
- changes to the AppConfig::State debug value will not affect them.
- 
-+=item BLOCKSEP
-+
-+When parsing configuration files that are grouped using constructions
-+like [block], this string parameter determines what is used to
-+separate the name of the block from the name of each variable
-+contained within it.  If unspecified, BLOCKSEP defaults to '_'.
-+
- =item GLOBAL 
- 
- The GLOBAL option allows default values to be set for the DEFAULT, ARGCOUNT, 
diff --git a/dev-perl/AppConfig/files/blockwhitespace.patch b/dev-perl/AppConfig/files/blockwhitespace.patch
deleted file mode 100644
index 8fe839ecf3b6..000000000000
--- a/dev-perl/AppConfig/files/blockwhitespace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN AppConfig-1.56.orig/lib/AppConfig/File.pm AppConfig-1.56/lib/AppConfig/File.pm
---- AppConfig-1.56.orig/lib/AppConfig/File.pm	2004-02-04 02:28:28.000000000 -0800
-+++ AppConfig-1.56/lib/AppConfig/File.pm	2004-05-26 15:54:17.854304993 -0700
-@@ -170,7 +170,7 @@
- 	    s/\s+$//;
- 
- 	    # look for a [block] to set $prefix
--	    if (/^\[([^\]]+)\]$/) {
-+	    if (/^\[\s*([^\]\s]+)\s*\]$/) {
- 		$prefix = $1;
- 		print STDERR "Entering [$prefix] block\n" if $debug;
- 		next;