summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Portnoy <avenj@gentoo.org>2003-09-20 22:21:29 +0000
committerJon Portnoy <avenj@gentoo.org>2003-09-20 22:21:29 +0000
commit3652de30aa001f01c1a4db0ab60ccb359ae60440 (patch)
tree5b2f815a34639063b8f58bf68710de5a19f9eda8 /dev-lang/ifc
parentadded hppa static fpic bugfix by tausq (diff)
downloadgentoo-2-3652de30aa001f01c1a4db0ab60ccb359ae60440.tar.gz
gentoo-2-3652de30aa001f01c1a4db0ab60ccb359ae60440.tar.bz2
gentoo-2-3652de30aa001f01c1a4db0ab60ccb359ae60440.zip
rpm.eclass usage - fixes bug 23180
Diffstat (limited to 'dev-lang/ifc')
-rw-r--r--dev-lang/ifc/ChangeLog5
-rw-r--r--dev-lang/ifc/Manifest4
-rw-r--r--dev-lang/ifc/ifc-7.0.064-r1.ebuild27
3 files changed, 20 insertions, 16 deletions
diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog
index 191e5c88ccb3..e27ff0b0d9fe 100644
--- a/dev-lang/ifc/ChangeLog
+++ b/dev-lang/ifc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ifc
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.9 2003/06/12 20:31:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.10 2003/09/20 22:21:25 avenj Exp $
+
+ 20 Sep 2003; Jon Portnoy <avenj@gentoo.org> irfc-7.0.064-r1.ebuild :
+ Now uses rpm.eclass - bug 23180. Thanks Georgi.
12 Jun 2003; <msterret@gentoo.org> ifc-7.0.064-r1.ebuild:
fix Header
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
index aacc72f90b79..3178775eb2e9 100644
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@@ -1,7 +1,7 @@
-MD5 1cdf47c8455b2bab1f106c56344ebc8c ChangeLog 1248
+MD5 090350f1c89ebd5634d0109f4f43f142 ChangeLog 1368
MD5 501532d79fe96d761efedbe9bc42c666 ifc-6.0.ebuild 2705
-MD5 7ea953022ca7510b8b78f18f3f575dae ifc-7.0.064-r1.ebuild 3295
MD5 e9c542edb1da833e069c7c6fe8bc07cf ifc-7.0.064.ebuild 3173
+MD5 b2b938753edd7387db7b05a5dbb01d3b ifc-7.0.064-r1.ebuild 3395
MD5 0e550038b4a16719d30d2c5298ee4a9b files/digest-ifc-6.0 65
MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064 65
MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064-r1 65
diff --git a/dev-lang/ifc/ifc-7.0.064-r1.ebuild b/dev-lang/ifc/ifc-7.0.064-r1.ebuild
index 6f6588a63ff0..9633b4399066 100644
--- a/dev-lang/ifc/ifc-7.0.064-r1.ebuild
+++ b/dev-lang/ifc/ifc-7.0.064-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.0.064-r1.ebuild,v 1.3 2003/09/11 01:08:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.0.064-r1.ebuild,v 1.4 2003/09/20 22:21:25 avenj Exp $
+
+inherit rpm
S=${WORKDIR}
DESCRIPTION="Intel Fortran Compiler - The Pentium optimized compiler for Linux"
@@ -17,26 +19,21 @@ LICENSE="icc-7.0"
SLOT="0"
KEYWORDS="-* x86"
-
DEPEND=">=virtual/linux-sources-2.4
- >=sys-libs/glibc-2.2.4
- sys-apps/cpio
- app-arch/rpm"
+ >=sys-libs/glibc-2.2.4"
RDEPEND=">=virtual/linux-sources-2.4
>=sys-libs/glibc-2.2.4"
-src_compile() {
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
# Keep disk space to a minimum
rm -f intel-*.ia64.rpm
+ rpm_unpack intel-*.i386.rpm
+}
- mkdir opt
-
- for x in intel-*.i386.rpm
- do
- einfo "Extracting: ${x}"
- rpm2cpio ${x} | cpio --extract --make-directories --unconditional
- done
+src_compile() {
# From UNTAG_CFG_FILES in 'install'
SD=${S}/opt/intel # Build DESTINATION
@@ -60,6 +57,10 @@ src_compile() {
sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
mv $SUPPORTFILE.abs $SUPPORTFILE
chmod 644 $SUPPORTFILE
+
+ # these should not be executable
+ find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
+ find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
}
src_install () {