avoid shared linking of libapreq.so

5 files changed, 69 insertions, 4 deletions

diff --git a/dev-perl/libapreq/ChangeLog b/dev-perl/libapreq/ChangeLog
index daf85d758fe2..8220b0872514 100644
--- a/dev-perl/libapreq/ChangeLog
+++ b/dev-perl/libapreq/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-perl/libapreq
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libapreq/ChangeLog,v 1.11 2003/06/21 02:30:21 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libapreq/ChangeLog,v 1.12 2003/11/05 00:17:07 rac Exp $
+
+*libapreq-1.2-r1 (04 Nov 2003)
+
+  04 Nov 2003; <rac@gentoo.org> libapreq-1.2-r1.ebuild,
+  files/libapreq-1.2-statlink.patch:
+  Apply patch from
+  http://www.gossamer-threads.com/archive/mod_perl_C1/modperl_F7/need_your_help_
+  to_test_mod_perl_with_perl-5.8.1-RC3_P73457/ to attempt to fix problems with
+  recent makemakers and shared versus static linking of libapreq.so
 
 *libapreq-1.2 (20 Jun 2003)
 
diff --git a/dev-perl/libapreq/Manifest b/dev-perl/libapreq/Manifest
index 3c0d4b1d3cee..343112a92db9 100644
--- a/dev-perl/libapreq/Manifest
+++ b/dev-perl/libapreq/Manifest
@@ -1,6 +1,9 @@
-MD5 4cc0ff57ff42dd9336286c9c9401b026 ChangeLog 1590
-MD5 fed94223aeb4db8b30bb2bdbe1a9e340 libapreq-1.0-r3.ebuild 684
+MD5 76ce70df4f78fc64d79e12f81dc72edc libapreq-1.2-r1.ebuild 792
 MD5 41facf26aac19db99417f361c1b463aa libapreq-1.2.ebuild 706
+MD5 fed94223aeb4db8b30bb2bdbe1a9e340 libapreq-1.0-r3.ebuild 684
+MD5 1168b6ffbc31ba69839b8be282ba7ee0 ChangeLog 1957
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 6b94213da4a46d8ecdc031e39dfd9233 files/digest-libapreq-1.0-r3 64
+MD5 fedd3f5e45b0f5814cadcea36607baad files/libapreq-1.2-statlink.patch 988
 MD5 4527276b891721c635158cd57532a64c files/digest-libapreq-1.2 64
+MD5 6b94213da4a46d8ecdc031e39dfd9233 files/digest-libapreq-1.0-r3 64
+MD5 4527276b891721c635158cd57532a64c files/digest-libapreq-1.2-r1 64
diff --git a/dev-perl/libapreq/files/digest-libapreq-1.2-r1 b/dev-perl/libapreq/files/digest-libapreq-1.2-r1
new file mode 100644
index 000000000000..8290e8b300c3
--- /dev/null
+++ b/dev-perl/libapreq/files/digest-libapreq-1.2-r1
@@ -0,0 +1 @@
+MD5 ae08726f11ca25a215d4d854d675c3ff libapreq-1.2.tar.gz 277549
diff --git a/dev-perl/libapreq/files/libapreq-1.2-statlink.patch b/dev-perl/libapreq/files/libapreq-1.2-statlink.patch
new file mode 100644
index 000000000000..3f7e79378130
--- /dev/null
+++ b/dev-perl/libapreq/files/libapreq-1.2-statlink.patch
@@ -0,0 +1,24 @@
+diff -burN libapreq-1.2.orig/Cookie/Makefile.PL libapreq-1.2/Cookie/Makefile.PL
+--- libapreq-1.2.orig/Cookie/Makefile.PL	2001-04-03 12:24:08.000000000 -0700
++++ libapreq-1.2/Cookie/Makefile.PL	2003-11-04 15:41:21.000000000 -0800
+@@ -27,7 +27,7 @@
+         @mm_args,
+         'INC'	=> "-I../c ". $src->inc,
+         'TYPEMAPS'  => $src->typemaps,
+-        'LIBS' => "-L$root -lapreq",
++	'OBJECT' => "Cookie.o $root/libapreq.a",
+ 	'dynamic_lib' => {
+ 		'OTHERLDFLAGS' => $src->otherldflags,
+ 	},
+diff -burN libapreq-1.2.orig/Request/Makefile.PL libapreq-1.2/Request/Makefile.PL
+--- libapreq-1.2.orig/Request/Makefile.PL	2001-04-03 12:24:09.000000000 -0700
++++ libapreq-1.2/Request/Makefile.PL	2003-11-04 15:43:27.000000000 -0800
+@@ -27,7 +27,7 @@
+ 	  @mm_args,
+ 	  'INC'	=> "-I../c ". $src->inc,
+ 	  'TYPEMAPS'  => $src->typemaps,
+-          'LIBS' => "-L$root -lapreq",
++	  'OBJECT' => "Request.o $root/libapreq.a",
+ 	  'dynamic_lib' => {
+ 	  	'OTHERLDFLAGS' => $src->otherldflags,
+ 	  },
diff --git a/dev-perl/libapreq/libapreq-1.2-r1.ebuild b/dev-perl/libapreq/libapreq-1.2-r1.ebuild
new file mode 100644
index 000000000000..5734a27c8168
--- /dev/null
+++ b/dev-perl/libapreq/libapreq-1.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libapreq/libapreq-1.2-r1.ebuild,v 1.1 2003/11/05 00:17:07 rac Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A Apache Request Perl Module"
+SRC_URI="http://cpan.valueclick.com/modules/by-category/15_World_Wide_Web_HTML_HTTP_CGI/Apache/${P}.tar.gz"
+HOMEPAGE="http://cpan.valueclick.com/modules/by-category/15_World_Wide_Web_HTML_HTTP_CGI/Apache/${P}.readme"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+
+DEPEND="${DEPEND}
+	>=sys-apps/sed-4
+	dev-perl/Apache-Test
+	<dev-perl/mod_perl-1.99"
+
+mydoc="TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-statlink.patch || die
+}
+