From 07ad4dc1048e8103e271e86e9ed51cd92f5c7548 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 16 Jan 2005 22:11:40 +0000
Subject: [PATCH] Clean up. Package-Manager: portage-2.0.51-r13

---
 app-arch/p7zip/ChangeLog         |  5 +++-
 app-arch/p7zip/Manifest          | 30 ++++++++++++++++--------
 app-arch/p7zip/p7zip-4.14.ebuild | 39 ++++++++++++++------------------
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index c1bac654a643..8f321f6bd7ca 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.8 2005/01/14 21:57:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.9 2005/01/16 22:11:40 vapier Exp $
+
+  16 Jan 2005; Mike Frysinger <vapier@gentoo.org> p7zip-4.14.ebuild:
+  Clean up.
 
 *p7zip-4.14 (14 Jan 2005)
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index c2ee1637d6e0..85360d176ad2 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,19 +1,29 @@
-MD5 7ab52974ae64d3f4b2dbe49e4846e9dd p7zip-4.10-r1.ebuild 917
-MD5 f867f2455113575b579617bb9c5be9d5 p7zip-4.13.ebuild 914
-MD5 538260f25dfddfb5989685effc6a926c p7zip-4.10.ebuild 675
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dda2408fff1177cc20bb60cedf081871 ChangeLog 1417
+MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 MD5 b24ad5bd1bc43cfc963731afcdbb72de p7zip-0.91.ebuild 733
+MD5 538260f25dfddfb5989685effc6a926c p7zip-4.10.ebuild 675
+MD5 7ab52974ae64d3f4b2dbe49e4846e9dd p7zip-4.10-r1.ebuild 917
 MD5 6d9e51eb456f2b2fa1e3993e5bbb9ffa p7zip-4.12.ebuild 913
-MD5 33dcf46bd3e52ebce6ae102bf8dd73be p7zip-4.14.ebuild 915
-MD5 94bac1ffc3c8b837031498e4530d8429 ChangeLog 1334
-MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
+MD5 f867f2455113575b579617bb9c5be9d5 p7zip-4.13.ebuild 914
+MD5 d7d751f1a9a0bcf73bde6a16fee1a11e p7zip-4.14.ebuild 938
 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
+MD5 51ff32f9dd6e8763d9376801995bdc8c files/p7zip-4.10_x86_dynamic.patch 276
 MD5 2baa151e16f51dcafc440fda575ff7fd files/digest-p7zip-4.12 67
+MD5 ac895f98cefb54d1e4c9bc30f7539be6 files/p7zip-4.12_x86_static.patch 323
 MD5 c089797644896a3e3cbd6f22c8fcb588 files/digest-p7zip-4.13 67
-MD5 a69aaf3dc158e9ea8eded2ca40930c63 files/digest-p7zip-4.14 67
 MD5 ac895f98cefb54d1e4c9bc30f7539be6 files/p7zip-4.13_x86_static.patch 323
+MD5 a69aaf3dc158e9ea8eded2ca40930c63 files/digest-p7zip-4.14 67
 MD5 f80a2436133e5458e0083f83afff052c files/p7zip-4.14_x86_static.patch 284
-MD5 27aa3494116cf068ba5de9d4e5092d2d files/digest-p7zip-4.10-r1 67
-MD5 ac895f98cefb54d1e4c9bc30f7539be6 files/p7zip-4.12_x86_static.patch 323
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.14 (GNU/Linux)
+
+iD8DBQFB6ubHroRuSHgZdywRAjslAJ9mEHYWHUajOMksMoju3ipu3+o/BQCeL2YE
+r8GAGuDKGXvUfPLz65Y477w=
+=jrT3
+-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-4.14.ebuild b/app-arch/p7zip/p7zip-4.14.ebuild
index 7ad48c89d010..93269b5d934e 100644
--- a/app-arch/p7zip/p7zip-4.14.ebuild
+++ b/app-arch/p7zip/p7zip-4.14.ebuild
@@ -1,44 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.14.ebuild,v 1.1 2005/01/14 21:57:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.14.ebuild,v 1.2 2005/01/16 22:11:40 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-DESCRIPTION="Port of 7-Zip archiver for Unix."
+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 ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
 
 S=${WORKDIR}/${PN}_${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	if useq static ; then
-		einfo "Static linkage enabled, patching makefile now.."
-		epatch ${FILESDIR}/p7zip-4.14_x86_static.patch
-	else
-		einfo "Dynamic linkage enabled."
-	fi
+	use static && epatch ${FILESDIR}/p7zip-4.14_x86_static.patch
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "s:-O2 -s -fPIC:${CXXFLAGS}:" \
+		makefile* || die "cleaning up makefiles"
 }
 
-src_compile ()
-{
-	make || die "compilation error"
+src_compile() {
+	emake || die "compilation error"
 }
 
-src_install ()
-{
-
+src_install() {
 	#dobin ${FILESDIR}/7z
-	dobin bin/7za
+	dobin bin/7za || die "dobin"
 	dosym 7za /usr/bin/7z
 
-	dodoc ChangeLog README TODO DOC/*
-
-	use doc && dohtml -r html/* ${D}/usr/share/doc/${P}
+	dodoc ChangeLog README TODO DOCS/*.txt
 }
-- 
2.26.2