disabled static linking.

5 files changed, 68 insertions, 2 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 6df88afe24b4..3ead76e6696b 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.2 2004/10/25 18:32:38 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.3 2004/11/11 19:39:25 radek Exp $
+
+*p7zip-4.10-r1 (11 Nov 2004)
+
+  11 Nov 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/p7zip-4.10_x86_dynamic.patch, +p7zip-4.10-r1.ebuild:
+  Disabled static linkage in default install. 
+  if useflag "static" is enabled, links static executable.
 
 *p7zip-4.10 (25 Oct 2004)
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 9fcccb8a48b1..21c6cee302a8 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,7 +1,10 @@
+MD5 62f5c92566ab63d92d70043605bcf0d9 p7zip-4.10-r1.ebuild 912
 MD5 5113bd1e106061fe973b4d70da561212 p7zip-4.10.ebuild 670
 MD5 6a782b5f32733e8b2aaf91dad3970c2b p7zip-0.91.ebuild 728
-MD5 1eaf11bae01632a768a64735b031f421 ChangeLog 558
+MD5 67837f6a20d7f23a52dbb14fe7986f16 ChangeLog 811
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 MD5 b536ab563901360bd65cae18d088ee5e files/7z 42
+MD5 51ff32f9dd6e8763d9376801995bdc8c files/p7zip-4.10_x86_dynamic.patch 276
 MD5 b447478697ba987040c8a572b2948310 files/digest-p7zip-0.91 63
 MD5 27aa3494116cf068ba5de9d4e5092d2d files/digest-p7zip-4.10 67
+MD5 27aa3494116cf068ba5de9d4e5092d2d files/digest-p7zip-4.10-r1 67
diff --git a/app-arch/p7zip/files/digest-p7zip-4.10-r1 b/app-arch/p7zip/files/digest-p7zip-4.10-r1
new file mode 100644
index 000000000000..7aa4b991a8b3
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.10-r1
@@ -0,0 +1 @@
+MD5 4bb0cd95cc7a7f5954be6c4c84086c73 p7zip_4.10_src.tar.bz2 410682
diff --git a/app-arch/p7zip/files/p7zip-4.10_x86_dynamic.patch b/app-arch/p7zip/files/p7zip-4.10_x86_dynamic.patch
new file mode 100644
index 000000000000..b1614419fd5d
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-4.10_x86_dynamic.patch
@@ -0,0 +1,11 @@
+--- makefile.machine.orig 2004-11-11 20:22:14.157486824 +0100
++++ makefile.machine      2004-11-11 20:22:20.596507944 +0100
+@@ -7,7 +7,5 @@
+ CXX=g++ $(ALLFLAGS)
+ CC=gcc $(ALLFLAGS)
+
+-#LOCAL_LIBS=-lpthread
+-# static linkage
+-LOCAL_LIBS=-static -lpthread
++LOCAL_LIBS=-lpthread
+
diff --git a/app-arch/p7zip/p7zip-4.10-r1.ebuild b/app-arch/p7zip/p7zip-4.10-r1.ebuild
new file mode 100644
index 000000000000..1e3f2a54830a
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.10-r1.ebuild,v 1.1 2004/11/11 19:39:25 radek Exp $
+
+inherit eutils
+
+DESCRIPTION="Port of 7-Zip archiver for Unix."
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
+
+SLOT="0"
+IUSE="doc static"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if useq static ; then
+		einfo "Static linkage enabled."
+	else
+		einfo "Dynamic linkage enabled, patching makefile now.."
+		epatch ${FILESDIR}/p7zip-4.10_x86_dynamic.patch
+	fi
+}
+
+src_compile ()
+{
+	make || die "compilation error"
+}
+
+src_install ()
+{
+
+	#dobin ${FILESDIR}/7z
+	dobin bin/7za
+	dosym 7za /usr/bin/7z
+
+	dodoc ChangeLog README TODO DOC/*
+
+	use doc && dohtml -r html/* ${D}/usr/share/doc/${P}
+}