add blocksep patch, clean out deadwood

8 files changed, 120 insertions, 37 deletions

diff --git a/dev-perl/AppConfig/AppConfig-1.55.ebuild b/dev-perl/AppConfig/AppConfig-1.55.ebuild
deleted file mode 100644
index 8b1497ce867a..000000000000
--- a/dev-perl/AppConfig/AppConfig-1.55.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.55.ebuild,v 1.5 2004/05/23 23:57:22 kloeri Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Application config (from ARGV, file, ...)"
-SRC_URI="http://www.cpan.org/authors/id/ABW/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/author/ABW/AppConfig-1.55/"
-
-SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 amd64 sparc alpha ~ppc"
-
-DEPEND="dev-perl/Test-Simple"
-
diff --git a/dev-perl/AppConfig/AppConfig-1.56-r2.ebuild b/dev-perl/AppConfig/AppConfig-1.56-r2.ebuild
new file mode 100644
index 000000000000..be3c126b04f8
--- /dev/null
+++ b/dev-perl/AppConfig/AppConfig-1.56-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.56-r2.ebuild,v 1.1 2004/05/30 06:14:50 rac Exp $
+
+inherit perl-module eutils
+
+DESCRIPTION="Application config (from ARGV, file, ...)"
+HOMEPAGE="http://search.cpan.org/author/ABW/AppConfig-1.55/"
+SRC_URI="http://www.cpan.org/authors/id/ABW/${P}.tar.gz"
+
+LICENSE="Artistic | GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~alpha ~ppc"
+
+DEPEND="dev-perl/Test-Simple"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# 2004.05.27 rac 
+	# this patch, which will be sent upstream, allows [ block ] to
+	# work without variables becoming ' block _var'
+
+	epatch ${FILESDIR}/blockwhitespace.patch
+
+	# 2004.05.28 rac
+	# this patch, which will be sent upstream, allows customizing the
+	# separator between [block] and variable name, instead of having _
+	# be hardwired.  this is important when processing constructions
+	# where _ is a legal part of either blocks or variable names.
+
+	epatch ${FILESDIR}/blocksep.patch
+}
diff --git a/dev-perl/AppConfig/AppConfig-1.56.ebuild b/dev-perl/AppConfig/AppConfig-1.56.ebuild
deleted file mode 100644
index f34474d1c5cf..000000000000
--- a/dev-perl/AppConfig/AppConfig-1.56.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.56.ebuild,v 1.1 2004/05/26 21:47:58 rac Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Application config (from ARGV, file, ...)"
-SRC_URI="http://www.cpan.org/authors/id/ABW/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/author/ABW/AppConfig-1.55/"
-
-SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 amd64 sparc alpha ~ppc"
-
-DEPEND="dev-perl/Test-Simple"
-
diff --git a/dev-perl/AppConfig/ChangeLog b/dev-perl/AppConfig/ChangeLog
index f971afed7ec2..04d72706f3f9 100644
--- a/dev-perl/AppConfig/ChangeLog
+++ b/dev-perl/AppConfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/AppConfig
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/ChangeLog,v 1.12 2004/05/27 00:10:59 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/ChangeLog,v 1.13 2004/05/30 06:14:50 rac Exp $
+
+*AppConfig-1.56-r2 (29 May 2004)
+
+  29 May 2004; Robert Coie <rac@gentoo.org> AppConfig-1.55.ebuild,
+  AppConfig-1.56-r2.ebuild, AppConfig-1.56.ebuild, files/blocksep.patch:
+  Add blocksep patch (sent upstream)
 
 *AppConfig-1.56-r1 (26 May 2004)
 
diff --git a/dev-perl/AppConfig/Manifest b/dev-perl/AppConfig/Manifest
index a78fd8f294de..e45db576d4e8 100644
--- a/dev-perl/AppConfig/Manifest
+++ b/dev-perl/AppConfig/Manifest
@@ -1,12 +1,16 @@
+MD5 3065cd67af72f87169c1d1829c19d8aa AppConfig-1.56-r2.ebuild 1082
 MD5 f7181b6cea93be3ed06b8c1baedab8cc AppConfig-1.56.ebuild 549
-MD5 80aae6163720153c09b9ec4bf159fccb AppConfig-1.56-r1.ebuild 616
+MD5 d0f425473442a0b3405cb3be32b27ae3 AppConfig-1.56-r1.ebuild 625
 MD5 623906e192d05bf965ed5126c48ea4de AppConfig-1.52-r1.ebuild 631
 MD5 1c107bbd50f55b23d73ac5fe6e459c15 AppConfig-1.55.ebuild 552
 MD5 7541e325f0b2b974db308fe15a738487 ChangeLog 1386
+MD5 d0f425473442a0b3405cb3be32b27ae3 AppConfig-1.56-r2.ebuild~ 625
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 03bbc137040d922124a49e2eeb8451df AppConfig-1.52.ebuild 624
+MD5 7d66af0eceb608490f6fbc44a1c8407e files/blocksep.patch 3053
 MD5 06423780fb72eb65725a2491d4ffb753 files/digest-AppConfig-1.52-r1 65
 MD5 cd9d4e331a460c62cbefa6c1eac51119 files/digest-AppConfig-1.56-r1 65
+MD5 cd9d4e331a460c62cbefa6c1eac51119 files/digest-AppConfig-1.56-r2 65
 MD5 3ff95f843a1d73e04b9d80345b372343 files/AppConfig-1.52-gentoo.diff 2204
 MD5 06423780fb72eb65725a2491d4ffb753 files/digest-AppConfig-1.52 65
 MD5 a9685ed36d214628863e2153ff872c1e files/digest-AppConfig-1.55 65
diff --git a/dev-perl/AppConfig/files/blocksep.patch b/dev-perl/AppConfig/files/blocksep.patch
new file mode 100644
index 000000000000..b9affd8a7211
--- /dev/null
+++ b/dev-perl/AppConfig/files/blocksep.patch
@@ -0,0 +1,74 @@
+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/digest-AppConfig-1.55 b/dev-perl/AppConfig/files/digest-AppConfig-1.55
deleted file mode 100644
index ccf22fe17cc2..000000000000
--- a/dev-perl/AppConfig/files/digest-AppConfig-1.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20d81571e7ef7da092613b4dd69fed33 AppConfig-1.55.tar.gz 45687
diff --git a/dev-perl/AppConfig/files/digest-AppConfig-1.56 b/dev-perl/AppConfig/files/digest-AppConfig-1.56-r2
index d1ffcd72eab3..d1ffcd72eab3 100644
--- a/dev-perl/AppConfig/files/digest-AppConfig-1.56
+++ b/dev-perl/AppConfig/files/digest-AppConfig-1.56-r2