summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-01-16 22:11:40 +0000
committerMike Frysinger <vapier@gentoo.org>2005-01-16 22:11:40 +0000
commit37710b23f976a94a0e7c909fe35771e04365058d (patch)
treec2376b1d924c5d0bfd7e43637349ab071bdcf13d /app-arch/p7zip
parentadd gcc2 fix (Manifest recommit) (diff)
downloadgentoo-2-37710b23f976a94a0e7c909fe35771e04365058d.tar.gz
gentoo-2-37710b23f976a94a0e7c909fe35771e04365058d.tar.bz2
gentoo-2-37710b23f976a94a0e7c909fe35771e04365058d.zip
Clean up.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-arch/p7zip')
-rw-r--r--app-arch/p7zip/ChangeLog5
-rw-r--r--app-arch/p7zip/p7zip-4.14.ebuild39
2 files changed, 21 insertions, 23 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/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
}