5.8.3, housecleaning

24 files changed, 79 insertions, 535 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 4d164820c17c..a20dbaf7cdde 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.47 2004/01/06 03:45:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.48 2004/01/18 06:46:58 rac Exp $
+
+*perl-5.8.3 (17 Jan 2004)
+
+  17 Jan 2004; <rac@gentoo.org> perl-5.8.1-r1.ebuild, perl-5.8.1-r2.ebuild,
+  perl-5.8.3.ebuild, files/perl-5.8.1-perldoc-emptydirs.patch,
+  files/perl-5.8.1-prelink-lpthread.patch, files/perl-5.8.1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch,
+  files/perl-5.8.1_rc2-reorder-INC.patch,
+  files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch,
+  files/perl-5.8.3-perldoc-emptydirs.patch, files/perl-5.8.3-picdl.patch,
+  files/perl-5.8.3-prelink-lpthread.patch, files/perl-5.8.3-reorder-INC.patch:
+  Upstream bump, housecleaning
 
   06 Jan 2004; Luca Barbato <lu_zero@gentoo.org> perl-5.8.0-r12.ebuild:
   Marked ~arm to let me commit ppc related changes (it is as wierd as it sound)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 05c5549656a8..ef55cc93f5be 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,20 +1,16 @@
-MD5 09d5787d3ba0b41bbc6b0ecb4f17c994 perl-5.8.2-r1.ebuild 9953
-MD5 228f894d40b3f16fc9c0987211dbe77a perl-5.8.2.ebuild 9446
-MD5 5e2ced5e0d331faea9122a21c49957b0 perl-5.6.1-r12.ebuild 7089
-MD5 6fa918519f79045619ee131c5cd6b38b perl-5.8.1-r1.ebuild 8736
-MD5 51da78b2203cbf4e81dafb6e24dd2e22 perl-5.8.0-r10.ebuild 14009
-MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
-MD5 b95056a0bf523567aa4b5e7754c37d62 perl-5.8.0-r12.ebuild 10323
-MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
-MD5 09d5787d3ba0b41bbc6b0ecb4f17c994 perl-5.8.3.ebuild 9953
-MD5 039399151aff0b9074381e9dc831f52a perl-5.8.1-r2.ebuild 9144
-MD5 d1e81237d577c01b9e1e131d896b025f ChangeLog 21275
-MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890
+MD5 c49f5293169f089b4f3c9fba1630dceb perl-5.8.2-r1.ebuild 9947
+MD5 ccca19147b7158fe262440eed7edbabe perl-5.8.2.ebuild 9446
+MD5 44ef7d9a5b648489a09da79733977d04 perl-5.6.1-r12.ebuild 7084
+MD5 e568fd47eae76cbf7708b1f0d3a5d7b9 perl-5.8.0-r10.ebuild 14004
+MD5 c474a0043d20d64af5f92a56744bfb3a perl-5.8.0-r9.ebuild 13530
+MD5 bee3e214f30820da67a89b141b847524 perl-5.8.0-r12.ebuild 10319
+MD5 e395df81ce257d90b1161a988874d6e6 perl-5.6.1-r11.ebuild 6136
+MD5 85d984b443bc60a1c3687c95a7461741 perl-5.8.3.ebuild 9946
+MD5 afab9626933d1c87cfa0bf6094eb924b ChangeLog 21897
+MD5 f7806057cd940b8786984d9c6e77328e perl-5.8.0-r11.ebuild 9886
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc2-reorder-INC.patch 2211
+MD5 37bb16df46abe0a5ebe3b0ec8839b8f5 perl-5.6.1-r10.ebuild 6661
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch 379
 MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
 MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
 MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
@@ -22,9 +18,8 @@ MD5 9f290d90a6928f0b9662b20c1426c48a files/digest-perl-5.6.1-r12 198
 MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
 MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.1-perldoc-emptydirs.patch 489
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211
-MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.3-prelink-lpthread.patch 476
 MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
@@ -33,15 +28,13 @@ MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-perl-5.8.3 64
 MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r11 188
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r12 188
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc1-reorder-INC.patch 2211
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.1-prelink-lpthread.patch 476
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.3-perldoc-emptydirs.patch 489
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
 MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
-MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r1 64
-MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r2 64
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1-reorder-INC.patch 2211
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.3-reorder-INC.patch 2211
 MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.3-picdl.patch 250
diff --git a/dev-lang/perl/files/digest-perl-5.8.1-r1 b/dev-lang/perl/files/digest-perl-5.8.1-r1
deleted file mode 100644
index d6b20a4562d1..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87cf132f1fbf23e780f0b218046438a6 perl-5.8.1.tar.gz 11857808
diff --git a/dev-lang/perl/files/digest-perl-5.8.1-r2 b/dev-lang/perl/files/digest-perl-5.8.1-r2
deleted file mode 100644
index d6b20a4562d1..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87cf132f1fbf23e780f0b218046438a6 perl-5.8.1.tar.gz 11857808
diff --git a/dev-lang/perl/files/digest-perl-5.8.3 b/dev-lang/perl/files/digest-perl-5.8.3
new file mode 100644
index 000000000000..7c8f3b31b5b0
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.3
@@ -0,0 +1 @@
+MD5 6d2b389f8c6424b7af303f417947714f perl-5.8.3.tar.gz 12002329
diff --git a/dev-lang/perl/files/perl-5.8.1_rc1-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.1_rc1-reorder-INC.patch
deleted file mode 100644
index c934b4135a13..000000000000
--- a/dev-lang/perl/files/perl-5.8.1_rc1-reorder-INC.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- perl.c.orig	2003-07-10 22:09:00.000000000 -0700
-+++ perl.c	2003-07-10 22:30:21.000000000 -0700
-@@ -3932,9 +3932,9 @@
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
- #endif
- 
--#ifdef ARCHLIB_EXP
--    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
--#endif
-+    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
-+    incpush("/etc/perl", FALSE, FALSE, TRUE);
-+
- #ifdef MACOS_TRADITIONAL
-     {
- 	Stat_t tmpstatbuf;
-@@ -3961,8 +3961,6 @@
- #endif
- #if defined(WIN32)
-     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
--#else
--    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
- #endif
- 
- #ifdef SITEARCH_EXP
-@@ -4006,6 +4004,60 @@
-     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
- #endif
- 
-+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
-+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
-+
-+    /* Non-versioned site directory for local modules and for
-+       compatability with the previous packages' site dirs */
-+
-+    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
-+
-+#ifdef PERL_INC_VERSION_LIST
-+{
-+  struct stat s;
-+
-+  /* add small buffer in case old versions are longer than the current version */
-+  char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
-+  char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
-+  char const *vers[] = { PERL_INC_VERSION_LIST };
-+  char const **p;
-+
-+  char *arch_vers = strrchr(sitearch, '/');
-+  char *lib_vers = strrchr(sitelib, '/');
-+
-+  if (arch_vers && isdigit(*++arch_vers))
-+    *arch_vers = 0;
-+  else
-+    arch_vers = 0;
-+
-+  if (lib_vers && isdigit(*++lib_vers))
-+    *lib_vers = 0;
-+  else
-+    lib_vers = 0;
-+
-+  /* there is some duplication here as incpush does something similar
-+     internally, but required as sitearch is not a subdirectory of
-+     sitelib */
-+
-+  for (p = vers; *p; p++)
-+    {
-+      if (arch_vers)
-+	{
-+	  strcpy(arch_vers, *p);
-+	  if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitearch, FALSE, FALSE, TRUE);
-+	}
-+
-+      if (lib_vers)
-+	{
-+	  strcpy(lib_vers, *p);
-+	  if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitelib, FALSE, FALSE, TRUE);
-+	}
-+    }
-+}
-+#endif
-+
- #ifdef PERL_OTHERLIBDIRS
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
- #endif
diff --git a/dev-lang/perl/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch b/dev-lang/perl/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch
deleted file mode 100644
index bbc1c4a68907..000000000000
--- a/dev-lang/perl/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl.h.orig	2003-07-10 15:53:31.000000000 -0700
-+++ perl.h	2003-07-10 16:06:30.000000000 -0700
-@@ -736,7 +736,7 @@
- /* sockatmark() is so new (2001) that many places might have it hidden
-  * behind some -D_BLAH_BLAH_SOURCE guard. */
- #if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
--int sockatmark(int);
-+int sockatmark(int) __THROW;
- #endif
- 
- #ifdef SETERRNO
diff --git a/dev-lang/perl/files/perl-5.8.1_rc2-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.1_rc2-reorder-INC.patch
deleted file mode 100644
index c934b4135a13..000000000000
--- a/dev-lang/perl/files/perl-5.8.1_rc2-reorder-INC.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- perl.c.orig	2003-07-10 22:09:00.000000000 -0700
-+++ perl.c	2003-07-10 22:30:21.000000000 -0700
-@@ -3932,9 +3932,9 @@
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
- #endif
- 
--#ifdef ARCHLIB_EXP
--    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
--#endif
-+    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
-+    incpush("/etc/perl", FALSE, FALSE, TRUE);
-+
- #ifdef MACOS_TRADITIONAL
-     {
- 	Stat_t tmpstatbuf;
-@@ -3961,8 +3961,6 @@
- #endif
- #if defined(WIN32)
-     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
--#else
--    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
- #endif
- 
- #ifdef SITEARCH_EXP
-@@ -4006,6 +4004,60 @@
-     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
- #endif
- 
-+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
-+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
-+
-+    /* Non-versioned site directory for local modules and for
-+       compatability with the previous packages' site dirs */
-+
-+    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
-+
-+#ifdef PERL_INC_VERSION_LIST
-+{
-+  struct stat s;
-+
-+  /* add small buffer in case old versions are longer than the current version */
-+  char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
-+  char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
-+  char const *vers[] = { PERL_INC_VERSION_LIST };
-+  char const **p;
-+
-+  char *arch_vers = strrchr(sitearch, '/');
-+  char *lib_vers = strrchr(sitelib, '/');
-+
-+  if (arch_vers && isdigit(*++arch_vers))
-+    *arch_vers = 0;
-+  else
-+    arch_vers = 0;
-+
-+  if (lib_vers && isdigit(*++lib_vers))
-+    *lib_vers = 0;
-+  else
-+    lib_vers = 0;
-+
-+  /* there is some duplication here as incpush does something similar
-+     internally, but required as sitearch is not a subdirectory of
-+     sitelib */
-+
-+  for (p = vers; *p; p++)
-+    {
-+      if (arch_vers)
-+	{
-+	  strcpy(arch_vers, *p);
-+	  if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitearch, FALSE, FALSE, TRUE);
-+	}
-+
-+      if (lib_vers)
-+	{
-+	  strcpy(lib_vers, *p);
-+	  if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitelib, FALSE, FALSE, TRUE);
-+	}
-+    }
-+}
-+#endif
-+
- #ifdef PERL_OTHERLIBDIRS
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
- #endif
diff --git a/dev-lang/perl/files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch b/dev-lang/perl/files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch
deleted file mode 100644
index bbc1c4a68907..000000000000
--- a/dev-lang/perl/files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl.h.orig	2003-07-10 15:53:31.000000000 -0700
-+++ perl.h	2003-07-10 16:06:30.000000000 -0700
-@@ -736,7 +736,7 @@
- /* sockatmark() is so new (2001) that many places might have it hidden
-  * behind some -D_BLAH_BLAH_SOURCE guard. */
- #if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
--int sockatmark(int);
-+int sockatmark(int) __THROW;
- #endif
- 
- #ifdef SETERRNO
diff --git a/dev-lang/perl/files/perl-5.8.1-perldoc-emptydirs.patch b/dev-lang/perl/files/perl-5.8.3-perldoc-emptydirs.patch
index 650248c509e8..650248c509e8 100644
--- a/dev-lang/perl/files/perl-5.8.1-perldoc-emptydirs.patch
+++ b/dev-lang/perl/files/perl-5.8.3-perldoc-emptydirs.patch
diff --git a/dev-lang/perl/files/perl-5.8.3-picdl.patch b/dev-lang/perl/files/perl-5.8.3-picdl.patch
new file mode 100644
index 000000000000..f69a6800cf48
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.3-picdl.patch
@@ -0,0 +1,13 @@
+--- Makefile.SH.orig	2003-11-29 01:16:15.000000000 -0800
++++ Makefile.SH	2003-11-29 01:16:52.000000000 -0800
+@@ -129,8 +129,8 @@
+ 
+ 	;;
+ 
+-*)	pldlflags=''
+-	static_target='static'
++*)	pldlflags="$cccdlflags"
++	static_target='static_pic'
+ 	;;
+ esac
+ 
diff --git a/dev-lang/perl/files/perl-5.8.1-prelink-lpthread.patch b/dev-lang/perl/files/perl-5.8.3-prelink-lpthread.patch
index d38497e0aebe..d38497e0aebe 100644
--- a/dev-lang/perl/files/perl-5.8.1-prelink-lpthread.patch
+++ b/dev-lang/perl/files/perl-5.8.3-prelink-lpthread.patch
diff --git a/dev-lang/perl/files/perl-5.8.1-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.3-reorder-INC.patch
index c934b4135a13..c934b4135a13 100644
--- a/dev-lang/perl/files/perl-5.8.1-reorder-INC.patch
+++ b/dev-lang/perl/files/perl-5.8.3-reorder-INC.patch
diff --git a/dev-lang/perl/perl-5.6.1-r10.ebuild b/dev-lang/perl/perl-5.6.1-r10.ebuild
index 1a9531f26613..54deb22faedf 100644
--- a/dev-lang/perl/perl-5.6.1-r10.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r10.ebuild,v 1.10 2003/09/10 01:52:16 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r10.ebuild,v 1.11 2004/01/18 06:46:58 rac Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
diff --git a/dev-lang/perl/perl-5.6.1-r11.ebuild b/dev-lang/perl/perl-5.6.1-r11.ebuild
index 71870d88a1ea..7350e6b331cf 100644
--- a/dev-lang/perl/perl-5.6.1-r11.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r11.ebuild,v 1.11 2003/09/10 01:52:16 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r11.ebuild,v 1.12 2004/01/18 06:46:58 rac Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
diff --git a/dev-lang/perl/perl-5.6.1-r12.ebuild b/dev-lang/perl/perl-5.6.1-r12.ebuild
index dc0a574caed1..e8b9dfab31b4 100644
--- a/dev-lang/perl/perl-5.6.1-r12.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r12.ebuild,v 1.8 2003/09/10 01:52:16 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r12.ebuild,v 1.9 2004/01/18 06:46:58 rac Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 MM_VERSION="6.05"
diff --git a/dev-lang/perl/perl-5.8.0-r10.ebuild b/dev-lang/perl/perl-5.8.0-r10.ebuild
index 131f84880d9e..60dd0543e90d 100644
--- a/dev-lang/perl/perl-5.8.0-r10.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.18 2003/09/06 22:27:51 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.19 2004/01/18 06:46:58 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
diff --git a/dev-lang/perl/perl-5.8.0-r11.ebuild b/dev-lang/perl/perl-5.8.0-r11.ebuild
index 112228bf249e..98e9151599f5 100644
--- a/dev-lang/perl/perl-5.8.0-r11.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r11.ebuild,v 1.9 2003/09/06 22:27:51 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r11.ebuild,v 1.10 2004/01/18 06:46:58 rac Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/dev-lang/perl/perl-5.8.0-r12.ebuild b/dev-lang/perl/perl-5.8.0-r12.ebuild
index 8a12c0ba8133..dda49aeaf379 100644
--- a/dev-lang/perl/perl-5.8.0-r12.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r12.ebuild,v 1.15 2004/01/06 03:45:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r12.ebuild,v 1.16 2004/01/18 06:46:58 rac Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/dev-lang/perl/perl-5.8.0-r9.ebuild b/dev-lang/perl/perl-5.8.0-r9.ebuild
index 4bd0940ef4a1..a716b71ab1d8 100644
--- a/dev-lang/perl/perl-5.8.0-r9.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r9.ebuild,v 1.9 2003/09/06 22:27:51 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r9.ebuild,v 1.10 2004/01/18 06:46:58 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
diff --git a/dev-lang/perl/perl-5.8.1-r1.ebuild b/dev-lang/perl/perl-5.8.1-r1.ebuild
deleted file mode 100644
index cb8166db7ce1..000000000000
--- a/dev-lang/perl/perl-5.8.1-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r1.ebuild,v 1.3 2003/10/20 23:16:05 mcummings Exp $
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
-# This flag makes compiling crash in interesting ways
-filter-flags -malign-double
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SAFE_VERSION="2.09"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-SLOT="0"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-LICENSE="Artistic GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64"
-IUSE="berkdb doc gdbm threads"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
-	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'threads'
-	# in USE if it could break things ...
-	if [ -n "`use threads`" ]
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		sleep 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=threads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f /usr/lib/${LIBPERL} ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	# we are using the vendor directory now, so it should not be
-	# empty.  this patch doesn't come close to applying, so leaving
-	# off for now.
-	# <rac@gentoo.org> (10 Jul 2003)
-
-	#cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [ "`use threads`" ]
-	then
-		einfo "using threads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	if [ "`use gdbm`" ]
-	then
-		myconf="${myconf} -Di_gdbm"
-	fi
-	if [ "`use berkdb`" ]
-	then
-		myconf="${myconf} -Di_db -Di_ndbm"
-	else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-	if [ "`use mips`" ]
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-	if [ "`use sparc`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-	if [ "`use sparc64`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "`use alpha`" -a "${CC}" == "ccc" ]
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman3ext='3pm' \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
-
-	emake -i test CCDLFLAGS=
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	# Need to do this, else apps do not link to dynamic version of
-	# the library ...
-	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-	dodir ${coredir}
-	dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" \
-		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
-		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
-		install || die "Unable to make install"
-
-	cp -f utils/h2ph utils/h2ph_patched
-	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	./perl installman \
-		--destdir="${D}" --man1ext='1' --man3ext='3'
-
-	# This removes ${D} from Config.pm and .packlist
-	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-		einfo "Removing ${D} from ${i}..."
-		sed -e "s:${D}::" ${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ -n "`use doc`" ]
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; find ./ -name "*.h" -type f -exec h2ph {} \;
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
-
-
diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
index c9dd9bc265cc..340c9eea969a 100644
--- a/dev-lang/perl/perl-5.8.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.2 2003/12/17 03:45:41 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.3 2004/01/18 06:46:58 rac Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/dev-lang/perl/perl-5.8.2.ebuild b/dev-lang/perl/perl-5.8.2.ebuild
index 66c76d7321ab..22bfa15add0e 100644
--- a/dev-lang/perl/perl-5.8.2.ebuild
+++ b/dev-lang/perl/perl-5.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2.ebuild,v 1.3 2003/11/26 22:16:43 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2.ebuild,v 1.4 2004/01/18 06:46:58 rac Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/dev-lang/perl/perl-5.8.1-r2.ebuild b/dev-lang/perl/perl-5.8.3.ebuild
index de4f92c44cc6..992635bb7413 100644
--- a/dev-lang/perl/perl-5.8.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.5 2003/10/22 20:26:53 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.3.ebuild,v 1.1 2004/01/18 06:46:58 rac Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,14 +24,14 @@ HOMEPAGE="http://www.perl.org/"
 SLOT="0"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64 ~ppc64"
 IUSE="berkdb doc gdbm threads"
 
 DEPEND="sys-apps/groff
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
+	>=sys-devel/libperl-${PV}
 	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
 	!<dev-perl/File-Spec-0.84-r1
 	!<dev-perl/Test-Simple-0.47-r1"
@@ -93,6 +93,13 @@ src_unpack() {
 	# that are in the core, by rearranging the @INC directory to look
 	# site -> vendor -> core.
 	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+
+	# some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu
+	# attempts to avoid bringing cccdlflags to bear on static
+	# extensions (like DynaLoader).  i believe this is
+	# counterproductive on a Gentoo system which has both a shared
+	# and static libperl, so effectively revert this here.
+	cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch
 }
 
 src_compile() {
@@ -154,10 +161,17 @@ src_compile() {
 		myconf="${myconf} -Ui_db -Ui_ndbm"
 	fi
 
+	# These are temporary fixes. Need to edit the build so that that libraries created
+	# only get compiled with -fPIC, since they get linked into shared objects, they
+	# must be compiled with -fPIC.  Don't have time to parse through the build system
+	# at this time.
 	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+#	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 
 	sh Configure -des \
 		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
 		-Dcc="${CC:-gcc}" \
 		-Dprefix='/usr' \
 		-Dvendorprefix='/usr' \