5 files changed, 149 insertions, 0 deletions
diff --git a/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild b/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild
new file mode 100644
index 000000000000..1501f88b80f8
--- /dev/null
+++ b/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ABW
+MODULE_VERSION=1.66
+inherit perl-module eutils
+
+DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-perl/File-HomeDir-0.57"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/blockdiffs.patch" )
+SRC_TEST="do"
diff --git a/dev-perl/AppConfig/AppConfig-1.710.0.ebuild b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
new file mode 100644
index 000000000000..15f06b65e6f5
--- /dev/null
+++ b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=NEILB
+MODULE_VERSION=1.71
+inherit perl-module
+
+DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/File-HomeDir-0.57
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Pod-1
+	)
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/AppConfig/Manifest b/dev-perl/AppConfig/Manifest
new file mode 100644
index 000000000000..a023ca5ea994
--- /dev/null
+++ b/dev-perl/AppConfig/Manifest
@@ -0,0 +1,2 @@
+DIST AppConfig-1.66.tar.gz 63521 SHA256 8b402de20569e6499e55bd36bd2264d964a41218f75fde6ac29902d16fd23bdc SHA512 dbb82ab785f1ff203e362e226e17586e7eab00d47be5581dd1085dddd2294dc36f110c322e95dfbaa9e24d1196273d6767079055b138a76ae1e65b40bd861f80 WHIRLPOOL d9db64435800da5757cf01aa210c0de4e01917b49e912d27a77e781abb3954d77347124be5ef85bf17791992a66a6d7d3672b96f810a2d4e178cc8b15e6370d8
+DIST AppConfig-1.71.tar.gz 56739 SHA256 1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f SHA512 cbd58601ce0ea6c237e86b8b013cf75e552914263f56b1ab26b8079bff75b28ca2bb35585bfaa187b611afa969767c25494d3ec2a6b3ff5d1aecd2f9ffa8df72 WHIRLPOOL c3622adb84506e782eea2a0b3208ab9894c56c6a9293a10edeea958453b47861e937bf7cb530c6469057c762709932dc439ca6a5d196da25cb0b95802190d56a
diff --git a/dev-perl/AppConfig/files/blockdiffs.patch b/dev-perl/AppConfig/files/blockdiffs.patch
new file mode 100644
index 000000000000..2e30310a8884
--- /dev/null
+++ b/dev-perl/AppConfig/files/blockdiffs.patch
@@ -0,0 +1,83 @@
+diff -Naurp AppConfig-1.65.orig/lib/AppConfig/File.pm AppConfig-1.65/lib/AppConfig/File.pm
+--- AppConfig-1.65.orig/lib/AppConfig/File.pm	2007-05-30 07:24:09.000000000 -0400
++++ AppConfig-1.65/lib/AppConfig/File.pm	2007-06-09 07:08:21.000000000 -0400
+@@ -38,6 +38,7 @@ sub new {
+         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;
+@@ -80,7 +81,7 @@ sub parse {
+     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 
+@@ -163,7 +164,7 @@ sub parse {
+             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;
+@@ -194,7 +195,7 @@ sub parse {
+                 $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 -Naurp AppConfig-1.65.orig/lib/AppConfig/State.pm AppConfig-1.65/lib/AppConfig/State.pm
+--- AppConfig-1.65.orig/lib/AppConfig/State.pm	2007-05-30 07:24:20.000000000 -0400
++++ AppConfig-1.65/lib/AppConfig/State.pm	2007-06-09 07:11:16.000000000 -0400
+@@ -53,7 +53,7 @@ my %METHVARS;
+ 
+ # 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 );
+@@ -94,6 +94,7 @@ sub new {
+         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;
+@@ -504,8 +505,8 @@ sub _configure {
+             next;
+         };
+             
+-        # 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;
+         };
+@@ -1015,6 +1016,13 @@ instantiated with a reference to an App:
+ 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/metadata.xml b/dev-perl/AppConfig/metadata.xml
new file mode 100644
index 000000000000..a41506a11a14
--- /dev/null
+++ b/dev-perl/AppConfig/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">AppConfig</remote-id>
+    <remote-id type="cpan-module">AppConfig</remote-id>
+    <remote-id type="cpan-module">AppConfig::Args</remote-id>
+    <remote-id type="cpan-module">AppConfig::CGI</remote-id>
+    <remote-id type="cpan-module">AppConfig::File</remote-id>
+    <remote-id type="cpan-module">AppConfig::Getopt</remote-id>
+    <remote-id type="cpan-module">AppConfig::State</remote-id>
+    <remote-id type="cpan-module">AppConfig::Sys</remote-id>
+  </upstream>
+</pkgmetadata>